commit e58941e549539c0be16a9165f62998a659524b93
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 25 14:05:33 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 25 14:05:33 2021 +0000
tree 7f73cace009f70dea01b41e38fde6d9befd50a3f
parent af27b8f6670933e7c19cbc1280bab84c6dbe2f4c
parent 933be3baac7222886c30eec75c67e0650221f600

Merge "Detecting all "complex" schema changes." into androidx-main

.github/workflows/presubmit.yml

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 3248074..5bd0886 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -41,32 +41,52 @@
           echo "ANDROID_SDK_ROOT=$HOME/Library/Android/sdk" >> $GITHUB_ENV
           echo "DIST_DIR=$HOME/dist" >> $GITHUB_ENV
 
+      - name: "Compute actions/checkout arguments"
+        id: checkout-args
+        run: |
+          set -x
+
+          REF=${{ github.event.pull_request.head.ref }}
+          if [ -z "$REF" ]; then
+            REF=${{ github.event.ref }}
+          fi
+          echo "::set-output name=ref::$REF"
+
+          REPOSITORY=${{ github.event.pull_request.head.repo.full_name }}
+          if [ -z "$REPOSITORY" ]; then
+            REPOSITORY=${{ github.repository }}
+          fi
+          echo "::set-output name=repository::$REPOSITORY"
+
       - name: "Checkout androidx repo"
         uses: actions/checkout@v2
         with:
-          fetch-depth: 1
+          ref: ${{ steps.checkout-args.outputs.ref }}
+          repository: ${{ steps.checkout-args.outputs.repository }}
+          fetch-depth: 0 # Need full depth for changed-files-action
 
       - name: "Get changed files in push or pull_request"
         id: changed-files
         # Temporary workaround for failing on force-push
         continue-on-error: true
-        uses: jitterbit/get-changed-files@v1
+        uses: androidx/changed-files-action@main
 
       - name: Check invalid suppressions
         run: |
           set -x
-          ./development/checkInvalidSuppress.py -f ${{ steps.changed-files.outputs.added_modified }}
+          echo ${{ steps.changed-files.outputs.files }}
+          ./development/checkInvalidSuppress.py -f ${{ steps.changed-files.outputs.files }}
 
       - name: "Warn on missing updateApi"
         run: |
           set -x
-          ./development/apilint.py -f ${{ steps.changed-files.outputs.added_modified }}
+          ./development/apilint.py -f ${{ steps.changed-files.outputs.files }}
 
       - name: "Parse changed-files as ktlint args"
         id: ktlint-file-args
         run: |
           set -x
-          KTLINT_FILES=`echo "${{ steps.changed-files.outputs.added_modified }}" | sed 's|[^ ]* *|--file=${{ github.workspace }}/&|g'`
+          KTLINT_FILES=`echo "${{ steps.changed-files.outputs.files }}" | sed 's|[^ ]* *|--file=${{ github.workspace }}/&|g' | grep -v "*.txt"`
           echo "::set-output name=ktlint-file-args::$KTLINT_FILES"
 
       - name: "ktlint"

OWNERS

diff --git a/OWNERS b/OWNERS
index 15d3b29..7c95cab 100644
--- a/OWNERS
+++ b/OWNERS
@@ -14,7 +14,6 @@
 pavlis@google.com
 romainguy@android.com
 sergeyv@google.com
-shepshapard@google.com
 siyamed@google.com
 sjgilbert@google.com
 sumir@google.com

activity/activity-compose/samples/src/main/java/androidx/activity/compose/samples/BackHandlerSample.kt

diff --git a/activity/activity-compose/samples/src/main/java/androidx/activity/compose/samples/BackHandlerSample.kt b/activity/activity-compose/samples/src/main/java/androidx/activity/compose/samples/BackHandlerSample.kt
index e00ba70..baafc9a 100644
--- a/activity/activity-compose/samples/src/main/java/androidx/activity/compose/samples/BackHandlerSample.kt
+++ b/activity/activity-compose/samples/src/main/java/androidx/activity/compose/samples/BackHandlerSample.kt
@@ -24,12 +24,13 @@
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 
 @Sampled
 @Composable
 fun BackHandler() {
-    var backPressedCount by mutableStateOf(0)
+    var backPressedCount by remember { mutableStateOf(0) }
     BackHandler { backPressedCount++ }
 
     val dispatcher = LocalOnBackPressedDispatcherOwner.current.onBackPressedDispatcher

activity/activity-ktx/build.gradle

diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle
index 279d455..33394d1 100644
--- a/activity/activity-ktx/build.gradle
+++ b/activity/activity-ktx/build.gradle
@@ -30,16 +30,16 @@
     api("androidx.core:core-ktx:1.1.0") {
         because "Mirror activity dependency graph for -ktx artifacts"
     }
-    api(prebuiltOrSnapshot("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1")) {
+    api("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1") {
         because 'Mirror activity dependency graph for -ktx artifacts'
     }
-    api(prebuiltOrSnapshot("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"))
+    api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
     api("androidx.savedstate:savedstate-ktx:1.1.0") {
         because 'Mirror activity dependency graph for -ktx artifacts'
     }
     api(KOTLIN_STDLIB)
 
-    androidTestImplementation(prebuiltOrSnapshot("androidx.lifecycle:lifecycle-runtime-testing:2.3.1"))
+    androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.3.1")
     androidTestImplementation(JUNIT)
     androidTestImplementation(TRUTH)
     androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)

activity/activity/build.gradle

diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle
index 9be5f88..3f497dc 100644
--- a/activity/activity/build.gradle
+++ b/activity/activity/build.gradle
@@ -1,8 +1,8 @@
-import static androidx.build.dependencies.DependenciesKt.*
 import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
 import androidx.build.Publish
 
+import static androidx.build.dependencies.DependenciesKt.*
+
 plugins {
     id("AndroidXPlugin")
     id("com.android.library")
@@ -23,13 +23,13 @@
     api("androidx.annotation:annotation:1.1.0")
     implementation("androidx.collection:collection:1.0.0")
     api("androidx.core:core:1.1.0")
-    api(prebuiltOrSnapshot("androidx.lifecycle:lifecycle-runtime:2.3.1"))
-    api(prebuiltOrSnapshot("androidx.lifecycle:lifecycle-viewmodel:2.3.1"))
+    api("androidx.lifecycle:lifecycle-runtime:2.3.1")
+    api("androidx.lifecycle:lifecycle-viewmodel:2.3.1")
     api("androidx.savedstate:savedstate:1.1.0")
-    api(prebuiltOrSnapshot("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1"))
+    api("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1")
     implementation("androidx.tracing:tracing:1.0.0")
 
-    androidTestImplementation(prebuiltOrSnapshot("androidx.lifecycle:lifecycle-runtime-testing:2.3.1"))
+    androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.3.1")
     androidTestImplementation(KOTLIN_STDLIB)
     androidTestImplementation(LEAKCANARY)
     androidTestImplementation(LEAKCANARY_INSTRUMENTATION)

appcompat/appcompat-resources/api/restricted_current.txt

diff --git a/appcompat/appcompat-resources/api/restricted_current.txt b/appcompat/appcompat-resources/api/restricted_current.txt
index 9ea3d58..84adee2 100644
--- a/appcompat/appcompat-resources/api/restricted_current.txt
+++ b/appcompat/appcompat-resources/api/restricted_current.txt
@@ -87,15 +87,10 @@
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class VectorEnabledTintResources extends android.content.res.Resources {
     ctor public VectorEnabledTintResources(android.content.Context, android.content.res.Resources);
-    method public int getColor(int) throws android.content.res.Resources.NotFoundException;
-    method public android.content.res.ColorStateList! getColorStateList(int) throws android.content.res.Resources.NotFoundException;
     method public android.graphics.drawable.Drawable! getDrawable(int) throws android.content.res.Resources.NotFoundException;
-    method @RequiresApi(15) public android.graphics.drawable.Drawable! getDrawableForDensity(int, int) throws android.content.res.Resources.NotFoundException;
-    method public android.graphics.Movie! getMovie(int) throws android.content.res.Resources.NotFoundException;
     method public static boolean isCompatVectorFromResourcesEnabled();
     method public static void setCompatVectorFromResourcesEnabled(boolean);
     method public static boolean shouldBeUsed();
-    method public void updateConfiguration(android.content.res.Configuration!, android.util.DisplayMetrics!);
     field public static final int MAX_SDK_WHERE_REQUIRED = 20; // 0x14
   }
 

appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/TestResources.java

diff --git a/appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/TestResources.java b/appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/TestResources.java
deleted file mode 100644
index a50588f..0000000
--- a/appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/TestResources.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.appcompat.widget;
-
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-
-/**
- * Observable Resources class.
- */
-@SuppressWarnings("deprecation")
-class TestResources extends Resources {
-    private boolean mGetDrawableCalled;
-
-    TestResources(Resources res) {
-        super(res.getAssets(), res.getDisplayMetrics(), res.getConfiguration());
-    }
-
-    @Override
-    public Drawable getDrawable(int id) throws NotFoundException {
-        mGetDrawableCalled = true;
-        return super.getDrawable(id);
-    }
-
-    public void resetGetDrawableCalled() {
-        mGetDrawableCalled = false;
-    }
-
-    public boolean wasGetDrawableCalled() {
-        return mGetDrawableCalled;
-    }
-}

appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java

diff --git a/appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java b/appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java
index 4aec28c..313399e 100644
--- a/appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java
+++ b/appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java
@@ -21,6 +21,7 @@
 
 import android.app.Activity;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
@@ -37,16 +38,11 @@
     public final androidx.test.rule.ActivityTestRule<Activity> mActivityTestRule =
             new androidx.test.rule.ActivityTestRule<>(Activity.class);
 
-    /**
-     * Ensures that TintResources delegates calls to the wrapped Resources object.
-     */
     @Test
     public void testTintResourcesDelegateBackToOriginalResources() {
         final TestResources testResources =
                 new TestResources(mActivityTestRule.getActivity().getResources());
-
         // First make sure that the flag is false
-        testResources.resetGetDrawableCalled();
         assertFalse(testResources.wasGetDrawableCalled());
 
         // Now wrap in a TintResources instance and get a Drawable
@@ -57,4 +53,26 @@
         // ...and assert that the flag was flipped
         assertTrue(testResources.wasGetDrawableCalled());
     }
+
+    /**
+     * Special Resources class which returns a known Drawable instance from a special ID
+     */
+    private static class TestResources extends Resources {
+        private boolean mGetDrawableCalled;
+
+        private TestResources(Resources res) {
+            super(res.getAssets(), res.getDisplayMetrics(), res.getConfiguration());
+        }
+
+        @Override
+        public Drawable getDrawable(int id) throws NotFoundException {
+            mGetDrawableCalled = true;
+            return super.getDrawable(id);
+        }
+
+        public boolean wasGetDrawableCalled() {
+            return mGetDrawableCalled;
+        }
+    }
+
 }

appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/VectorEnabledTintResourcesTest.java

diff --git a/appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/VectorEnabledTintResourcesTest.java b/appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/VectorEnabledTintResourcesTest.java
deleted file mode 100644
index cb02629..0000000
--- a/appcompat/appcompat-resources/src/androidTest/java/androidx/appcompat/widget/VectorEnabledTintResourcesTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.appcompat.widget;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import android.app.Activity;
-import android.content.res.Resources;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.SmallTest;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@SuppressWarnings("deprecation")
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class VectorEnabledTintResourcesTest {
-    @Rule
-    public final androidx.test.rule.ActivityTestRule<Activity> mActivityTestRule =
-            new androidx.test.rule.ActivityTestRule<>(Activity.class);
-
-    /**
-     * Ensures that TintResources delegates calls to the wrapped Resources object.
-     */
-    @Test
-    public void testVectorEnabledTintResourcesDelegateBackToOriginalResources() {
-        final TestResources testResources =
-                new TestResources(mActivityTestRule.getActivity().getResources());
-
-        // First make sure that the flag is false
-        testResources.resetGetDrawableCalled();
-        assertFalse(testResources.wasGetDrawableCalled());
-
-        // Now wrap in a TintResources instance and get a Drawable
-        final Resources tintResources =
-                new VectorEnabledTintResources(mActivityTestRule.getActivity(), testResources);
-        tintResources.getDrawable(android.R.drawable.ic_delete);
-
-        // ...and assert that the flag was flipped
-        assertTrue(testResources.wasGetDrawableCalled());
-    }
-}

appcompat/appcompat-resources/src/main/java/androidx/appcompat/widget/VectorEnabledTintResources.java

diff --git a/appcompat/appcompat-resources/src/main/java/androidx/appcompat/widget/VectorEnabledTintResources.java b/appcompat/appcompat-resources/src/main/java/androidx/appcompat/widget/VectorEnabledTintResources.java
index 6003628..b375ac4 100644
--- a/appcompat/appcompat-resources/src/main/java/androidx/appcompat/widget/VectorEnabledTintResources.java
+++ b/appcompat/appcompat-resources/src/main/java/androidx/appcompat/widget/VectorEnabledTintResources.java
@@ -35,7 +35,7 @@
  * @hide
  */
 @RestrictTo(LIBRARY_GROUP_PREFIX)
-public class VectorEnabledTintResources extends ResourcesWrapper {
+public class VectorEnabledTintResources extends Resources {
     private static boolean sCompatVectorFromResourcesEnabled = false;
 
     public static boolean shouldBeUsed() {
@@ -53,7 +53,7 @@
     @SuppressWarnings("deprecation")
     public VectorEnabledTintResources(@NonNull final Context context,
             @NonNull final Resources res) {
-        super(res);
+        super(res.getAssets(), res.getDisplayMetrics(), res.getConfiguration());
         mContextRef = new WeakReference<>(context);
     }
 

appcompat/appcompat/api/1.3.0-beta02.txt

diff --git a/appcompat/appcompat/api/1.3.0-beta02.txt b/appcompat/appcompat/api/1.3.0-beta02.txt
index 6b91606..1d1f71c 100644
--- a/appcompat/appcompat/api/1.3.0-beta02.txt
+++ b/appcompat/appcompat/api/1.3.0-beta02.txt
@@ -640,15 +640,15 @@
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public int getBaselineAlignedChildIndex();
-    method public android.graphics.drawable.Drawable! getDividerDrawable();
-    method public int getDividerPadding();
-    method public int getGravity();
-    method public int getOrientation();
-    method public int getShowDividers();
-    method public float getWeightSum();
-    method public boolean isBaselineAligned();
-    method public boolean isMeasureWithLargestChildEnabled();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAlignedChildIndex") public int getBaselineAlignedChildIndex();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:divider") public android.graphics.drawable.Drawable? getDividerDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:dividerPadding") public int getDividerPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:gravity") public int getGravity();
+    method @androidx.resourceinspection.annotation.Attribute(value="android:orientation", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="horizontal", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="vertical", value=1)}) public int getOrientation();
+    method @androidx.resourceinspection.annotation.Attribute(value="androidx.appcompat:showDividers", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="none", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="beginning", value=1, mask=1), @androidx.resourceinspection.annotation.Attribute.IntMap(name="middle", value=2, mask=2), @androidx.resourceinspection.annotation.Attribute.IntMap(name="end", value=4, mask=4)}) public int getShowDividers();
+    method @androidx.resourceinspection.annotation.Attribute("android:weightSum") public float getWeightSum();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAligned") public boolean isBaselineAligned();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:measureWithLargestChild") public boolean isMeasureWithLargestChildEnabled();
     method public void setBaselineAligned(boolean);
     method public void setBaselineAlignedChildIndex(int);
     method public void setDividerDrawable(android.graphics.drawable.Drawable!);
@@ -768,13 +768,13 @@
     ctor public SearchView(android.content.Context);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?, int);
-    method public int getImeOptions();
-    method public int getInputType();
-    method public int getMaxWidth();
+    method @androidx.resourceinspection.annotation.Attribute("android:imeOptions") public int getImeOptions();
+    method @androidx.resourceinspection.annotation.Attribute("android:inputType") public int getInputType();
+    method @androidx.resourceinspection.annotation.Attribute("android:maxWidth") public int getMaxWidth();
     method public CharSequence! getQuery();
-    method public CharSequence? getQueryHint();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:queryHint") public CharSequence? getQueryHint();
     method public androidx.cursoradapter.widget.CursorAdapter! getSuggestionsAdapter();
-    method public boolean isIconfiedByDefault();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:iconifiedByDefault") public boolean isIconfiedByDefault();
     method public boolean isIconified();
     method public boolean isQueryRefinementEnabled();
     method public boolean isSubmitButtonEnabled();
@@ -829,19 +829,19 @@
     ctor public SwitchCompat(android.content.Context);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?, int);
-    method public boolean getShowText();
-    method public boolean getSplitTrack();
-    method public int getSwitchMinWidth();
-    method public int getSwitchPadding();
-    method public CharSequence! getTextOff();
-    method public CharSequence! getTextOn();
-    method public android.graphics.drawable.Drawable! getThumbDrawable();
-    method public int getThumbTextPadding();
-    method public android.content.res.ColorStateList? getThumbTintList();
-    method public android.graphics.PorterDuff.Mode? getThumbTintMode();
-    method public android.graphics.drawable.Drawable! getTrackDrawable();
-    method public android.content.res.ColorStateList? getTrackTintList();
-    method public android.graphics.PorterDuff.Mode? getTrackTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:showText") public boolean getShowText();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:splitTrack") public boolean getSplitTrack();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchMinWidth") public int getSwitchMinWidth();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchPadding") public int getSwitchPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOff") public CharSequence? getTextOff();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOn") public CharSequence? getTextOn();
+    method @androidx.resourceinspection.annotation.Attribute("android:thumb") public android.graphics.drawable.Drawable? getThumbDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTextPadding") public int getThumbTextPadding();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTint") public android.content.res.ColorStateList? getThumbTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTintMode") public android.graphics.PorterDuff.Mode? getThumbTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:track") public android.graphics.drawable.Drawable? getTrackDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTint") public android.content.res.ColorStateList? getTrackTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTintMode") public android.graphics.PorterDuff.Mode? getTrackTintMode();
     method public void onMeasure(int, int);
     method public void setShowText(boolean);
     method public void setSplitTrack(boolean);
@@ -884,31 +884,31 @@
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public CharSequence? getCollapseContentDescription();
-    method public android.graphics.drawable.Drawable? getCollapseIcon();
-    method public int getContentInsetEnd();
-    method public int getContentInsetEndWithActions();
-    method public int getContentInsetLeft();
-    method public int getContentInsetRight();
-    method public int getContentInsetStart();
-    method public int getContentInsetStartWithNavigation();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseContentDescription") public CharSequence? getCollapseContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseIcon") public android.graphics.drawable.Drawable? getCollapseIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEnd") public int getContentInsetEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEndWithActions") public int getContentInsetEndWithActions();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetLeft") public int getContentInsetLeft();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetRight") public int getContentInsetRight();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStart") public int getContentInsetStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStartWithNavigation") public int getContentInsetStartWithNavigation();
     method public int getCurrentContentInsetEnd();
     method public int getCurrentContentInsetLeft();
     method public int getCurrentContentInsetRight();
     method public int getCurrentContentInsetStart();
-    method public android.graphics.drawable.Drawable! getLogo();
-    method public CharSequence! getLogoDescription();
-    method public android.view.Menu! getMenu();
-    method public CharSequence? getNavigationContentDescription();
-    method public android.graphics.drawable.Drawable? getNavigationIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logo") public android.graphics.drawable.Drawable? getLogo();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logoDescription") public CharSequence? getLogoDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:menu") public android.view.Menu? getMenu();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationContentDescription") public CharSequence? getNavigationContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationIcon") public android.graphics.drawable.Drawable? getNavigationIcon();
     method public android.graphics.drawable.Drawable? getOverflowIcon();
-    method public int getPopupTheme();
-    method public CharSequence! getSubtitle();
+    method @StyleRes @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:popupTheme") public int getPopupTheme();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:subtitle") public CharSequence? getSubtitle();
     method public CharSequence! getTitle();
-    method public int getTitleMarginBottom();
-    method public int getTitleMarginEnd();
-    method public int getTitleMarginStart();
-    method public int getTitleMarginTop();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginBottom") public int getTitleMarginBottom();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginEnd") public int getTitleMarginEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginStart") public int getTitleMarginStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginTop") public int getTitleMarginTop();
     method public boolean hasExpandedActionView();
     method public boolean hideOverflowMenu();
     method public void inflateMenu(@MenuRes int);

appcompat/appcompat/api/current.txt

diff --git a/appcompat/appcompat/api/current.txt b/appcompat/appcompat/api/current.txt
index 6b91606..1d1f71c 100644
--- a/appcompat/appcompat/api/current.txt
+++ b/appcompat/appcompat/api/current.txt
@@ -640,15 +640,15 @@
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public int getBaselineAlignedChildIndex();
-    method public android.graphics.drawable.Drawable! getDividerDrawable();
-    method public int getDividerPadding();
-    method public int getGravity();
-    method public int getOrientation();
-    method public int getShowDividers();
-    method public float getWeightSum();
-    method public boolean isBaselineAligned();
-    method public boolean isMeasureWithLargestChildEnabled();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAlignedChildIndex") public int getBaselineAlignedChildIndex();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:divider") public android.graphics.drawable.Drawable? getDividerDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:dividerPadding") public int getDividerPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:gravity") public int getGravity();
+    method @androidx.resourceinspection.annotation.Attribute(value="android:orientation", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="horizontal", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="vertical", value=1)}) public int getOrientation();
+    method @androidx.resourceinspection.annotation.Attribute(value="androidx.appcompat:showDividers", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="none", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="beginning", value=1, mask=1), @androidx.resourceinspection.annotation.Attribute.IntMap(name="middle", value=2, mask=2), @androidx.resourceinspection.annotation.Attribute.IntMap(name="end", value=4, mask=4)}) public int getShowDividers();
+    method @androidx.resourceinspection.annotation.Attribute("android:weightSum") public float getWeightSum();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAligned") public boolean isBaselineAligned();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:measureWithLargestChild") public boolean isMeasureWithLargestChildEnabled();
     method public void setBaselineAligned(boolean);
     method public void setBaselineAlignedChildIndex(int);
     method public void setDividerDrawable(android.graphics.drawable.Drawable!);
@@ -768,13 +768,13 @@
     ctor public SearchView(android.content.Context);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?, int);
-    method public int getImeOptions();
-    method public int getInputType();
-    method public int getMaxWidth();
+    method @androidx.resourceinspection.annotation.Attribute("android:imeOptions") public int getImeOptions();
+    method @androidx.resourceinspection.annotation.Attribute("android:inputType") public int getInputType();
+    method @androidx.resourceinspection.annotation.Attribute("android:maxWidth") public int getMaxWidth();
     method public CharSequence! getQuery();
-    method public CharSequence? getQueryHint();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:queryHint") public CharSequence? getQueryHint();
     method public androidx.cursoradapter.widget.CursorAdapter! getSuggestionsAdapter();
-    method public boolean isIconfiedByDefault();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:iconifiedByDefault") public boolean isIconfiedByDefault();
     method public boolean isIconified();
     method public boolean isQueryRefinementEnabled();
     method public boolean isSubmitButtonEnabled();
@@ -829,19 +829,19 @@
     ctor public SwitchCompat(android.content.Context);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?, int);
-    method public boolean getShowText();
-    method public boolean getSplitTrack();
-    method public int getSwitchMinWidth();
-    method public int getSwitchPadding();
-    method public CharSequence! getTextOff();
-    method public CharSequence! getTextOn();
-    method public android.graphics.drawable.Drawable! getThumbDrawable();
-    method public int getThumbTextPadding();
-    method public android.content.res.ColorStateList? getThumbTintList();
-    method public android.graphics.PorterDuff.Mode? getThumbTintMode();
-    method public android.graphics.drawable.Drawable! getTrackDrawable();
-    method public android.content.res.ColorStateList? getTrackTintList();
-    method public android.graphics.PorterDuff.Mode? getTrackTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:showText") public boolean getShowText();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:splitTrack") public boolean getSplitTrack();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchMinWidth") public int getSwitchMinWidth();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchPadding") public int getSwitchPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOff") public CharSequence? getTextOff();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOn") public CharSequence? getTextOn();
+    method @androidx.resourceinspection.annotation.Attribute("android:thumb") public android.graphics.drawable.Drawable? getThumbDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTextPadding") public int getThumbTextPadding();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTint") public android.content.res.ColorStateList? getThumbTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTintMode") public android.graphics.PorterDuff.Mode? getThumbTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:track") public android.graphics.drawable.Drawable? getTrackDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTint") public android.content.res.ColorStateList? getTrackTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTintMode") public android.graphics.PorterDuff.Mode? getTrackTintMode();
     method public void onMeasure(int, int);
     method public void setShowText(boolean);
     method public void setSplitTrack(boolean);
@@ -884,31 +884,31 @@
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public CharSequence? getCollapseContentDescription();
-    method public android.graphics.drawable.Drawable? getCollapseIcon();
-    method public int getContentInsetEnd();
-    method public int getContentInsetEndWithActions();
-    method public int getContentInsetLeft();
-    method public int getContentInsetRight();
-    method public int getContentInsetStart();
-    method public int getContentInsetStartWithNavigation();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseContentDescription") public CharSequence? getCollapseContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseIcon") public android.graphics.drawable.Drawable? getCollapseIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEnd") public int getContentInsetEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEndWithActions") public int getContentInsetEndWithActions();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetLeft") public int getContentInsetLeft();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetRight") public int getContentInsetRight();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStart") public int getContentInsetStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStartWithNavigation") public int getContentInsetStartWithNavigation();
     method public int getCurrentContentInsetEnd();
     method public int getCurrentContentInsetLeft();
     method public int getCurrentContentInsetRight();
     method public int getCurrentContentInsetStart();
-    method public android.graphics.drawable.Drawable! getLogo();
-    method public CharSequence! getLogoDescription();
-    method public android.view.Menu! getMenu();
-    method public CharSequence? getNavigationContentDescription();
-    method public android.graphics.drawable.Drawable? getNavigationIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logo") public android.graphics.drawable.Drawable? getLogo();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logoDescription") public CharSequence? getLogoDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:menu") public android.view.Menu? getMenu();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationContentDescription") public CharSequence? getNavigationContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationIcon") public android.graphics.drawable.Drawable? getNavigationIcon();
     method public android.graphics.drawable.Drawable? getOverflowIcon();
-    method public int getPopupTheme();
-    method public CharSequence! getSubtitle();
+    method @StyleRes @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:popupTheme") public int getPopupTheme();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:subtitle") public CharSequence? getSubtitle();
     method public CharSequence! getTitle();
-    method public int getTitleMarginBottom();
-    method public int getTitleMarginEnd();
-    method public int getTitleMarginStart();
-    method public int getTitleMarginTop();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginBottom") public int getTitleMarginBottom();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginEnd") public int getTitleMarginEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginStart") public int getTitleMarginStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginTop") public int getTitleMarginTop();
     method public boolean hasExpandedActionView();
     method public boolean hideOverflowMenu();
     method public void inflateMenu(@MenuRes int);

appcompat/appcompat/api/public_plus_experimental_1.3.0-beta02.txt

diff --git a/appcompat/appcompat/api/public_plus_experimental_1.3.0-beta02.txt b/appcompat/appcompat/api/public_plus_experimental_1.3.0-beta02.txt
index 8886644..60d3a2c 100644
--- a/appcompat/appcompat/api/public_plus_experimental_1.3.0-beta02.txt
+++ b/appcompat/appcompat/api/public_plus_experimental_1.3.0-beta02.txt
@@ -648,15 +648,15 @@
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public int getBaselineAlignedChildIndex();
-    method public android.graphics.drawable.Drawable! getDividerDrawable();
-    method public int getDividerPadding();
-    method public int getGravity();
-    method public int getOrientation();
-    method public int getShowDividers();
-    method public float getWeightSum();
-    method public boolean isBaselineAligned();
-    method public boolean isMeasureWithLargestChildEnabled();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAlignedChildIndex") public int getBaselineAlignedChildIndex();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:divider") public android.graphics.drawable.Drawable? getDividerDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:dividerPadding") public int getDividerPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:gravity") public int getGravity();
+    method @androidx.resourceinspection.annotation.Attribute(value="android:orientation", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="horizontal", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="vertical", value=1)}) public int getOrientation();
+    method @androidx.resourceinspection.annotation.Attribute(value="androidx.appcompat:showDividers", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="none", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="beginning", value=1, mask=1), @androidx.resourceinspection.annotation.Attribute.IntMap(name="middle", value=2, mask=2), @androidx.resourceinspection.annotation.Attribute.IntMap(name="end", value=4, mask=4)}) public int getShowDividers();
+    method @androidx.resourceinspection.annotation.Attribute("android:weightSum") public float getWeightSum();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAligned") public boolean isBaselineAligned();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:measureWithLargestChild") public boolean isMeasureWithLargestChildEnabled();
     method public void setBaselineAligned(boolean);
     method public void setBaselineAlignedChildIndex(int);
     method public void setDividerDrawable(android.graphics.drawable.Drawable!);
@@ -776,13 +776,13 @@
     ctor public SearchView(android.content.Context);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?, int);
-    method public int getImeOptions();
-    method public int getInputType();
-    method public int getMaxWidth();
+    method @androidx.resourceinspection.annotation.Attribute("android:imeOptions") public int getImeOptions();
+    method @androidx.resourceinspection.annotation.Attribute("android:inputType") public int getInputType();
+    method @androidx.resourceinspection.annotation.Attribute("android:maxWidth") public int getMaxWidth();
     method public CharSequence! getQuery();
-    method public CharSequence? getQueryHint();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:queryHint") public CharSequence? getQueryHint();
     method public androidx.cursoradapter.widget.CursorAdapter! getSuggestionsAdapter();
-    method public boolean isIconfiedByDefault();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:iconifiedByDefault") public boolean isIconfiedByDefault();
     method public boolean isIconified();
     method public boolean isQueryRefinementEnabled();
     method public boolean isSubmitButtonEnabled();
@@ -837,19 +837,19 @@
     ctor public SwitchCompat(android.content.Context);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?, int);
-    method public boolean getShowText();
-    method public boolean getSplitTrack();
-    method public int getSwitchMinWidth();
-    method public int getSwitchPadding();
-    method public CharSequence! getTextOff();
-    method public CharSequence! getTextOn();
-    method public android.graphics.drawable.Drawable! getThumbDrawable();
-    method public int getThumbTextPadding();
-    method public android.content.res.ColorStateList? getThumbTintList();
-    method public android.graphics.PorterDuff.Mode? getThumbTintMode();
-    method public android.graphics.drawable.Drawable! getTrackDrawable();
-    method public android.content.res.ColorStateList? getTrackTintList();
-    method public android.graphics.PorterDuff.Mode? getTrackTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:showText") public boolean getShowText();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:splitTrack") public boolean getSplitTrack();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchMinWidth") public int getSwitchMinWidth();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchPadding") public int getSwitchPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOff") public CharSequence? getTextOff();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOn") public CharSequence? getTextOn();
+    method @androidx.resourceinspection.annotation.Attribute("android:thumb") public android.graphics.drawable.Drawable? getThumbDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTextPadding") public int getThumbTextPadding();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTint") public android.content.res.ColorStateList? getThumbTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTintMode") public android.graphics.PorterDuff.Mode? getThumbTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:track") public android.graphics.drawable.Drawable? getTrackDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTint") public android.content.res.ColorStateList? getTrackTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTintMode") public android.graphics.PorterDuff.Mode? getTrackTintMode();
     method public void onMeasure(int, int);
     method public void setShowText(boolean);
     method public void setSplitTrack(boolean);
@@ -892,31 +892,31 @@
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public CharSequence? getCollapseContentDescription();
-    method public android.graphics.drawable.Drawable? getCollapseIcon();
-    method public int getContentInsetEnd();
-    method public int getContentInsetEndWithActions();
-    method public int getContentInsetLeft();
-    method public int getContentInsetRight();
-    method public int getContentInsetStart();
-    method public int getContentInsetStartWithNavigation();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseContentDescription") public CharSequence? getCollapseContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseIcon") public android.graphics.drawable.Drawable? getCollapseIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEnd") public int getContentInsetEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEndWithActions") public int getContentInsetEndWithActions();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetLeft") public int getContentInsetLeft();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetRight") public int getContentInsetRight();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStart") public int getContentInsetStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStartWithNavigation") public int getContentInsetStartWithNavigation();
     method public int getCurrentContentInsetEnd();
     method public int getCurrentContentInsetLeft();
     method public int getCurrentContentInsetRight();
     method public int getCurrentContentInsetStart();
-    method public android.graphics.drawable.Drawable! getLogo();
-    method public CharSequence! getLogoDescription();
-    method public android.view.Menu! getMenu();
-    method public CharSequence? getNavigationContentDescription();
-    method public android.graphics.drawable.Drawable? getNavigationIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logo") public android.graphics.drawable.Drawable? getLogo();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logoDescription") public CharSequence? getLogoDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:menu") public android.view.Menu? getMenu();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationContentDescription") public CharSequence? getNavigationContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationIcon") public android.graphics.drawable.Drawable? getNavigationIcon();
     method public android.graphics.drawable.Drawable? getOverflowIcon();
-    method public int getPopupTheme();
-    method public CharSequence! getSubtitle();
+    method @StyleRes @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:popupTheme") public int getPopupTheme();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:subtitle") public CharSequence? getSubtitle();
     method public CharSequence! getTitle();
-    method public int getTitleMarginBottom();
-    method public int getTitleMarginEnd();
-    method public int getTitleMarginStart();
-    method public int getTitleMarginTop();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginBottom") public int getTitleMarginBottom();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginEnd") public int getTitleMarginEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginStart") public int getTitleMarginStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginTop") public int getTitleMarginTop();
     method public boolean hasExpandedActionView();
     method public boolean hideOverflowMenu();
     method public void inflateMenu(@MenuRes int);

appcompat/appcompat/api/public_plus_experimental_current.txt

diff --git a/appcompat/appcompat/api/public_plus_experimental_current.txt b/appcompat/appcompat/api/public_plus_experimental_current.txt
index 8886644..60d3a2c 100644
--- a/appcompat/appcompat/api/public_plus_experimental_current.txt
+++ b/appcompat/appcompat/api/public_plus_experimental_current.txt
@@ -648,15 +648,15 @@
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public int getBaselineAlignedChildIndex();
-    method public android.graphics.drawable.Drawable! getDividerDrawable();
-    method public int getDividerPadding();
-    method public int getGravity();
-    method public int getOrientation();
-    method public int getShowDividers();
-    method public float getWeightSum();
-    method public boolean isBaselineAligned();
-    method public boolean isMeasureWithLargestChildEnabled();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAlignedChildIndex") public int getBaselineAlignedChildIndex();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:divider") public android.graphics.drawable.Drawable? getDividerDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:dividerPadding") public int getDividerPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:gravity") public int getGravity();
+    method @androidx.resourceinspection.annotation.Attribute(value="android:orientation", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="horizontal", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="vertical", value=1)}) public int getOrientation();
+    method @androidx.resourceinspection.annotation.Attribute(value="androidx.appcompat:showDividers", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="none", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="beginning", value=1, mask=1), @androidx.resourceinspection.annotation.Attribute.IntMap(name="middle", value=2, mask=2), @androidx.resourceinspection.annotation.Attribute.IntMap(name="end", value=4, mask=4)}) public int getShowDividers();
+    method @androidx.resourceinspection.annotation.Attribute("android:weightSum") public float getWeightSum();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAligned") public boolean isBaselineAligned();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:measureWithLargestChild") public boolean isMeasureWithLargestChildEnabled();
     method public void setBaselineAligned(boolean);
     method public void setBaselineAlignedChildIndex(int);
     method public void setDividerDrawable(android.graphics.drawable.Drawable!);
@@ -776,13 +776,13 @@
     ctor public SearchView(android.content.Context);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?, int);
-    method public int getImeOptions();
-    method public int getInputType();
-    method public int getMaxWidth();
+    method @androidx.resourceinspection.annotation.Attribute("android:imeOptions") public int getImeOptions();
+    method @androidx.resourceinspection.annotation.Attribute("android:inputType") public int getInputType();
+    method @androidx.resourceinspection.annotation.Attribute("android:maxWidth") public int getMaxWidth();
     method public CharSequence! getQuery();
-    method public CharSequence? getQueryHint();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:queryHint") public CharSequence? getQueryHint();
     method public androidx.cursoradapter.widget.CursorAdapter! getSuggestionsAdapter();
-    method public boolean isIconfiedByDefault();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:iconifiedByDefault") public boolean isIconfiedByDefault();
     method public boolean isIconified();
     method public boolean isQueryRefinementEnabled();
     method public boolean isSubmitButtonEnabled();
@@ -837,19 +837,19 @@
     ctor public SwitchCompat(android.content.Context);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?, int);
-    method public boolean getShowText();
-    method public boolean getSplitTrack();
-    method public int getSwitchMinWidth();
-    method public int getSwitchPadding();
-    method public CharSequence! getTextOff();
-    method public CharSequence! getTextOn();
-    method public android.graphics.drawable.Drawable! getThumbDrawable();
-    method public int getThumbTextPadding();
-    method public android.content.res.ColorStateList? getThumbTintList();
-    method public android.graphics.PorterDuff.Mode? getThumbTintMode();
-    method public android.graphics.drawable.Drawable! getTrackDrawable();
-    method public android.content.res.ColorStateList? getTrackTintList();
-    method public android.graphics.PorterDuff.Mode? getTrackTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:showText") public boolean getShowText();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:splitTrack") public boolean getSplitTrack();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchMinWidth") public int getSwitchMinWidth();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchPadding") public int getSwitchPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOff") public CharSequence? getTextOff();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOn") public CharSequence? getTextOn();
+    method @androidx.resourceinspection.annotation.Attribute("android:thumb") public android.graphics.drawable.Drawable? getThumbDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTextPadding") public int getThumbTextPadding();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTint") public android.content.res.ColorStateList? getThumbTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTintMode") public android.graphics.PorterDuff.Mode? getThumbTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:track") public android.graphics.drawable.Drawable? getTrackDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTint") public android.content.res.ColorStateList? getTrackTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTintMode") public android.graphics.PorterDuff.Mode? getTrackTintMode();
     method public void onMeasure(int, int);
     method public void setShowText(boolean);
     method public void setSplitTrack(boolean);
@@ -892,31 +892,31 @@
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public CharSequence? getCollapseContentDescription();
-    method public android.graphics.drawable.Drawable? getCollapseIcon();
-    method public int getContentInsetEnd();
-    method public int getContentInsetEndWithActions();
-    method public int getContentInsetLeft();
-    method public int getContentInsetRight();
-    method public int getContentInsetStart();
-    method public int getContentInsetStartWithNavigation();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseContentDescription") public CharSequence? getCollapseContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseIcon") public android.graphics.drawable.Drawable? getCollapseIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEnd") public int getContentInsetEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEndWithActions") public int getContentInsetEndWithActions();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetLeft") public int getContentInsetLeft();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetRight") public int getContentInsetRight();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStart") public int getContentInsetStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStartWithNavigation") public int getContentInsetStartWithNavigation();
     method public int getCurrentContentInsetEnd();
     method public int getCurrentContentInsetLeft();
     method public int getCurrentContentInsetRight();
     method public int getCurrentContentInsetStart();
-    method public android.graphics.drawable.Drawable! getLogo();
-    method public CharSequence! getLogoDescription();
-    method public android.view.Menu! getMenu();
-    method public CharSequence? getNavigationContentDescription();
-    method public android.graphics.drawable.Drawable? getNavigationIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logo") public android.graphics.drawable.Drawable? getLogo();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logoDescription") public CharSequence? getLogoDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:menu") public android.view.Menu? getMenu();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationContentDescription") public CharSequence? getNavigationContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationIcon") public android.graphics.drawable.Drawable? getNavigationIcon();
     method public android.graphics.drawable.Drawable? getOverflowIcon();
-    method public int getPopupTheme();
-    method public CharSequence! getSubtitle();
+    method @StyleRes @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:popupTheme") public int getPopupTheme();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:subtitle") public CharSequence? getSubtitle();
     method public CharSequence! getTitle();
-    method public int getTitleMarginBottom();
-    method public int getTitleMarginEnd();
-    method public int getTitleMarginStart();
-    method public int getTitleMarginTop();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginBottom") public int getTitleMarginBottom();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginEnd") public int getTitleMarginEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginStart") public int getTitleMarginStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginTop") public int getTitleMarginTop();
     method public boolean hasExpandedActionView();
     method public boolean hideOverflowMenu();
     method public void inflateMenu(@MenuRes int);

appcompat/appcompat/api/restricted_1.3.0-beta02.txt

diff --git a/appcompat/appcompat/api/restricted_1.3.0-beta02.txt b/appcompat/appcompat/api/restricted_1.3.0-beta02.txt
index d86ea87..7388b43 100644
--- a/appcompat/appcompat/api/restricted_1.3.0-beta02.txt
+++ b/appcompat/appcompat/api/restricted_1.3.0-beta02.txt
@@ -1657,16 +1657,16 @@
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public int getBaselineAlignedChildIndex();
-    method public android.graphics.drawable.Drawable! getDividerDrawable();
-    method public int getDividerPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAlignedChildIndex") public int getBaselineAlignedChildIndex();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:divider") public android.graphics.drawable.Drawable? getDividerDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:dividerPadding") public int getDividerPadding();
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public int getDividerWidth();
-    method public int getGravity();
-    method @androidx.appcompat.widget.LinearLayoutCompat.OrientationMode public int getOrientation();
-    method @androidx.appcompat.widget.LinearLayoutCompat.DividerMode public int getShowDividers();
-    method public float getWeightSum();
-    method public boolean isBaselineAligned();
-    method public boolean isMeasureWithLargestChildEnabled();
+    method @androidx.resourceinspection.annotation.Attribute("android:gravity") public int getGravity();
+    method @androidx.appcompat.widget.LinearLayoutCompat.OrientationMode @androidx.resourceinspection.annotation.Attribute(value="android:orientation", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="horizontal", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="vertical", value=1)}) public int getOrientation();
+    method @androidx.appcompat.widget.LinearLayoutCompat.DividerMode @androidx.resourceinspection.annotation.Attribute(value="androidx.appcompat:showDividers", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="none", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="beginning", value=1, mask=1), @androidx.resourceinspection.annotation.Attribute.IntMap(name="middle", value=2, mask=2), @androidx.resourceinspection.annotation.Attribute.IntMap(name="end", value=4, mask=4)}) public int getShowDividers();
+    method @androidx.resourceinspection.annotation.Attribute("android:weightSum") public float getWeightSum();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAligned") public boolean isBaselineAligned();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:measureWithLargestChild") public boolean isMeasureWithLargestChildEnabled();
     method public void setBaselineAligned(boolean);
     method public void setBaselineAlignedChildIndex(int);
     method public void setDividerDrawable(android.graphics.drawable.Drawable!);
@@ -1848,13 +1848,13 @@
     ctor public SearchView(android.content.Context);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?, int);
-    method public int getImeOptions();
-    method public int getInputType();
-    method public int getMaxWidth();
+    method @androidx.resourceinspection.annotation.Attribute("android:imeOptions") public int getImeOptions();
+    method @androidx.resourceinspection.annotation.Attribute("android:inputType") public int getInputType();
+    method @androidx.resourceinspection.annotation.Attribute("android:maxWidth") public int getMaxWidth();
     method public CharSequence! getQuery();
-    method public CharSequence? getQueryHint();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:queryHint") public CharSequence? getQueryHint();
     method public androidx.cursoradapter.widget.CursorAdapter! getSuggestionsAdapter();
-    method public boolean isIconfiedByDefault();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:iconifiedByDefault") public boolean isIconfiedByDefault();
     method public boolean isIconified();
     method public boolean isQueryRefinementEnabled();
     method public boolean isSubmitButtonEnabled();
@@ -1916,19 +1916,19 @@
     ctor public SwitchCompat(android.content.Context);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?, int);
-    method public boolean getShowText();
-    method public boolean getSplitTrack();
-    method public int getSwitchMinWidth();
-    method public int getSwitchPadding();
-    method public CharSequence! getTextOff();
-    method public CharSequence! getTextOn();
-    method public android.graphics.drawable.Drawable! getThumbDrawable();
-    method public int getThumbTextPadding();
-    method public android.content.res.ColorStateList? getThumbTintList();
-    method public android.graphics.PorterDuff.Mode? getThumbTintMode();
-    method public android.graphics.drawable.Drawable! getTrackDrawable();
-    method public android.content.res.ColorStateList? getTrackTintList();
-    method public android.graphics.PorterDuff.Mode? getTrackTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:showText") public boolean getShowText();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:splitTrack") public boolean getSplitTrack();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchMinWidth") public int getSwitchMinWidth();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchPadding") public int getSwitchPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOff") public CharSequence? getTextOff();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOn") public CharSequence? getTextOn();
+    method @androidx.resourceinspection.annotation.Attribute("android:thumb") public android.graphics.drawable.Drawable? getThumbDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTextPadding") public int getThumbTextPadding();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTint") public android.content.res.ColorStateList? getThumbTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTintMode") public android.graphics.PorterDuff.Mode? getThumbTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:track") public android.graphics.drawable.Drawable? getTrackDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTint") public android.content.res.ColorStateList? getTrackTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTintMode") public android.graphics.PorterDuff.Mode? getTrackTintMode();
     method public void onMeasure(int, int);
     method public void setShowText(boolean);
     method public void setSplitTrack(boolean);
@@ -2010,31 +2010,31 @@
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public CharSequence? getCollapseContentDescription();
-    method public android.graphics.drawable.Drawable? getCollapseIcon();
-    method public int getContentInsetEnd();
-    method public int getContentInsetEndWithActions();
-    method public int getContentInsetLeft();
-    method public int getContentInsetRight();
-    method public int getContentInsetStart();
-    method public int getContentInsetStartWithNavigation();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseContentDescription") public CharSequence? getCollapseContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseIcon") public android.graphics.drawable.Drawable? getCollapseIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEnd") public int getContentInsetEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEndWithActions") public int getContentInsetEndWithActions();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetLeft") public int getContentInsetLeft();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetRight") public int getContentInsetRight();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStart") public int getContentInsetStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStartWithNavigation") public int getContentInsetStartWithNavigation();
     method public int getCurrentContentInsetEnd();
     method public int getCurrentContentInsetLeft();
     method public int getCurrentContentInsetRight();
     method public int getCurrentContentInsetStart();
-    method public android.graphics.drawable.Drawable! getLogo();
-    method public CharSequence! getLogoDescription();
-    method public android.view.Menu! getMenu();
-    method public CharSequence? getNavigationContentDescription();
-    method public android.graphics.drawable.Drawable? getNavigationIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logo") public android.graphics.drawable.Drawable? getLogo();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logoDescription") public CharSequence? getLogoDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:menu") public android.view.Menu? getMenu();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationContentDescription") public CharSequence? getNavigationContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationIcon") public android.graphics.drawable.Drawable? getNavigationIcon();
     method public android.graphics.drawable.Drawable? getOverflowIcon();
-    method public int getPopupTheme();
-    method public CharSequence! getSubtitle();
+    method @StyleRes @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:popupTheme") public int getPopupTheme();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:subtitle") public CharSequence? getSubtitle();
     method public CharSequence! getTitle();
-    method public int getTitleMarginBottom();
-    method public int getTitleMarginEnd();
-    method public int getTitleMarginStart();
-    method public int getTitleMarginTop();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginBottom") public int getTitleMarginBottom();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginEnd") public int getTitleMarginEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginStart") public int getTitleMarginStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginTop") public int getTitleMarginTop();
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.appcompat.widget.DecorToolbar! getWrapper();
     method public boolean hasExpandedActionView();
     method public boolean hideOverflowMenu();

appcompat/appcompat/api/restricted_current.txt

diff --git a/appcompat/appcompat/api/restricted_current.txt b/appcompat/appcompat/api/restricted_current.txt
index d86ea87..7388b43 100644
--- a/appcompat/appcompat/api/restricted_current.txt
+++ b/appcompat/appcompat/api/restricted_current.txt
@@ -1657,16 +1657,16 @@
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.LinearLayoutCompat.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public int getBaselineAlignedChildIndex();
-    method public android.graphics.drawable.Drawable! getDividerDrawable();
-    method public int getDividerPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAlignedChildIndex") public int getBaselineAlignedChildIndex();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:divider") public android.graphics.drawable.Drawable? getDividerDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:dividerPadding") public int getDividerPadding();
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public int getDividerWidth();
-    method public int getGravity();
-    method @androidx.appcompat.widget.LinearLayoutCompat.OrientationMode public int getOrientation();
-    method @androidx.appcompat.widget.LinearLayoutCompat.DividerMode public int getShowDividers();
-    method public float getWeightSum();
-    method public boolean isBaselineAligned();
-    method public boolean isMeasureWithLargestChildEnabled();
+    method @androidx.resourceinspection.annotation.Attribute("android:gravity") public int getGravity();
+    method @androidx.appcompat.widget.LinearLayoutCompat.OrientationMode @androidx.resourceinspection.annotation.Attribute(value="android:orientation", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="horizontal", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="vertical", value=1)}) public int getOrientation();
+    method @androidx.appcompat.widget.LinearLayoutCompat.DividerMode @androidx.resourceinspection.annotation.Attribute(value="androidx.appcompat:showDividers", intMapping={@androidx.resourceinspection.annotation.Attribute.IntMap(name="none", value=0), @androidx.resourceinspection.annotation.Attribute.IntMap(name="beginning", value=1, mask=1), @androidx.resourceinspection.annotation.Attribute.IntMap(name="middle", value=2, mask=2), @androidx.resourceinspection.annotation.Attribute.IntMap(name="end", value=4, mask=4)}) public int getShowDividers();
+    method @androidx.resourceinspection.annotation.Attribute("android:weightSum") public float getWeightSum();
+    method @androidx.resourceinspection.annotation.Attribute("android:baselineAligned") public boolean isBaselineAligned();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:measureWithLargestChild") public boolean isMeasureWithLargestChildEnabled();
     method public void setBaselineAligned(boolean);
     method public void setBaselineAlignedChildIndex(int);
     method public void setDividerDrawable(android.graphics.drawable.Drawable!);
@@ -1848,13 +1848,13 @@
     ctor public SearchView(android.content.Context);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?);
     ctor public SearchView(android.content.Context, android.util.AttributeSet?, int);
-    method public int getImeOptions();
-    method public int getInputType();
-    method public int getMaxWidth();
+    method @androidx.resourceinspection.annotation.Attribute("android:imeOptions") public int getImeOptions();
+    method @androidx.resourceinspection.annotation.Attribute("android:inputType") public int getInputType();
+    method @androidx.resourceinspection.annotation.Attribute("android:maxWidth") public int getMaxWidth();
     method public CharSequence! getQuery();
-    method public CharSequence? getQueryHint();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:queryHint") public CharSequence? getQueryHint();
     method public androidx.cursoradapter.widget.CursorAdapter! getSuggestionsAdapter();
-    method public boolean isIconfiedByDefault();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:iconifiedByDefault") public boolean isIconfiedByDefault();
     method public boolean isIconified();
     method public boolean isQueryRefinementEnabled();
     method public boolean isSubmitButtonEnabled();
@@ -1916,19 +1916,19 @@
     ctor public SwitchCompat(android.content.Context);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?);
     ctor public SwitchCompat(android.content.Context, android.util.AttributeSet?, int);
-    method public boolean getShowText();
-    method public boolean getSplitTrack();
-    method public int getSwitchMinWidth();
-    method public int getSwitchPadding();
-    method public CharSequence! getTextOff();
-    method public CharSequence! getTextOn();
-    method public android.graphics.drawable.Drawable! getThumbDrawable();
-    method public int getThumbTextPadding();
-    method public android.content.res.ColorStateList? getThumbTintList();
-    method public android.graphics.PorterDuff.Mode? getThumbTintMode();
-    method public android.graphics.drawable.Drawable! getTrackDrawable();
-    method public android.content.res.ColorStateList? getTrackTintList();
-    method public android.graphics.PorterDuff.Mode? getTrackTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:showText") public boolean getShowText();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:splitTrack") public boolean getSplitTrack();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchMinWidth") public int getSwitchMinWidth();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:switchPadding") public int getSwitchPadding();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOff") public CharSequence? getTextOff();
+    method @androidx.resourceinspection.annotation.Attribute("android:textOn") public CharSequence? getTextOn();
+    method @androidx.resourceinspection.annotation.Attribute("android:thumb") public android.graphics.drawable.Drawable? getThumbDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTextPadding") public int getThumbTextPadding();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTint") public android.content.res.ColorStateList? getThumbTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:thumbTintMode") public android.graphics.PorterDuff.Mode? getThumbTintMode();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:track") public android.graphics.drawable.Drawable? getTrackDrawable();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTint") public android.content.res.ColorStateList? getTrackTintList();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:trackTintMode") public android.graphics.PorterDuff.Mode? getTrackTintMode();
     method public void onMeasure(int, int);
     method public void setShowText(boolean);
     method public void setSplitTrack(boolean);
@@ -2010,31 +2010,31 @@
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateDefaultLayoutParams();
     method public androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
     method protected androidx.appcompat.widget.Toolbar.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public CharSequence? getCollapseContentDescription();
-    method public android.graphics.drawable.Drawable? getCollapseIcon();
-    method public int getContentInsetEnd();
-    method public int getContentInsetEndWithActions();
-    method public int getContentInsetLeft();
-    method public int getContentInsetRight();
-    method public int getContentInsetStart();
-    method public int getContentInsetStartWithNavigation();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseContentDescription") public CharSequence? getCollapseContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:collapseIcon") public android.graphics.drawable.Drawable? getCollapseIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEnd") public int getContentInsetEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetEndWithActions") public int getContentInsetEndWithActions();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetLeft") public int getContentInsetLeft();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetRight") public int getContentInsetRight();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStart") public int getContentInsetStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:contentInsetStartWithNavigation") public int getContentInsetStartWithNavigation();
     method public int getCurrentContentInsetEnd();
     method public int getCurrentContentInsetLeft();
     method public int getCurrentContentInsetRight();
     method public int getCurrentContentInsetStart();
-    method public android.graphics.drawable.Drawable! getLogo();
-    method public CharSequence! getLogoDescription();
-    method public android.view.Menu! getMenu();
-    method public CharSequence? getNavigationContentDescription();
-    method public android.graphics.drawable.Drawable? getNavigationIcon();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logo") public android.graphics.drawable.Drawable? getLogo();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:logoDescription") public CharSequence? getLogoDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:menu") public android.view.Menu? getMenu();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationContentDescription") public CharSequence? getNavigationContentDescription();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:navigationIcon") public android.graphics.drawable.Drawable? getNavigationIcon();
     method public android.graphics.drawable.Drawable? getOverflowIcon();
-    method public int getPopupTheme();
-    method public CharSequence! getSubtitle();
+    method @StyleRes @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:popupTheme") public int getPopupTheme();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:subtitle") public CharSequence? getSubtitle();
     method public CharSequence! getTitle();
-    method public int getTitleMarginBottom();
-    method public int getTitleMarginEnd();
-    method public int getTitleMarginStart();
-    method public int getTitleMarginTop();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginBottom") public int getTitleMarginBottom();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginEnd") public int getTitleMarginEnd();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginStart") public int getTitleMarginStart();
+    method @androidx.resourceinspection.annotation.Attribute("androidx.appcompat:titleMarginTop") public int getTitleMarginTop();
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.appcompat.widget.DecorToolbar! getWrapper();
     method public boolean hasExpandedActionView();
     method public boolean hideOverflowMenu();

appcompat/appcompat/build.gradle

diff --git a/appcompat/appcompat/build.gradle b/appcompat/appcompat/build.gradle
index dc4233a..9c133a2 100644
--- a/appcompat/appcompat/build.gradle
+++ b/appcompat/appcompat/build.gradle
@@ -21,8 +21,11 @@
     api("androidx.drawerlayout:drawerlayout:1.0.0")
     implementation("androidx.lifecycle:lifecycle-runtime:2.3.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel:2.3.1")
+    implementation("androidx.resourceinspection:resourceinspection-annotation:1.0.0-alpha01")
     api("androidx.savedstate:savedstate:1.1.0")
 
+    annotationProcessor("androidx.resourceinspection:resourceinspection-processor:1.0.0-alpha01")
+
     androidTestImplementation(KOTLIN_STDLIB)
     androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
     androidTestImplementation(ANDROIDX_TEST_CORE)

appcompat/appcompat/src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java

diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java
index f345b51..172311c 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java
@@ -37,6 +37,7 @@
 import androidx.appcompat.R;
 import androidx.core.view.GravityCompat;
 import androidx.core.view.ViewCompat;
+import androidx.resourceinspection.annotation.Attribute;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -217,6 +218,12 @@
      * @return A flag set indicating how dividers should be shown around items.
      * @see #setShowDividers(int)
      */
+    @Attribute(value = "androidx.appcompat:showDividers", intMapping = {
+            @Attribute.IntMap(name = "none", value = 0),
+            @Attribute.IntMap(name = "beginning", value = 1, mask = 1),
+            @Attribute.IntMap(name = "middle", value = 2, mask = 2),
+            @Attribute.IntMap(name = "end", value = 4, mask = 4)
+    })
     @DividerMode
     public int getShowDividers() {
         return mShowDividers;
@@ -227,6 +234,8 @@
      *
      * @see #setDividerDrawable(Drawable)
      */
+    @Attribute("androidx.appcompat:divider")
+    @Nullable
     public Drawable getDividerDrawable() {
         return mDivider;
     }
@@ -274,6 +283,7 @@
      * @see #setDividerDrawable(Drawable)
      * @see #setDividerPadding(int)
      */
+    @Attribute("androidx.appcompat:dividerPadding")
     public int getDividerPadding() {
         return mDividerPadding;
     }
@@ -387,6 +397,7 @@
      *
      * @return true when widgets are baseline-aligned, false otherwise
      */
+    @Attribute("android:baselineAligned")
     public boolean isBaselineAligned() {
         return mBaselineAligned;
     }
@@ -410,6 +421,7 @@
      * @return True to measure children with a weight using the minimum
      *         size of the largest child, false otherwise.
      */
+    @Attribute("androidx.appcompat:measureWithLargestChild")
     public boolean isMeasureWithLargestChildEnabled() {
         return mUseLargestChild;
     }
@@ -486,6 +498,8 @@
      *   part of a larger layout that is baseline aligned, or -1 if none has
      *   been set.
      */
+
+    @Attribute("android:baselineAlignedChildIndex")
     public int getBaselineAlignedChildIndex() {
         return mBaselineAlignedChildIndex;
     }
@@ -535,6 +549,7 @@
      *         a number lower than or equals to 0.0f if not weight sum is
      *         to be used.
      */
+    @Attribute("android:weightSum")
     public float getWeightSum() {
         return mWeightSum;
     }
@@ -1672,6 +1687,10 @@
      *
      * @return either {@link #HORIZONTAL} or {@link #VERTICAL}
      */
+    @Attribute(value = "android:orientation", intMapping = {
+            @Attribute.IntMap(name = "horizontal", value = 0),
+            @Attribute.IntMap(name = "vertical", value = 1)
+    })
     @OrientationMode
     public int getOrientation() {
         return mOrientation;
@@ -1706,6 +1725,7 @@
      * @return the current gravity.
      * @see #setGravity
      */
+    @Attribute("android:gravity") // TODO(b/180040871) Mark as gravity attribute
     public int getGravity() {
         return mGravity;
     }

appcompat/appcompat/src/main/java/androidx/appcompat/widget/SearchView.java

diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SearchView.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SearchView.java
index c6a86bd..ffa028c 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SearchView.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SearchView.java
@@ -79,6 +79,7 @@
 import androidx.core.view.ViewCompat;
 import androidx.cursoradapter.widget.CursorAdapter;
 import androidx.customview.view.AbsSavedState;
+import androidx.resourceinspection.annotation.Attribute;
 
 import java.lang.reflect.Method;
 import java.util.WeakHashMap;
@@ -276,6 +277,8 @@
 
         final TintTypedArray a = TintTypedArray.obtainStyledAttributes(context,
                 attrs, R.styleable.SearchView, defStyleAttr, 0);
+        ViewCompat.saveAttributeDataForStyleable(this, context, R.styleable.SearchView, attrs,
+                a.getWrappedTypeArray(), defStyleAttr, 0);
 
         final LayoutInflater inflater = LayoutInflater.from(context);
         final int layoutResId = a.getResourceId(
@@ -448,6 +451,7 @@
      *
      * {@link android.R.attr#imeOptions}
      */
+    @Attribute("android:imeOptions")
     public int getImeOptions() {
         return mSearchSrcTextView.getImeOptions();
     }
@@ -470,6 +474,7 @@
      *
      * {@link android.R.attr#inputType}
      */
+    @Attribute("android:inputType")
     public int getInputType() {
         return mSearchSrcTextView.getInputType();
     }
@@ -613,6 +618,7 @@
      * @return the displayed query hint text, or {@code null} if none set
      * {@link androidx.appcompat.R.attr#queryHint}
      */
+    @Attribute("androidx.appcompat:queryHint")
     @Nullable
     public CharSequence getQueryHint() {
         final CharSequence hint;
@@ -651,6 +657,7 @@
      *
      * {@link androidx.appcompat.R.attr#iconifiedByDefault}
      */
+    @Attribute("androidx.appcompat:iconifiedByDefault")
     public boolean isIconfiedByDefault() {
         return mIconifiedByDefault;
     }
@@ -773,6 +780,7 @@
      *
      * {@link android.R.attr#maxWidth}
      */
+    @Attribute("android:maxWidth")
     public int getMaxWidth() {
         return mMaxWidth;
     }

appcompat/appcompat/src/main/java/androidx/appcompat/widget/SwitchCompat.java

diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SwitchCompat.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SwitchCompat.java
index f4d72a52..c687ab6 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SwitchCompat.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SwitchCompat.java
@@ -54,6 +54,7 @@
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.widget.TextViewCompat;
+import androidx.resourceinspection.annotation.Attribute;
 
 /**
  * SwitchCompat is a complete backport of the core {@link android.widget.Switch} widget that
@@ -442,6 +443,7 @@
      *
      * {@link androidx.appcompat.R.attr#switchPadding}
      */
+    @Attribute("androidx.appcompat:switchPadding")
     public int getSwitchPadding() {
         return mSwitchPadding;
     }
@@ -467,6 +469,7 @@
      *
      * {@link androidx.appcompat.R.attr#switchMinWidth}
      */
+    @Attribute("androidx.appcompat:switchMinWidth")
     public int getSwitchMinWidth() {
         return mSwitchMinWidth;
     }
@@ -490,6 +493,7 @@
      *
      * {@link androidx.appcompat.R.attr#thumbTextPadding}
      */
+    @Attribute("androidx.appcompat:thumbTextPadding")
     public int getThumbTextPadding() {
         return mThumbTextPadding;
     }
@@ -530,6 +534,8 @@
      *
      * {@link androidx.appcompat.R.attr#track}
      */
+    @Attribute("androidx.appcompat:track")
+    @Nullable
     public Drawable getTrackDrawable() {
         return mTrackDrawable;
     }
@@ -559,6 +565,7 @@
      * {@link androidx.appcompat.R.attr#trackTint}
      * @see #setTrackTintList(ColorStateList)
      */
+    @Attribute("androidx.appcompat:trackTint")
     @Nullable
     public ColorStateList getTrackTintList() {
         return mTrackTintList;
@@ -587,6 +594,7 @@
      * {@link androidx.appcompat.R.attr#trackTintMode}
      * @see #setTrackTintMode(PorterDuff.Mode)
      */
+    @Attribute("androidx.appcompat:trackTintMode")
     @Nullable
     public PorterDuff.Mode getTrackTintMode() {
         return mTrackTintMode;
@@ -651,6 +659,8 @@
      *
      * {@link android.R.attr#thumb}
      */
+    @Attribute("android:thumb")
+    @Nullable
     public Drawable getThumbDrawable() {
         return mThumbDrawable;
     }
@@ -681,6 +691,7 @@
      * {@link androidx.appcompat.R.attr#thumbTint}
      * @see #setThumbTintList(ColorStateList)
      */
+    @Attribute("androidx.appcompat:thumbTint")
     @Nullable
     public ColorStateList getThumbTintList() {
         return mThumbTintList;
@@ -710,6 +721,7 @@
      * {@link androidx.appcompat.R.attr#thumbTintMode}
      * @see #setThumbTintMode(PorterDuff.Mode)
      */
+    @Attribute("androidx.appcompat:thumbTintMode")
     @Nullable
     public PorterDuff.Mode getThumbTintMode() {
         return mThumbTintMode;
@@ -754,6 +766,7 @@
      *
      * {@link androidx.appcompat.R.attr#splitTrack}
      */
+    @Attribute("androidx.appcompat:splitTrack")
     public boolean getSplitTrack() {
         return mSplitTrack;
     }
@@ -763,6 +776,8 @@
      *
      * {@link android.R.attr#textOn}
      */
+    @Attribute("android:textOn")
+    @Nullable
     public CharSequence getTextOn() {
         return mTextOn;
     }
@@ -787,6 +802,8 @@
      *
      * {@link android.R.attr#textOff}
      */
+    @Attribute("android:textOff")
+    @Nullable
     public CharSequence getTextOff() {
         return mTextOff;
     }
@@ -823,6 +840,7 @@
      * @return whether the on/off text should be displayed
      * {@link androidx.appcompat.R.attr#showText}
      */
+    @Attribute("androidx.appcompat:showText")
     public boolean getShowText() {
         return mShowText;
     }

appcompat/appcompat/src/main/java/androidx/appcompat/widget/Toolbar.java

diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/Toolbar.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/Toolbar.java
index 2da6793..f11ccf1 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/Toolbar.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/Toolbar.java
@@ -64,6 +64,7 @@
 import androidx.core.view.MarginLayoutParamsCompat;
 import androidx.core.view.ViewCompat;
 import androidx.customview.view.AbsSavedState;
+import androidx.resourceinspection.annotation.Attribute;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -376,6 +377,8 @@
      *         0 if menus are inflated against the toolbar theme
      * @see #setPopupTheme(int)
      */
+    @Attribute("androidx.appcompat:popupTheme")
+    @StyleRes
     public int getPopupTheme() {
         return mPopupTheme;
     }
@@ -407,6 +410,7 @@
      * @see #setTitleMarginStart(int)
      * {@link androidx.appcompat.R.attr#titleMarginStart}
      */
+    @Attribute("androidx.appcompat:titleMarginStart")
     public int getTitleMarginStart() {
         return mTitleMarginStart;
     }
@@ -429,6 +433,7 @@
      * @see #setTitleMarginTop(int)
      * {@link androidx.appcompat.R.attr#titleMarginTop}
      */
+    @Attribute("androidx.appcompat:titleMarginTop")
     public int getTitleMarginTop() {
         return mTitleMarginTop;
     }
@@ -451,6 +456,7 @@
      * @see #setTitleMarginEnd(int)
      * {@link androidx.appcompat.R.attr#titleMarginEnd}
      */
+    @Attribute("androidx.appcompat:titleMarginEnd")
     public int getTitleMarginEnd() {
         return mTitleMarginEnd;
     }
@@ -473,6 +479,7 @@
      * @see #setTitleMarginBottom(int)
      * {@link androidx.appcompat.R.attr#titleMarginBottom}
      */
+    @Attribute("androidx.appcompat:titleMarginBottom")
     public int getTitleMarginBottom() {
         return mTitleMarginBottom;
     }
@@ -650,6 +657,8 @@
      * @see #setLogo(int)
      * @see #setLogo(android.graphics.drawable.Drawable)
      */
+    @Attribute("androidx.appcompat:logo")
+    @Nullable
     public Drawable getLogo() {
         return mLogoView != null ? mLogoView.getDrawable() : null;
     }
@@ -688,6 +697,8 @@
      *
      * @return A description of the logo
      */
+    @Attribute("androidx.appcompat:logoDescription")
+    @Nullable
     public CharSequence getLogoDescription() {
         return mLogoView != null ? mLogoView.getContentDescription() : null;
     }
@@ -791,6 +802,8 @@
      *
      * @return The current subtitle
      */
+    @Attribute("androidx.appcompat:subtitle")
+    @Nullable
     public CharSequence getSubtitle() {
         return mSubtitleText;
     }
@@ -913,6 +926,7 @@
      *
      * {@link androidx.appcompat.R.attr#navigationContentDescription}
      */
+    @Attribute("androidx.appcompat:navigationContentDescription")
     @Nullable
     public CharSequence getNavigationContentDescription() {
         return mNavButtonView != null ? mNavButtonView.getContentDescription() : null;
@@ -1005,6 +1019,7 @@
      *
      * {@link androidx.appcompat.R.attr#navigationIcon}
      */
+    @Attribute("androidx.appcompat:navigationIcon")
     @Nullable
     public Drawable getNavigationIcon() {
         return mNavButtonView != null ? mNavButtonView.getDrawable() : null;
@@ -1033,6 +1048,7 @@
      *
      * {@link androidx.appcompat.R.attr#collapseContentDescription}
      */
+    @Attribute("androidx.appcompat:collapseContentDescription")
     @Nullable
     public CharSequence getCollapseContentDescription() {
         return mCollapseButtonView != null ? mCollapseButtonView.getContentDescription() : null;
@@ -1078,6 +1094,7 @@
      *
      * {@link androidx.appcompat.R.attr#collapseIcon}
      */
+    @Attribute("androidx.appcompat:collapseIcon")
     @Nullable
     public Drawable getCollapseIcon() {
         return mCollapseButtonView != null ? mCollapseButtonView.getDrawable() : null;
@@ -1125,6 +1142,8 @@
      * @return The toolbar's Menu
      * {@link androidx.appcompat.R.attr#menu}
      */
+    @Attribute("androidx.appcompat:menu")
+    @Nullable
     public Menu getMenu() {
         ensureMenu();
         return mMenuView.getMenu();
@@ -1245,6 +1264,7 @@
      * @see #getContentInsetRight()
      * {@link androidx.appcompat.R.attr#contentInsetStart}
      */
+    @Attribute("androidx.appcompat:contentInsetStart")
     public int getContentInsetStart() {
         return mContentInsets != null ? mContentInsets.getStart() : 0;
     }
@@ -1265,6 +1285,7 @@
      * @see #getContentInsetRight()
      * {@link androidx.appcompat.R.attr#contentInsetEnd}
      */
+    @Attribute("androidx.appcompat:contentInsetEnd")
     public int getContentInsetEnd() {
         return mContentInsets != null ? mContentInsets.getEnd() : 0;
     }
@@ -1308,6 +1329,7 @@
      * @see #getContentInsetRight()
      * {@link androidx.appcompat.R.attr#contentInsetLeft}
      */
+    @Attribute("androidx.appcompat:contentInsetLeft")
     public int getContentInsetLeft() {
         return mContentInsets != null ? mContentInsets.getLeft() : 0;
     }
@@ -1328,6 +1350,7 @@
      * @see #getContentInsetLeft()
      * {@link androidx.appcompat.R.attr#contentInsetRight}
      */
+    @Attribute("androidx.appcompat:contentInsetRight")
     public int getContentInsetRight() {
         return mContentInsets != null ? mContentInsets.getRight() : 0;
     }
@@ -1344,6 +1367,7 @@
      * @see #setContentInsetStartWithNavigation(int)
      * {@link androidx.appcompat.R.attr#contentInsetStartWithNavigation}
      */
+    @Attribute("androidx.appcompat:contentInsetStartWithNavigation")
     public int getContentInsetStartWithNavigation() {
         return mContentInsetStartWithNavigation != RtlSpacingHelper.UNDEFINED
                 ? mContentInsetStartWithNavigation
@@ -1387,6 +1411,7 @@
      * @see #setContentInsetEndWithActions(int)
      * {@link androidx.appcompat.R.attr#contentInsetEndWithActions}
      */
+    @Attribute("androidx.appcompat:contentInsetEndWithActions")
     public int getContentInsetEndWithActions() {
         return mContentInsetEndWithActions != RtlSpacingHelper.UNDEFINED
                 ? mContentInsetEndWithActions

benchmark/docs/macrobenchmark.md

diff --git a/benchmark/docs/macrobenchmark.md b/benchmark/docs/macrobenchmark.md
index 3330d59a..9b8bde1 100644
--- a/benchmark/docs/macrobenchmark.md
+++ b/benchmark/docs/macrobenchmark.md
@@ -292,8 +292,9 @@
 
 ![Studio Trace](macrobenchmark_images/studio_trace.png "Studio trace UI")
 
-NOTE: Android Studio does not yet support automatically pulling trace files off
-of the device, this step must be performed manually for now.
+NOTE: Android Studio [does not yet support](#studio-trace-access) automatically
+pulling trace files off of the device, this step must be performed manually for
+now.
 
 Currently, when running tests from Studio, you must manually pull profiling
 traces to inspect them after a benchmark run, e.g.:
@@ -466,6 +467,16 @@
 Activity launch. As a temporary workaround, you can add a
 `Thread.sleep(5000/*ms*/)` at the end of your `measureRepeated {}` block.
 
+### Studio Trace Access {#studio-trace-access}
+
+Support for easy trace access is being added in Android Studio. Once available,
+you'll be able to click a result metric, or iteration index, and open the trace
+directly in Studio:
+
+![Studio Integration Results](macrobenchmark_images/studio_integ_results.png "Studio results with trace links")
+
+![Studio Integration Trace](macrobenchmark_images/studio_integ_trace.png "Studio, displaying macrobenchmark trace")
+
 ## Feedback
 
 To report issues or submit feature requests for Jetpack Macrobenchmark, see the

benchmark/docs/macrobenchmark_images/studio_integ_results.png

diff --git a/benchmark/docs/macrobenchmark_images/studio_integ_results.png b/benchmark/docs/macrobenchmark_images/studio_integ_results.png
new file mode 100644
index 0000000..6e86c28
--- /dev/null
+++ b/benchmark/docs/macrobenchmark_images/studio_integ_results.png
Binary files differ

benchmark/docs/macrobenchmark_images/studio_integ_trace.png

diff --git a/benchmark/docs/macrobenchmark_images/studio_integ_trace.png b/benchmark/docs/macrobenchmark_images/studio_integ_trace.png
new file mode 100644
index 0000000..368ef26
--- /dev/null
+++ b/benchmark/docs/macrobenchmark_images/studio_integ_trace.png
Binary files differ

browser/browser/src/androidTest/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPoolTest.java

diff --git a/browser/browser/src/androidTest/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPoolTest.java b/browser/browser/src/androidTest/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPoolTest.java
index a7fc625..a1439a7 100644
--- a/browser/browser/src/androidTest/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPoolTest.java
+++ b/browser/browser/src/androidTest/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPoolTest.java
@@ -36,6 +36,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -78,6 +79,7 @@
         mManager.unbindAllConnections();
     }
 
+    @Ignore("Test disabled due to flakiness, see b/182415874")
     @Test
     public void testConnection() {
         final AtomicBoolean connected = new AtomicBoolean();

buildSrc/build_dependencies.gradle

diff --git a/buildSrc/build_dependencies.gradle b/buildSrc/build_dependencies.gradle
index 5065107..935497b 100644
--- a/buildSrc/build_dependencies.gradle
+++ b/buildSrc/build_dependencies.gradle
@@ -23,7 +23,7 @@
 build_versions.lint = build_versions.studio["lint"]
 
 build_versions.kotlin = "1.4.31"
-build_versions.kotlin_coroutines = "1.4.1"
+build_versions.kotlin_coroutines = "1.4.3"
 build_versions.ksp = "1.4.30-1.0.0-alpha05"
 
 build_versions.hilt = "2.33-beta"

buildSrc/src/main/kotlin/androidx/build/AndroidXPlaygroundRootPlugin.kt

diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlaygroundRootPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlaygroundRootPlugin.kt
index 365c7c9..ebf8a0b 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlaygroundRootPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlaygroundRootPlugin.kt
@@ -16,7 +16,6 @@
 
 package androidx.build
 
-import androidx.build.AndroidXRootPlugin.Companion.PREBUILT_OR_SNAPSHOT_EXT_NAME
 import androidx.build.AndroidXRootPlugin.Companion.PROJECT_OR_ARTIFACT_EXT_NAME
 import androidx.build.gradle.isRoot
 import groovy.xml.DOMBuilder
@@ -55,12 +54,6 @@
         }
     )
 
-    private val prebuiltOrSnapshotClosure = KotlinClosure1<String, String>(
-        function = {
-            prebuiltOrSnapshot(this)
-        }
-    )
-
     override fun apply(target: Project) {
         if (!target.isRoot) {
             throw GradleException("This plugin should only be applied to root project")
@@ -82,7 +75,6 @@
     private fun configureSubProject(project: Project) {
         project.repositories.addPlaygroundRepositories()
         project.extra.set(PROJECT_OR_ARTIFACT_EXT_NAME, projectOrArtifactClosure)
-        project.extra.set(PREBUILT_OR_SNAPSHOT_EXT_NAME, prebuiltOrSnapshotClosure)
         project.configurations.all { configuration ->
             configuration.resolutionStrategy.dependencySubstitution.all { substitution ->
                 substitution.replaceIfSnapshot()
@@ -127,21 +119,6 @@
         }
     }
 
-    private fun prebuiltOrSnapshot(path: String): String {
-        val sections = path.split(":")
-
-        if (sections.size != 3) {
-            throw GradleException(
-                "Expected prebuiltOrSnapshot path to be of the form " +
-                    "<group>:<artifact>:<version>, but was $path"
-            )
-        }
-
-        val group = sections[0]
-        val artifact = sections[1]
-        return "$group:$artifact:$SNAPSHOT_MARKER"
-    }
-
     private fun DependencySubstitution.replaceIfSnapshot() {
         val requested = this.requested
         if (requested is ModuleComponentSelector && requested.version == SNAPSHOT_MARKER) {

buildSrc/src/main/kotlin/androidx/build/AndroidXRootPlugin.kt

diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXRootPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXRootPlugin.kt
index ce0b8d1..471adb5 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXRootPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXRootPlugin.kt
@@ -101,15 +101,6 @@
                     }
                 )
             )
-            project.extra.set(
-                PREBUILT_OR_SNAPSHOT_EXT_NAME,
-                KotlinClosure1<String, String>(
-                    function = {
-                        // this refers to the first parameter of the closure.
-                        this
-                    }
-                )
-            )
             project.plugins.withType(AndroidBasePlugin::class.java) {
                 buildOnServerTask.dependsOn("${project.path}:assembleDebug")
                 buildOnServerTask.dependsOn("${project.path}:assembleAndroidTest")
@@ -245,6 +236,5 @@
 
     companion object {
         const val PROJECT_OR_ARTIFACT_EXT_NAME = "projectOrArtifact"
-        const val PREBUILT_OR_SNAPSHOT_EXT_NAME = "prebuiltOrSnapshot"
     }
 }

buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt

diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt
index d22e5be..5ed7290 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt
@@ -57,7 +57,6 @@
     val HILT = LibraryGroup("androidx.hilt", null)
     val INSPECTION = LibraryGroup("androidx.inspection", LibraryVersions.INSPECTION)
     val INSPECTION_EXTENSIONS = LibraryGroup("androidx.inspection.extensions", LibraryVersions.SQLITE_INSPECTOR)
-    val IPC = LibraryGroup("androidx.ipc", LibraryVersions.IPC)
     val INTERPOLATOR = LibraryGroup("androidx.interpolator", LibraryVersions.INTERPOLATOR)
     val JETIFIER = LibraryGroup("com.android.tools.build.jetifier", null)
     val LEANBACK = LibraryGroup("androidx.leanback", null)
@@ -82,7 +81,6 @@
     val STARTUP = LibraryGroup("androidx.startup", LibraryVersions.STARTUP)
     val SAVEDSTATE = LibraryGroup("androidx.savedstate", LibraryVersions.SAVEDSTATE)
     val SECURITY = LibraryGroup("androidx.security", null)
-    val SERIALIZATION = LibraryGroup("androidx.serialization", LibraryVersions.SERIALIZATION)
     val SHARETARGET = LibraryGroup("androidx.sharetarget", LibraryVersions.SHARETARGET)
     val SLICE = LibraryGroup("androidx.slice", null)
     val SLIDINGPANELAYOUT = LibraryGroup("androidx.slidingpanelayout", LibraryVersions.SLIDINGPANELAYOUT)
@@ -100,6 +98,7 @@
     val VIEWPAGER = LibraryGroup("androidx.viewpager", LibraryVersions.VIEWPAGER)
     val VIEWPAGER2 = LibraryGroup("androidx.viewpager2", LibraryVersions.VIEWPAGER2)
     val WEAR = LibraryGroup("androidx.wear", null)
+    val WEAR_TILES = LibraryGroup("androidx.wear.tiles", LibraryVersions.WEAR_TILES)
     val WEBKIT = LibraryGroup("androidx.webkit", LibraryVersions.WEBKIT)
     val WINDOW = LibraryGroup("androidx.window", null)
     val WORK = LibraryGroup("androidx.work", LibraryVersions.WORK)

buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt

diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
index d805f25..9c4140d 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
@@ -20,7 +20,7 @@
  * The list of versions codes of all the libraries in this project.
  */
 object LibraryVersions {
-    val ACTIVITY = Version("1.3.0-alpha05")
+    val ACTIVITY = Version("1.3.0-alpha06")
     val ADS_IDENTIFIER = Version("1.0.0-alpha04")
     val ANNOTATION = Version("1.3.0-alpha01")
     val ANNOTATION_EXPERIMENTAL = Version("1.2.0-alpha01")
@@ -41,12 +41,12 @@
     val CAMERA_VIDEO = Version("1.0.0-alpha01")
     val CAMERA_VIEW = Version("1.0.0-alpha23")
     val CARDVIEW = Version("1.1.0-alpha01")
-    val CAR_APP = Version("1.0.0-rc01")
+    val CAR_APP = Version("1.1.0-alpha01")
     // Pre-release before confirming to the same version as the rest of the CAR_APP library group.
     val CAR_APP_PRE_RELEASE = Version("1.0.0-alpha01")
     val COLLECTION = Version("1.2.0-alpha02")
     val CONTENTPAGER = Version("1.1.0-alpha01")
-    val COMPOSE = Version(System.getenv("COMPOSE_CUSTOM_VERSION") ?: "1.0.0-beta03")
+    val COMPOSE = Version(System.getenv("COMPOSE_CUSTOM_VERSION") ?: "1.0.0-beta04")
     val COORDINATORLAYOUT = Version("1.2.0-alpha01")
     val CORE = Version("1.6.0-alpha01")
     val CORE_ANIMATION = Version("1.0.0-alpha03")
@@ -73,11 +73,10 @@
     val HILT_NAVIGATION_COMPOSE = Version("1.0.0-alpha02")
     val INSPECTION = Version("1.0.0")
     val INTERPOLATOR = Version("1.1.0-alpha01")
-    val IPC = Version("1.0.0-alpha01")
     val JETIFIER = Version("1.0.0-beta10")
-    val LEANBACK = Version("1.1.0-beta01")
+    val LEANBACK = Version("1.2.0-alpha01")
     val LEANBACK_PAGING = Version("1.1.0-beta01")
-    val LEANBACK_PREFERENCE = Version("1.1.0-beta01")
+    val LEANBACK_PREFERENCE = Version("1.2.0-alpha01")
     val LEANBACK_TAB = Version("1.1.0-beta01")
     val LEGACY = Version("1.1.0-alpha01")
     val LOCALBROADCASTMANAGER = Version("1.1.0-alpha02")
@@ -107,14 +106,13 @@
     val SECURITY_APP_AUTHENTICATOR = Version("1.0.0-alpha01")
     val SECURITY_BIOMETRIC = Version("1.0.0-alpha01")
     val SECURITY_IDENTITY_CREDENTIAL = Version("1.0.0-alpha02")
-    val SERIALIZATION = Version("1.0.0-alpha01")
     val SHARETARGET = Version("1.2.0-alpha01")
     val SLICE = Version("1.1.0-alpha02")
     val SLICE_BENCHMARK = Version("1.1.0-alpha02")
     val SLICE_BUILDERS_KTX = Version("1.0.0-alpha08")
     val SLICE_REMOTECALLBACK = Version("1.0.0-alpha01")
     val SLIDINGPANELAYOUT = Version("1.2.0-alpha01")
-    val STARTUP = Version("1.0.0")
+    val STARTUP = Version("1.1.0-alpha01")
     val SQLITE = Version("2.2.0-alpha01")
     val SQLITE_INSPECTOR = Version("2.1.0-alpha01")
     val SWIPEREFRESHLAYOUT = Version("1.2.0-alpha01")
@@ -137,14 +135,13 @@
     val WEAR_PHONE_INTERACTIONS = Version("1.0.0-alpha04")
     val WEAR_REMOTE_INTERACTIONS = Version("1.0.0-alpha03")
     val WEAR_TILES = Version("1.0.0-alpha02")
-    val WEAR_TILES_DATA = WEAR_TILES
     val WEAR_WATCHFACE = Version("1.0.0-alpha10")
     val WEAR_WATCHFACE_CLIENT = Version("1.0.0-alpha10")
     val WEAR_WATCHFACE_DATA = Version("1.0.0-alpha10")
     val WEAR_WATCHFACE_EDITOR = Version("1.0.0-alpha10")
     val WEAR_WATCHFACE_STYLE = Version("1.0.0-alpha10")
     val WEBKIT = Version("1.5.0-alpha01")
-    val WINDOW = Version("1.0.0-alpha05")
+    val WINDOW = Version("1.0.0-alpha06")
     val WINDOW_EXTENSIONS = Version("1.0.0-alpha01")
     val WINDOW_SIDECAR = Version("0.1.0-alpha01")
     val WORK = Version("2.6.0-alpha01")

buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt

diff --git a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
index 6d0f116..9cd3268 100644
--- a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
@@ -27,7 +27,7 @@
 const val ANDROIDX_TEST_RULES = "androidx.test:rules:1.3.0"
 const val ANDROIDX_TEST_RUNNER = "androidx.test:runner:1.3.0"
 const val ANDROIDX_TEST_UIAUTOMATOR = "androidx.test.uiautomator:uiautomator:2.2.0"
-const val AUTO_COMMON = "com.google.auto:auto-common:0.10"
+const val AUTO_COMMON = "com.google.auto:auto-common:0.11"
 const val AUTO_SERVICE_ANNOTATIONS = "com.google.auto.service:auto-service-annotations:1.0-rc6"
 const val AUTO_SERVICE_PROCESSOR = "com.google.auto.service:auto-service:1.0-rc6"
 const val AUTO_VALUE = "com.google.auto.value:auto-value:1.6.3"
@@ -108,7 +108,7 @@
 const val REACTIVE_STREAMS = "org.reactivestreams:reactive-streams:1.0.0"
 const val RX_JAVA = "io.reactivex.rxjava2:rxjava:2.2.9"
 const val RX_JAVA3 = "io.reactivex.rxjava3:rxjava:3.0.0"
-val SKIKO_VERSION = System.getenv("SKIKO_VERSION") ?: "0.2.16"
+val SKIKO_VERSION = System.getenv("SKIKO_VERSION") ?: "0.2.18"
 val SKIKO = "org.jetbrains.skiko:skiko-jvm:$SKIKO_VERSION"
 val SKIKO_LINUX_X64 = "org.jetbrains.skiko:skiko-jvm-runtime-linux-x64:$SKIKO_VERSION"
 val SKIKO_MACOS_X64 = "org.jetbrains.skiko:skiko-jvm-runtime-macos-x64:$SKIKO_VERSION"
@@ -127,6 +127,7 @@
     }
 }
 const val TRUTH = "com.google.truth:truth:1.0.1"
+const val VIEW_BINDING = "androidx.databinding:viewbinding:4.1.2"
 const val XERIAL = "org.xerial:sqlite-jdbc:3.25.2"
 const val XPP3 = "xpp3:xpp3:1.1.4c"
 const val XMLPULL = "xmlpull:xmlpull:1.1.3.1"

buildSrc/src/main/kotlin/androidx/build/docs/AndroidXDocsPlugin.kt

diff --git a/buildSrc/src/main/kotlin/androidx/build/docs/AndroidXDocsPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/docs/AndroidXDocsPlugin.kt
index 2e01a77..faf178a 100644
--- a/buildSrc/src/main/kotlin/androidx/build/docs/AndroidXDocsPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/docs/AndroidXDocsPlugin.kt
@@ -305,7 +305,7 @@
                 val filePath = "${project.getDistributionDirectory().canonicalPath}/"
                 val fileName = "$baseName-$buildId.zip"
                 val destinationFile = filePath + fileName
-                description = "Zips Java documentation (generated via Doclava in the " +
+                description = "Zips Kotlin documentation (generated via Dokka in the " +
                     "style of d.android.com) into $destinationFile"
             }
         }

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt

diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt
index c2e6423..02ad9bb 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt
@@ -22,6 +22,7 @@
 import androidx.camera.camera2.pipe.CameraPipe
 import androidx.camera.camera2.pipe.core.Log.warn
 import androidx.camera.camera2.pipe.integration.config.CameraScope
+import androidx.camera.camera2.pipe.integration.impl.UseCaseThreads
 import androidx.camera.camera2.pipe.integration.impl.CameraProperties
 import androidx.camera.camera2.pipe.integration.impl.EvCompControl
 import androidx.camera.camera2.pipe.integration.impl.UseCaseCamera
@@ -38,7 +39,6 @@
 import androidx.camera.core.impl.MutableOptionsBundle
 import androidx.camera.core.impl.utils.futures.Futures
 import com.google.common.util.concurrent.ListenableFuture
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.async
@@ -57,7 +57,7 @@
 @OptIn(ExperimentalCoroutinesApi::class)
 class CameraControlAdapter @Inject constructor(
     private val cameraProperties: CameraProperties,
-    private val cameraScope: CoroutineScope,
+    private val threads: UseCaseThreads,
     private val useCaseManager: UseCaseManager,
     private val cameraStateAdapter: CameraStateAdapter,
     private val zoomControl: ZoomControl,
@@ -84,7 +84,7 @@
 
     override fun enableTorch(torch: Boolean): ListenableFuture<Void> {
         // Launch UNDISPATCHED to preserve interaction order with the camera.
-        return cameraScope.launch(start = CoroutineStart.UNDISPATCHED) {
+        return threads.scope.launch(start = CoroutineStart.UNDISPATCHED) {
             useCaseManager.camera?.let {
                 // Tell the camera to turn the torch on / off.
                 val result = it.setTorchAsync(torch)
@@ -116,7 +116,7 @@
     }
 
     override fun setZoomRatio(ratio: Float): ListenableFuture<Void> {
-        return cameraScope.launch(start = CoroutineStart.UNDISPATCHED) {
+        return threads.scope.launch(start = CoroutineStart.UNDISPATCHED) {
             useCaseManager.camera?.let {
                 zoomControl.zoomRatio = ratio
                 val zoomValue = ZoomValue(
@@ -159,7 +159,7 @@
 
     @SuppressLint("UnsafeExperimentalUsageError")
     override fun setExposureCompensationIndex(exposure: Int): ListenableFuture<Int> {
-        return cameraScope.async(start = CoroutineStart.UNDISPATCHED) {
+        return threads.scope.async(start = CoroutineStart.UNDISPATCHED) {
             useCaseManager.camera?.let {
                 evCompControl.evCompIndex = exposure
                 cameraStateAdapter.setExposureState(

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraAppConfig.kt

diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraAppConfig.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraAppConfig.kt
index d8eadf0..7e74713 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraAppConfig.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraAppConfig.kt
@@ -23,6 +23,7 @@
 import dagger.Component
 import dagger.Module
 import dagger.Provides
+import kotlinx.coroutines.runBlocking
 import javax.inject.Singleton
 
 /** Dependency bindings for adapting a [CameraFactory] instance to [CameraPipe] */
@@ -39,7 +40,7 @@
 
         @Provides
         fun provideAvailableCameraIds(cameraPipe: CameraPipe): Set<String> {
-            return cameraPipe.cameras().findAll().map { it.value }.toSet()
+            return runBlocking { cameraPipe.cameras().ids().map { it.value }.toSet() }
         }
     }
 }
@@ -48,10 +49,13 @@
 @Module
 class CameraAppConfig(
     private val context: Context,
-    private val threadConfig: CameraThreadConfig
+    private val cameraThreadConfig: CameraThreadConfig
 ) {
     @Provides
     fun provideContext(): Context = context
+
+    @Provides
+    fun provideCameraThreadConfig(): CameraThreadConfig = cameraThreadConfig
 }
 
 /** Dagger component for Application (Process) scoped dependencies. */

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraConfig.kt

diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraConfig.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraConfig.kt
index 0953944..797d497 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraConfig.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraConfig.kt
@@ -27,18 +27,20 @@
 import androidx.camera.camera2.pipe.integration.impl.CameraProperties
 import androidx.camera.camera2.pipe.integration.compat.ZoomCompat
 import androidx.camera.camera2.pipe.integration.impl.EvCompControl
+import androidx.camera.camera2.pipe.integration.impl.UseCaseThreads
 import androidx.camera.camera2.pipe.integration.impl.ZoomControl
 import androidx.camera.core.impl.CameraControlInternal
 import androidx.camera.core.impl.CameraInfoInternal
 import androidx.camera.core.impl.CameraInternal
+import androidx.camera.core.impl.CameraThreadConfig
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.Subcomponent
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.asCoroutineDispatcher
 import javax.inject.Scope
 
 @Scope
@@ -56,15 +58,27 @@
 )
 abstract class CameraModule {
     companion object {
+
         @CameraScope
         @Provides
-        fun provideCameraCoroutineScope(cameraConfig: CameraConfig): CoroutineScope {
-            // TODO: Dispatchers.Default is the standard kotlin coroutine executor for background
-            //   work, but we may want to pass something in.
-            return CoroutineScope(
+        fun provideUseCaseThreads(
+            cameraConfig: CameraConfig,
+            cameraThreadConfig: CameraThreadConfig
+        ): UseCaseThreads {
+
+            val executor = cameraThreadConfig.cameraExecutor
+            val dispatcher = cameraThreadConfig.cameraExecutor.asCoroutineDispatcher()
+
+            val cameraScope = CoroutineScope(
                 Job() +
-                    Dispatchers.Default +
-                    CoroutineName("CXCP-Camera-${cameraConfig.cameraId.value}")
+                    dispatcher +
+                    CoroutineName("CXCP-UseCase-${cameraConfig.cameraId.value}")
+            )
+
+            return UseCaseThreads(
+                cameraScope,
+                executor,
+                dispatcher
             )
         }
 

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCamera.kt

diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCamera.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCamera.kt
index 082989e..e16c2d3 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCamera.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCamera.kt
@@ -17,6 +17,7 @@
 package androidx.camera.camera2.pipe.integration.impl
 
 import android.hardware.camera2.CaptureRequest
+import android.view.Surface
 import androidx.camera.camera2.pipe.CameraGraph
 import androidx.camera.camera2.pipe.CameraPipe
 import androidx.camera.camera2.pipe.CameraStream
@@ -29,10 +30,11 @@
 import androidx.camera.camera2.pipe.integration.config.UseCaseCameraScope
 import androidx.camera.core.UseCase
 import androidx.camera.core.impl.DeferrableSurface
+import androidx.camera.core.impl.utils.futures.FutureCallback
+import androidx.camera.core.impl.utils.futures.Futures
 import dagger.Module
 import dagger.Provides
 import kotlinx.atomicfu.atomic
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 
 internal val useCaseCameraIds = atomic(0)
@@ -147,7 +149,7 @@
                 useCases: java.util.ArrayList<UseCase>,
                 cameraConfig: CameraConfig,
                 callbackMap: CameraCallbackMap,
-                coroutineScope: CoroutineScope,
+                threads: UseCaseThreads,
             ): UseCaseCamera {
                 val streamConfigs = mutableListOf<CameraStream.Config>()
                 val useCaseMap = mutableMapOf<CameraStream.Config, UseCase>()
@@ -184,12 +186,27 @@
                     val deferredSurfaces = useCaseSessionConfig?.surfaces
                     if (stream != null && deferredSurfaces != null && deferredSurfaces.size == 1) {
                         val deferredSurface = deferredSurfaces.first()
-                        graph.setSurface(stream.id, deferredSurface.surface.get())
                         surfaceToStreamMap[deferredSurface] = stream.id
+
+                        Futures.addCallback(
+                            deferredSurface.surface,
+                            object : FutureCallback<Surface?> {
+                                override fun onSuccess(result: Surface?) {
+                                    debug { "Configured $result for $stream" }
+                                    graph.setSurface(stream.id, result)
+                                }
+
+                                override fun onFailure(t: Throwable) {
+                                    debug(t) { "Surface for $deferredSurface failed to arrive!" }
+                                    graph.setSurface(stream.id, null)
+                                }
+                            },
+                            threads.backgroundExecutor
+                        )
                     }
                 }
 
-                val state = UseCaseCameraState(graph, coroutineScope)
+                val state = UseCaseCameraState(graph, threads)
 
                 graph.start()
                 return UseCaseCameraImpl(graph, useCases, surfaceToStreamMap, state)

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCameraState.kt

diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCameraState.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCameraState.kt
index 1520d65..b1cb05d 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCameraState.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCameraState.kt
@@ -27,7 +27,6 @@
 import androidx.camera.camera2.pipe.StreamId
 import androidx.camera.camera2.pipe.integration.config.UseCaseCameraScope
 import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -46,7 +45,7 @@
 @UseCaseCameraScope
 class UseCaseCameraState @Inject constructor(
     private val cameraGraph: CameraGraph,
-    private val coroutineScope: CoroutineScope
+    private val threads: UseCaseThreads
 ) {
     private val lock = Any()
 
@@ -158,7 +157,7 @@
         // synchronously with the latest values. The setRepeating call happens outside of the
         // synchronized block to avoid holding a lock while updating the camera state.
 
-        coroutineScope.launch(start = CoroutineStart.UNDISPATCHED) {
+        threads.scope.launch(start = CoroutineStart.UNDISPATCHED) {
             val result: CompletableDeferred<Unit>?
             cameraGraph.acquireSession().use {
                 val request: Request

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseThreads.kt

diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseThreads.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseThreads.kt
new file mode 100644
index 0000000..c96c461
--- /dev/null
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseThreads.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.camera2.pipe.integration.impl
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import java.util.concurrent.Executor
+
+/**
+ * Collection of threads and scope(s) that have been configured and tuned.
+ */
+class UseCaseThreads(
+    val scope: CoroutineScope,
+
+    val backgroundExecutor: Executor,
+    val backgroundDispatcher: CoroutineDispatcher,
+)

camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulator.kt

diff --git a/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulator.kt b/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulator.kt
index 8eb6fb9..e3f878f4 100644
--- a/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulator.kt
+++ b/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulator.kt
@@ -34,17 +34,17 @@
 /** Simulator for observing and responding to interactions with the a [CameraGraph]. */
 class CameraGraphSimulator(
     private val config: CameraGraph.Config,
-    metadata: CameraMetadata
+    cameraMetadata: CameraMetadata
 ) {
     init {
-        check(config.camera == metadata.camera)
+        check(config.camera == cameraMetadata.camera)
     }
 
     private val fakeRequestProcessor = FakeRequestProcessor()
     private val cameraPipe = CameraPipe.External()
     public val cameraGraph = cameraPipe.create(
         config,
-        FakeCameraDevices(listOf(metadata)),
+        cameraMetadata,
         fakeRequestProcessor
     )
 

camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/FakeCameraDevices.kt

diff --git a/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/FakeCameraDevices.kt b/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/FakeCameraDevices.kt
index 7ec59dc..2359af4 100644
--- a/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/FakeCameraDevices.kt
+++ b/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/FakeCameraDevices.kt
@@ -19,6 +19,7 @@
 import androidx.camera.camera2.pipe.CameraDevices
 import androidx.camera.camera2.pipe.CameraId
 import androidx.camera.camera2.pipe.CameraMetadata
+import kotlinx.coroutines.runBlocking
 
 /**
  * This provides a fake implementation of [CameraDevices] for tests with a fixed list of Cameras.
@@ -26,7 +27,9 @@
 class FakeCameraDevices(
     private val cameras: List<CameraMetadata>
 ) : CameraDevices {
-    override fun findAll(): List<CameraId> = cameras.map { it.camera }
+    override fun findAll(): List<CameraId> = runBlocking { ids() }
+    override suspend fun ids(): List<CameraId> = cameras.map { it.camera }
+
     override suspend fun getMetadata(camera: CameraId): CameraMetadata = awaitMetadata(camera)
     override fun awaitMetadata(camera: CameraId): CameraMetadata = cameras.first {
         it.camera == camera

camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/FakeMetadata.kt

diff --git a/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/FakeMetadata.kt b/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/FakeMetadata.kt
index 046dd5f..8aab48c 100644
--- a/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/FakeMetadata.kt
+++ b/camera/camera-camera2-pipe-testing/src/main/java/androidx/camera/camera2/pipe/testing/FakeMetadata.kt
@@ -22,7 +22,6 @@
 import android.hardware.camera2.CaptureRequest
 import android.hardware.camera2.CaptureResult
 import android.hardware.camera2.TotalCaptureResult
-import android.hardware.camera2.params.StreamConfigurationMap
 import android.view.Surface
 import androidx.camera.camera2.pipe.CameraId
 import androidx.camera.camera2.pipe.CameraMetadata
@@ -92,10 +91,6 @@
     override val physicalCameraIds: Set<CameraId> = emptySet()
     override val physicalRequestKeys: Set<CaptureRequest.Key<*>> = emptySet()
 
-    override val streamMap: StreamConfigurationMap
-        /** @throws UnsupportedOperationException */
-        get() = throw UnsupportedOperationException("StreamConfigurationMap is not available.")
-
     /** @throws UnsupportedOperationException */
     override fun unwrap(): CameraCharacteristics? {
         throw UnsupportedOperationException(

camera/camera-camera2-pipe-testing/src/test/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulatorTest.kt

diff --git a/camera/camera-camera2-pipe-testing/src/test/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulatorTest.kt b/camera/camera-camera2-pipe-testing/src/test/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulatorTest.kt
index f323d03..b3e5222 100644
--- a/camera/camera-camera2-pipe-testing/src/test/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulatorTest.kt
+++ b/camera/camera-camera2-pipe-testing/src/test/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulatorTest.kt
@@ -259,7 +259,7 @@
         assertThat(event2.requestMetadata.request).isSameInstanceAs(request)
         assertThat(event3.requestMetadata.request).isSameInstanceAs(request)
 
-        val completeEvents = withTimeout(timeMillis = 50) {
+        val completeEvents = withTimeout(timeMillis = 150) {
             listener.onCompleteFlow.take(3).toList()
         }
         assertThat(completeEvents).hasSize(3)

camera/camera-camera2-pipe-testing/src/test/java/androidx/camera/camera2/pipe/testing/FakeCameraDevicesTest.kt

diff --git a/camera/camera-camera2-pipe-testing/src/test/java/androidx/camera/camera2/pipe/testing/FakeCameraDevicesTest.kt b/camera/camera-camera2-pipe-testing/src/test/java/androidx/camera/camera2/pipe/testing/FakeCameraDevicesTest.kt
index 4e3609e..fb5c682 100644
--- a/camera/camera-camera2-pipe-testing/src/test/java/androidx/camera/camera2/pipe/testing/FakeCameraDevicesTest.kt
+++ b/camera/camera-camera2-pipe-testing/src/test/java/androidx/camera/camera2/pipe/testing/FakeCameraDevicesTest.kt
@@ -19,6 +19,7 @@
 import android.hardware.camera2.CameraCharacteristics
 import android.os.Build
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
@@ -36,8 +37,8 @@
         )
 
         val cameraDevices = FakeCameraDevices(listOf(metadata1, metadata2))
-
-        assertThat(cameraDevices.findAll()).containsExactlyElementsIn(
+        val devices = runBlocking { cameraDevices.ids() }
+        assertThat(devices).containsExactlyElementsIn(
             listOf(
                 metadata1.camera,
                 metadata2.camera

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraDevices.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraDevices.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraDevices.kt
index cd2f1aa..699764b 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraDevices.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraDevices.kt
@@ -18,18 +18,33 @@
 
 package androidx.camera.camera2.pipe
 
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+
 /**
  * Methods for querying, iterating, and selecting the Cameras that are available on the device.
  */
 public interface CameraDevices {
+
     /**
      * Iterate and return a list of CameraId's on the device that are capable of being opened. Some
      * camera devices may be hidden or un-openable if they are included as part of a logical camera
      * group.
      */
+    @Deprecated(
+        message = "findAll may block the calling thread and is deprecated.",
+        replaceWith = ReplaceWith("ids"),
+        level = DeprecationLevel.WARNING
+    )
     public fun findAll(): List<CameraId>
 
     /**
+     * Load the list of CameraIds from the Camera2 CameraManager, suspending if the list of
+     * CameraIds has not yet been loaded.
+     */
+    public suspend fun ids(): List<CameraId>
+
+    /**
      * Load CameraMetadata for a specific CameraId. Loading CameraMetadata can take a
      * non-zero amount of time to execute. If CameraMetadata is not already cached this function
      * will suspend until CameraMetadata can be loaded.
@@ -57,4 +72,34 @@
      */
     public inline fun toCamera1Id(): Int? = value.toIntOrNull()
     public override fun toString(): String = "Camera $value"
-}
\ No newline at end of file
+}
+
+/**
+ * Produce a [Flow]<[CameraMetadata]>, optionally expanding the list to include the physical
+ * metadata of cameras that are otherwise hidden. Metadata for hidden cameras are always returned
+ * last.
+ */
+public fun CameraDevices.find(includeHidden: Boolean = false): Flow<CameraMetadata> =
+    flow {
+        val cameras = this@find.ids()
+        val visited = mutableSetOf<CameraId>()
+
+        for (id in cameras) {
+            if (visited.add(id)) {
+                val metadata = this@find.getMetadata(id)
+                emit(metadata)
+            }
+        }
+
+        if (includeHidden) {
+            for (id in cameras) {
+                val metadata = this@find.getMetadata(id)
+                for (physicalId in metadata.physicalCameraIds) {
+                    if (visited.add(physicalId)) {
+                        val physicalMetadata = this@find.getMetadata(id)
+                        emit(physicalMetadata)
+                    }
+                }
+            }
+        }
+    }

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraMetadata.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraMetadata.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraMetadata.kt
new file mode 100644
index 0000000..2c5b968
--- /dev/null
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraMetadata.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.camera2.pipe
+
+import android.hardware.camera2.CameraCharacteristics
+import android.hardware.camera2.CaptureRequest
+import android.hardware.camera2.CaptureResult
+
+/**
+ * [CameraMetadata] is a compatibility wrapper around [CameraCharacteristics].
+ *
+ * Applications should, in most situations, prefer using this interface to using the
+ * unwrapping and using the underlying [CameraCharacteristics] object directly. The
+ * implementation(s) provide compatibility guarantees and performance improvements compared with
+ * using [CameraCharacteristics] directly.
+ */
+public interface CameraMetadata : Metadata, UnsafeWrapper<CameraCharacteristics> {
+    public operator fun <T> get(key: CameraCharacteristics.Key<T>): T?
+    public fun <T> getOrDefault(key: CameraCharacteristics.Key<T>, default: T): T
+
+    public val camera: CameraId
+    public val isRedacted: Boolean
+
+    public val keys: Set<CameraCharacteristics.Key<*>>
+    public val requestKeys: Set<CaptureRequest.Key<*>>
+    public val resultKeys: Set<CaptureResult.Key<*>>
+    public val sessionKeys: Set<CaptureRequest.Key<*>>
+    public val physicalCameraIds: Set<CameraId>
+    public val physicalRequestKeys: Set<CaptureRequest.Key<*>>
+}
+
+/**
+ * Extension properties for querying the available capabilities of a camera device across all API
+ * levels.
+ */
+var EMPTY_INT_ARRAY = IntArray(0)
+
+const val CAPABILITIES_MANUAL_SENSOR = 1
+const val CAPABILITIES_MANUAL_POST_PROCESSING = 2
+const val CAPABILITIES_RAW = 3
+const val CAPABILITIES_PRIVATE_REPROCESSING = 4
+const val CAPABILITIES_READ_SENSOR_SETTINGS = 5
+const val CAPABILITIES_BURST_CAPTURE = 6
+const val CAPABILITIES_YUV_REPROCESSING = 7
+const val CAPABILITIES_DEPTH_OUTPUT = 8
+const val CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO = 9
+const val CAPABILITIES_MOTION_TRACKING = 10
+const val CAPABILITIES_LOGICAL_MULTI_CAMERA = 11
+const val CAPABILITIES_MONOCHROME = 12
+const val CAPABILITIES_SECURE_IMAGE_DATA = 13
+const val CAPABILITIES_SYSTEM_CAMERA = 14
+const val CAPABILITIES_OFFLINE_REPROCESSING = 15
+
+val CameraMetadata.availableCapabilities: IntArray
+    get() = this[CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES] ?: EMPTY_INT_ARRAY
+
+val CameraMetadata.supportsManualSensor: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_MANUAL_SENSOR)
+
+val CameraMetadata.supportsManualPostProcessing: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_MANUAL_POST_PROCESSING)
+
+val CameraMetadata.supportsRaw: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_RAW)
+
+val CameraMetadata.supportsPrivateReprocessing: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_PRIVATE_REPROCESSING)
+
+val CameraMetadata.supportsSensorSettings: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_READ_SENSOR_SETTINGS)
+
+val CameraMetadata.supportsBurstCapture: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_BURST_CAPTURE)
+
+val CameraMetadata.supportsYuvReprocessing: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_YUV_REPROCESSING)
+
+val CameraMetadata.supportsDepthOutput: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_DEPTH_OUTPUT)
+
+val CameraMetadata.supportsHighSpeedVideo: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO)
+
+val CameraMetadata.supportsMotionTracking: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_MOTION_TRACKING)
+
+val CameraMetadata.supportsLogicalMultiCamera: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_LOGICAL_MULTI_CAMERA)
+
+val CameraMetadata.supportsMonochrome: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_MONOCHROME)
+
+val CameraMetadata.supportsSecureImageData: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_SECURE_IMAGE_DATA)
+
+val CameraMetadata.supportsSystemCamera: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_SYSTEM_CAMERA)
+
+val CameraMetadata.supportsOfflineReprocessing: Boolean
+    get() = this.availableCapabilities.contains(CAPABILITIES_OFFLINE_REPROCESSING)

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraPipe.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraPipe.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraPipe.kt
index 483fa4f..ecfb73b 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraPipe.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraPipe.kt
@@ -26,7 +26,9 @@
 import androidx.camera.camera2.pipe.config.ExternalCameraGraphComponent
 import androidx.camera.camera2.pipe.config.ExternalCameraGraphConfigModule
 import androidx.camera.camera2.pipe.config.ExternalCameraPipeComponent
+import androidx.camera.camera2.pipe.config.ThreadConfigModule
 import kotlinx.atomicfu.atomic
+import java.util.concurrent.Executor
 
 internal val cameraPipeIds = atomic(0)
 
@@ -39,10 +41,11 @@
  * [android.hardware.camera2.CameraDevice] and [android.hardware.camera2.CameraCaptureSession] via
  * the [CameraGraph] interface.
  */
-public class CameraPipe(config: Config) {
+public class CameraPipe(config: Config, threadConfig: ThreadConfig = ThreadConfig()) {
     private val debugId = cameraPipeIds.incrementAndGet()
     private val component: CameraPipeComponent = DaggerCameraPipeComponent.builder()
         .cameraPipeConfigModule(CameraPipeConfigModule(config))
+        .threadConfigModule(ThreadConfigModule(threadConfig))
         .build()
 
     /**
@@ -64,12 +67,30 @@
     }
 
     /**
-     * This is the application level configuration for [CameraPipe]. Nullable values are optional
-     * and reasonable defaults will be provided if the values are not specified.
+     * Application level configuration for [CameraPipe]. Nullable values are optional and
+     * reasonable defaults will be provided if values are not specified.
      */
     public data class Config(
         val appContext: Context,
-        val cameraThread: HandlerThread? = null
+        val threadConfig: ThreadConfig = ThreadConfig()
+    )
+
+    /**
+     * Application level configuration for default thread and executors. If set, these executors
+     * will be used to run asynchronous background work across [CameraPipe].
+     *
+     * - [defaultLightweightExecutor] is used to run fast, non-blocking, lightweight tasks.
+     * - [defaultBackgroundExecutor] is used to run blocking and/or io bound tasks.
+     * - [defaultCameraExecutor] is used on newer API versions to interact with CameraAPIs. This is
+     *   split into a separate field since many camera operations are extremely latency sensitive.
+     * - [defaultCameraHandler] is used on older API versions to interact with CameraAPIs. This is
+     *   split into a separate field since many camera operations are extremely latency sensitive.
+     */
+    public data class ThreadConfig(
+        val defaultLightweightExecutor: Executor? = null,
+        val defaultBackgroundExecutor: Executor? = null,
+        val defaultCameraExecutor: Executor? = null,
+        val defaultCameraHandler: HandlerThread? = null
     )
 
     override fun toString(): String = "CameraPipe-$debugId"
@@ -78,9 +99,10 @@
      * External may be used if the underlying implementation needs to delegate to another library
      * or system.
      */
-    class External {
+    class External(private val threadConfig: ThreadConfig = ThreadConfig()) {
         private val component: ExternalCameraPipeComponent = DaggerExternalCameraPipeComponent
             .builder()
+            .threadConfigModule(ThreadConfigModule(threadConfig))
             .build()
 
         /**
@@ -91,15 +113,18 @@
          */
         public fun create(
             config: CameraGraph.Config,
-            cameraDevices: CameraDevices,
+            cameraMetadata: CameraMetadata,
             requestProcessor: RequestProcessor
         ): CameraGraph {
+            check(config.camera == cameraMetadata.camera) {
+                "Invalid camera config: ${config.camera} does not match ${cameraMetadata.camera}"
+            }
             val componentBuilder = component.cameraGraphBuilder()
             val component: ExternalCameraGraphComponent = componentBuilder
                 .externalCameraGraphConfigModule(
                     ExternalCameraGraphConfigModule(
                         config,
-                        cameraDevices,
+                        cameraMetadata,
                         requestProcessor
                     )
                 ).build()

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Metadata.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Metadata.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Metadata.kt
index 9617d2b..1497e95 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Metadata.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Metadata.kt
@@ -16,11 +16,9 @@
 
 package androidx.camera.camera2.pipe
 
-import android.hardware.camera2.CameraCharacteristics
 import android.hardware.camera2.CaptureRequest
 import android.hardware.camera2.CaptureResult
 import android.hardware.camera2.TotalCaptureResult
-import android.hardware.camera2.params.StreamConfigurationMap
 import android.view.Surface
 
 /**
@@ -62,29 +60,6 @@
 }
 
 /**
- * CameraMetadata is a wrapper around [CameraCharacteristics].
- *
- * In some cases the properties on this interface will provide faster or more backwards compatible
- * access to features that are only available on newer versions of the OS.
- */
-public interface CameraMetadata : Metadata, UnsafeWrapper<CameraCharacteristics> {
-    public operator fun <T> get(key: CameraCharacteristics.Key<T>): T?
-    public fun <T> getOrDefault(key: CameraCharacteristics.Key<T>, default: T): T
-
-    public val camera: CameraId
-    public val isRedacted: Boolean
-
-    public val keys: Set<CameraCharacteristics.Key<*>>
-    public val requestKeys: Set<CaptureRequest.Key<*>>
-    public val resultKeys: Set<CaptureResult.Key<*>>
-    public val sessionKeys: Set<CaptureRequest.Key<*>>
-    public val physicalCameraIds: Set<CameraId>
-    public val physicalRequestKeys: Set<CaptureRequest.Key<*>>
-
-    public val streamMap: StreamConfigurationMap
-}
-
-/**
  * RequestMetadata wraps together all of the information about a specific CaptureRequest that was
  * submitted to Camera2.
  *

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Streams.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Streams.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Streams.kt
index 663ae3f..1c5b493 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Streams.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Streams.kt
@@ -18,6 +18,7 @@
 
 import android.hardware.camera2.params.OutputConfiguration
 import android.util.Size
+import androidx.annotation.RequiresApi
 
 /**
  * A [CameraStream] is used on a [CameraGraph] to control what outputs that graph produces.
@@ -130,19 +131,28 @@
                 size: Size,
                 format: StreamFormat,
                 camera: CameraId? = null,
-                outputType: OutputType = OutputType.SURFACE,
-                externalOutputConfig: OutputConfiguration? = null
+                outputType: OutputType = OutputType.SURFACE
             ): Config =
-                if (externalOutputConfig != null) {
-                    ExternalOutputConfig(size, format, camera, output = externalOutputConfig)
-                } else if (
+                if (
                     outputType == OutputType.SURFACE_TEXTURE ||
                     outputType == OutputType.SURFACE_VIEW
                 ) {
                     LazyOutputConfig(size, format, camera, outputType)
                 } else {
+                    check(outputType == OutputType.SURFACE)
                     SimpleOutputConfig(size, format, camera)
                 }
+
+            /** Create a stream configuration from an externally created [OutputConfiguration] */
+            @RequiresApi(24)
+            fun external(
+                size: Size,
+                format: StreamFormat,
+                camera: CameraId? = null,
+                externalOutputConfig: OutputConfiguration
+            ): Config {
+                return ExternalOutputConfig(size, format, camera, output = externalOutputConfig)
+            }
         }
 
         /**

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraDevices.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraDevices.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraDevices.kt
index f20765b..c179cd5 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraDevices.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraDevices.kt
@@ -16,13 +16,11 @@
 
 package androidx.camera.camera2.pipe.compat
 
-import android.hardware.camera2.CameraManager
+import androidx.camera.camera2.pipe.CameraDevices
 import androidx.camera.camera2.pipe.CameraId
 import androidx.camera.camera2.pipe.CameraMetadata
-import androidx.camera.camera2.pipe.CameraDevices
-import androidx.camera.camera2.pipe.core.Debug.trace
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
-import javax.inject.Provider
 import javax.inject.Singleton
 
 /**
@@ -30,37 +28,13 @@
  */
 @Singleton
 internal class Camera2CameraDevices @Inject constructor(
-    private val cameraManager: Provider<CameraManager>,
-    private val metadata: Camera2MetadataCache
+    private val deviceCache: Camera2DeviceCache,
+    private val metadataCache: Camera2MetadataCache
 ) : CameraDevices {
+    override fun findAll(): List<CameraId> = runBlocking { deviceCache.getCameras() }
+    override suspend fun ids(): List<CameraId> = deviceCache.getCameras()
 
-    private val cameras = lazy(LazyThreadSafetyMode.PUBLICATION) {
-        // NOTE: Publication safety mode may cause this method to be invoked more than once if there
-        //  a race between multiple threads. Only one return value will ultimately be cached.
-
-        trace("cameraIdList") {
-            val cameraManager = cameraManager.get()
-
-            // TODO(b/159052778): Find a way to make this poll for the camera list and to suspend
-            //  if the value is not yet available. It will be important to detect and differentiate
-            //  between devices that should have cameras, but don't, vs devices that do not
-            //  physically have cameras. It may also be worthwhile to re-query if looking for
-            //  external cameras.
-
-            // WARNING: This method can, at times, return an empty list of cameras on devices that
-            //  will normally return a valid list of cameras (b/159052778)
-            val cameraIdList = cameraManager.cameraIdList
-            cameraIdList.map { CameraId(it) }
-        }
-    }
-
-    override fun findAll(): List<CameraId> = cameras.value
-
-    override suspend fun getMetadata(camera: CameraId): CameraMetadata {
-        return metadata.get(camera)
-    }
-
-    override fun awaitMetadata(camera: CameraId): CameraMetadata {
-        return metadata.awaitMetadata(camera)
-    }
+    override suspend fun getMetadata(camera: CameraId): CameraMetadata = metadataCache.get(camera)
+    override fun awaitMetadata(camera: CameraId): CameraMetadata =
+        metadataCache.awaitMetadata(camera)
 }
\ No newline at end of file

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraMetadata.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraMetadata.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraMetadata.kt
index 790ba65..a1b29bb 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraMetadata.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraMetadata.kt
@@ -20,15 +20,13 @@
 import android.hardware.camera2.CameraCharacteristics
 import android.hardware.camera2.CaptureRequest
 import android.hardware.camera2.CaptureResult
-import android.hardware.camera2.params.StreamConfigurationMap
 import android.os.Build
+import android.util.ArrayMap
+import androidx.annotation.GuardedBy
 import androidx.camera.camera2.pipe.CameraId
 import androidx.camera.camera2.pipe.CameraMetadata
 import androidx.camera.camera2.pipe.Metadata
 import androidx.camera.camera2.pipe.core.Debug
-import androidx.camera.camera2.pipe.core.Log
-import androidx.camera.camera2.pipe.core.Timestamps
-import androidx.camera.camera2.pipe.core.Timestamps.formatMs
 
 /**
  * This implementation provides access to CameraCharacteristics and lazy caching of properties
@@ -41,6 +39,8 @@
     private val characteristics: CameraCharacteristics,
     private val metadata: Map<Metadata.Key<*>, Any?>
 ) : CameraMetadata {
+    @GuardedBy("values")
+    private val values = ArrayMap<CameraCharacteristics.Key<*>, Any?>()
 
     @Suppress("UNCHECKED_CAST")
     override fun <T> get(key: Metadata.Key<T>): T? = metadata[key] as T?
@@ -49,11 +49,37 @@
     override fun <T> getOrDefault(key: Metadata.Key<T>, default: T): T =
         metadata[key] as T? ?: default
 
-    override fun <T> get(key: CameraCharacteristics.Key<T>): T? = characteristics[key]
-    override fun <T> getOrDefault(key: CameraCharacteristics.Key<T>, default: T): T =
-        characteristics[key] ?: default
+    override fun <T> get(key: CameraCharacteristics.Key<T>): T? {
+        // Cache the return value of calls to characteristics as the implementation performs a
+        // blocking jni binder call which can be expensive when invoked frequently (see b/144028609
+        // for more details).
 
-    override fun unwrap(): CameraCharacteristics? = characteristics
+        // Implementation notes:
+        // 1. Null return values may eventually turn non-null on subsequent queries (due to
+        //    permissions). Null return values are not cached and are always re-queried.
+        //
+        // 2. Non-null return values will never turn null, and will not change once returned. If
+        //    permissions are revoked, this should result in the app process being restarted.
+        //
+        // 3. Duplicate non-null values are expected to be identical (even if the object instance
+        //    is different), and so it does not matter which value is cached if two calls from
+        //    different threads try to read the value simultaneously.
+        @Suppress("UNCHECKED_CAST")
+        var result = synchronized(values) { values[key] } as T?
+        if (result == null) {
+            result = characteristics.get(key)
+            if (result != null) {
+                synchronized(values) {
+                    values[key] = result
+                }
+            }
+        }
+        return result
+    }
+    override fun <T> getOrDefault(key: CameraCharacteristics.Key<T>, default: T): T =
+        get(key) ?: default
+
+    override fun unwrap(): CameraCharacteristics = characteristics
 
     override val keys: Set<CameraCharacteristics.Key<*>> get() = _keys.value
     override val requestKeys: Set<CaptureRequest.Key<*>> get() = _requestKeys.value
@@ -63,8 +89,6 @@
     override val physicalRequestKeys: Set<CaptureRequest.Key<*>>
         get() = _physicalRequestKeys.value
 
-    override val streamMap: StreamConfigurationMap get() = _streamMap.value
-
     private val _keys: Lazy<Set<CameraCharacteristics.Key<*>>> =
         lazy(LazyThreadSafetyMode.PUBLICATION) {
             try {
@@ -149,17 +173,4 @@
                 }
             }
         }
-
-    private val _streamMap: Lazy<StreamConfigurationMap> =
-        lazy(LazyThreadSafetyMode.PUBLICATION) {
-            val start = Timestamps.now()
-            val result =
-                Debug.trace("Camera-${camera.value}#SCALER_STREAM_CONFIGURATION_MAP") {
-                    get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)!!
-                }
-            val duration = Timestamps.now() - start
-            Log.info { "Loaded stream map for ($camera) in ${duration.formatMs()}" }
-
-            result
-        }
 }
\ No newline at end of file

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2DeviceCache.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2DeviceCache.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2DeviceCache.kt
new file mode 100644
index 0000000..e805aba
--- /dev/null
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2DeviceCache.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.camera2.pipe.compat
+
+import android.hardware.camera2.CameraAccessException
+import android.hardware.camera2.CameraManager
+import androidx.annotation.GuardedBy
+import androidx.camera.camera2.pipe.CameraId
+import androidx.camera.camera2.pipe.core.Debug
+import androidx.camera.camera2.pipe.core.Log
+import androidx.camera.camera2.pipe.core.Threads
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import javax.inject.Provider
+import javax.inject.Singleton
+
+@Singleton
+internal class Camera2DeviceCache @Inject constructor(
+    private val cameraManager: Provider<CameraManager>,
+    private val threads: Threads,
+) {
+    private val lock = Any()
+
+    @GuardedBy("lock")
+    private var openableCameras: List<CameraId>? = null
+
+    suspend fun getCameras(): List<CameraId> {
+        val cameras = synchronized(lock) { openableCameras }
+        if (cameras?.isNotEmpty() == true) {
+            return cameras
+        }
+
+        // Suspend and query the list of Cameras on the ioDispatcher
+        return withContext(threads.ioDispatcher) {
+            Debug.trace("readCameraIds") {
+                val cameraIds = readCameraIdList()
+
+                if (cameraIds.isNotEmpty()) {
+                    synchronized(lock) {
+                        openableCameras = cameraIds
+                    }
+                    return@trace cameraIds
+                }
+
+                // TODO(b/159052778): Find a way to make this poll for the camera list and to
+                //  suspend if the value is not yet available. It will be important to detect and
+                //  differentiate between devices that should have cameras, but don't, vs devices
+                //  that do not physically have cameras. It may also be worthwhile to re-query if
+                //  looking for external cameras, since they can be attached and/or detached.
+
+                return@trace listOf<CameraId>()
+            }
+        }
+    }
+
+    private fun readCameraIdList(): List<CameraId> {
+        val cameras = synchronized(lock) { openableCameras }
+        if (cameras?.isNotEmpty() == true) {
+            return cameras
+        }
+
+        val cameraManager = cameraManager.get()
+        val cameraIdArray = try {
+            // WARNING: This method can, at times, return an empty list of cameras on devices that
+            //  will normally return a valid list of cameras (b/159052778)
+            cameraManager.cameraIdList
+        } catch (e: CameraAccessException) {
+            Log.warn(e) { "Failed to query CameraManager#getCameraIdList!" }
+            null
+        }
+        if (cameraIdArray?.isEmpty() == true) {
+            Log.warn { "Failed to query CameraManager#getCameraIdList: No values returned." }
+        }
+
+        return cameraIdArray?.map { CameraId(it) } ?: listOf()
+    }
+}
\ No newline at end of file

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCache.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCache.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCache.kt
index ec63b9d..976d458 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCache.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCache.kt
@@ -34,7 +34,7 @@
 import javax.inject.Singleton
 
 /**
- * Provides caching and querying of CameraMetadata.
+ * Provides caching and querying of [CameraMetadata].
  *
  * This class is designed to be thread safe and provides suspend functions for querying and
  * accessing CameraMetadata.
@@ -63,7 +63,7 @@
     }
 
     fun awaitMetadata(cameraId: CameraId): CameraMetadata {
-        return Debug.trace("awaitMetadata") {
+        return Debug.trace("Camera-${cameraId.value}#awaitMetadata") {
             synchronized(cache) {
                 val existing = cache[cameraId.value]
                 if (existing != null) {
@@ -81,7 +81,7 @@
     private fun createCameraMetadata(cameraId: CameraId, redacted: Boolean): Camera2CameraMetadata {
         val start = Timestamps.now()
 
-        return Debug.trace("CameraCharacteristics_$cameraId") {
+        return Debug.trace("Camera-${cameraId.value}#readCameraMetadata") {
             try {
                 val cameraManager =
                     context.getSystemService(Context.CAMERA_SERVICE) as CameraManager
@@ -101,7 +101,7 @@
 
                 return@trace cameraMetadata
             } catch (e: Throwable) {
-                throw IllegalStateException("Failed to load metadata for $cameraId", e)
+                throw IllegalStateException("Failed to load metadata for $cameraId!", e)
             }
         }
     }

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraGraphComponent.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraGraphComponent.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraGraphComponent.kt
index b51f9a7..4b88ba2 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraGraphComponent.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraGraphComponent.kt
@@ -16,21 +16,21 @@
 
 package androidx.camera.camera2.pipe.config
 
-import androidx.camera.camera2.pipe.CameraDevices
 import androidx.camera.camera2.pipe.CameraGraph
 import androidx.camera.camera2.pipe.CameraMetadata
 import androidx.camera.camera2.pipe.Request
 import androidx.camera.camera2.pipe.compat.Camera2CameraController
+import androidx.camera.camera2.pipe.compat.Camera2MetadataCache
 import androidx.camera.camera2.pipe.compat.Camera2RequestProcessorFactory
-import androidx.camera.camera2.pipe.graph.CameraGraphImpl
 import androidx.camera.camera2.pipe.compat.CameraController
+import androidx.camera.camera2.pipe.compat.SessionFactoryModule
+import androidx.camera.camera2.pipe.compat.StandardCamera2RequestProcessorFactory
+import androidx.camera.camera2.pipe.core.Threads
+import androidx.camera.camera2.pipe.graph.CameraGraphImpl
 import androidx.camera.camera2.pipe.graph.GraphListener
 import androidx.camera.camera2.pipe.graph.GraphProcessor
 import androidx.camera.camera2.pipe.graph.GraphProcessorImpl
 import androidx.camera.camera2.pipe.graph.Listener3A
-import androidx.camera.camera2.pipe.compat.SessionFactoryModule
-import androidx.camera.camera2.pipe.compat.StandardCamera2RequestProcessorFactory
-import androidx.camera.camera2.pipe.core.Threads
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -89,25 +89,18 @@
             return CoroutineScope(threads.defaultDispatcher.plus(CoroutineName("CXCP-Graph")))
         }
 
-        @Provides
-        fun provideCameraMetadata(
-            graphConfig: CameraGraph.Config,
-            cameraDevices: CameraDevices
-        ): CameraMetadata {
-            return cameraDevices.awaitMetadata(graphConfig.camera)
-        }
-
         @CameraGraphScope
         @Provides
         @ForCameraGraph
         fun provideRequestListeners(
             graphConfig: CameraGraph.Config,
             listener3A: Listener3A
-        ): java.util.ArrayList<Request.Listener> {
-            // TODO: Dagger doesn't appear to like standard kotlin lists. Replace this with a standard
-            //   Kotlin list interfaces when dagger compiles with them.
-            val listeners = java.util.ArrayList<Request.Listener>()
+        ): List<@JvmSuppressWildcards Request.Listener> {
+            val listeners = mutableListOf<Request.Listener>(listener3A)
+
+            // Order slightly matters, add internal listeners first, and external listeners second.
             listeners.add(listener3A)
+
             // Listeners in CameraGraph.Config can de defined outside of the CameraPipe library,
             // and since we iterate thought the listeners in order and invoke them, it appears
             // beneficial to add the internal listeners first and then the graph config listeners.
@@ -130,4 +123,14 @@
 
     @Binds
     abstract fun bindGraphState(camera2CameraState: Camera2CameraController): CameraController
+
+    companion object {
+        @Provides
+        fun provideCamera2Metadata(
+            graphConfig: CameraGraph.Config,
+            metadataCache: Camera2MetadataCache
+        ): CameraMetadata {
+            return metadataCache.awaitMetadata(graphConfig.camera)
+        }
+    }
 }

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraPipeComponent.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraPipeComponent.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraPipeComponent.kt
index eea378a..177c002 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraPipeComponent.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraPipeComponent.kt
@@ -18,23 +18,14 @@
 
 import android.content.Context
 import android.hardware.camera2.CameraManager
-import android.os.Handler
-import android.os.HandlerThread
-import android.os.Process
 import androidx.camera.camera2.pipe.CameraDevices
 import androidx.camera.camera2.pipe.CameraPipe
 import androidx.camera.camera2.pipe.compat.Camera2CameraDevices
-import androidx.camera.camera2.pipe.core.Threads
 import dagger.Binds
 import dagger.Component
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import kotlinx.atomicfu.atomic
-import kotlinx.coroutines.CoroutineName
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.asCoroutineDispatcher
-import java.util.concurrent.Executors
 import javax.inject.Qualifier
 import javax.inject.Singleton
 
@@ -44,7 +35,6 @@
 @Singleton
 @Component(
     modules = [
-        CameraPipeModules::class,
         CameraPipeConfigModule::class,
         Camera2CameraPipeModules::class,
     ]
@@ -55,6 +45,7 @@
 }
 
 @Module(
+    includes = [ThreadConfigModule::class],
     subcomponents = [CameraGraphComponent::class]
 )
 internal class CameraPipeConfigModule(private val config: CameraPipe.Config) {
@@ -63,80 +54,6 @@
 }
 
 @Module
-internal abstract class CameraPipeModules {
-    companion object {
-        @Singleton
-        @Provides
-        fun provideCameraPipeThreads(@ForCameraThread cameraThread: HandlerThread?): Threads {
-            val threadIds = atomic(0)
-            val cameraThreadPriority =
-                Process.THREAD_PRIORITY_DISPLAY + Process.THREAD_PRIORITY_LESS_FAVORABLE
-            val defaultExecutor = Executors.newFixedThreadPool(2) {
-                object : Thread(it) {
-                    init {
-                        val number = threadIds.incrementAndGet().toString().padStart(2, '0')
-                        name = "CXCP-$number"
-                    }
-
-                    override fun run() {
-                        Process.setThreadPriority(cameraThreadPriority)
-                        super.run()
-                    }
-                }
-            }
-            val defaultDispatcher = defaultExecutor.asCoroutineDispatcher()
-            val ioExecutor = Executors.newFixedThreadPool(8) {
-                object : Thread(it) {
-                    init {
-                        val number = threadIds.incrementAndGet().toString().padStart(2, '0')
-                        name = "CXCP-IO-$number"
-                    }
-                }
-            }
-            val ioDispatcher = ioExecutor.asCoroutineDispatcher()
-
-            val cameraHandlerFn =
-                {
-                    cameraThread?.let { Handler(it.looper) }
-                        ?: Handler(
-                            HandlerThread("CXCP-Camera2-H").also {
-                                it.start()
-                            }.looper
-                        )
-                }
-            val cameraExecutorFn = {
-                Executors.newFixedThreadPool(1) {
-                    object : Thread(it) {
-                        init {
-                            name = "CXCP-Camera2-E"
-                        }
-
-                        override fun run() {
-                            Process.setThreadPriority(cameraThreadPriority)
-                            super.run()
-                        }
-                    }
-                }
-            }
-
-            val globalScope = CoroutineScope(
-                defaultDispatcher.plus(CoroutineName("CXCP-Pipe"))
-            )
-
-            return Threads(
-                globalScope = globalScope,
-                defaultExecutor = defaultExecutor,
-                defaultDispatcher = defaultDispatcher,
-                ioExecutor = ioExecutor,
-                ioDispatcher = ioDispatcher,
-                camera2Handler = cameraHandlerFn,
-                camera2Executor = cameraExecutorFn
-            )
-        }
-    }
-}
-
-@Module
 internal abstract class Camera2CameraPipeModules {
     @Binds
     abstract fun bindCameras(impl: Camera2CameraDevices): CameraDevices
@@ -145,10 +62,6 @@
         @Provides
         fun provideContext(config: CameraPipe.Config): Context = config.appContext
 
-        @Provides
-        @ForCameraThread
-        fun provideCameraThread(config: CameraPipe.Config): HandlerThread? = config.cameraThread
-
         @Reusable
         @Provides
         fun provideCameraManager(context: Context): CameraManager =

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ExternalCameraGraphComponent.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ExternalCameraGraphComponent.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ExternalCameraGraphComponent.kt
index b9c94b8..3a5dd6b 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ExternalCameraGraphComponent.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ExternalCameraGraphComponent.kt
@@ -16,8 +16,8 @@
 
 package androidx.camera.camera2.pipe.config
 
-import androidx.camera.camera2.pipe.CameraDevices
 import androidx.camera.camera2.pipe.CameraGraph
+import androidx.camera.camera2.pipe.CameraMetadata
 import androidx.camera.camera2.pipe.RequestProcessor
 import androidx.camera.camera2.pipe.compat.CameraController
 import androidx.camera.camera2.pipe.graph.GraphListener
@@ -46,14 +46,14 @@
 @Module
 internal class ExternalCameraGraphConfigModule(
     private val config: CameraGraph.Config,
-    private val cameraDevices: CameraDevices,
+    private val cameraMetadata: CameraMetadata,
     private val requestProcessor: RequestProcessor
 ) {
     @Provides
     fun provideCameraGraphConfig(): CameraGraph.Config = config
 
     @Provides
-    fun provideCameraDevices(): CameraDevices = cameraDevices
+    fun provideCameraMetadata(): CameraMetadata = cameraMetadata
 
     @Provides
     fun provideGraphController(graphListener: GraphListener): CameraController =

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ExternalCameraPipeComponent.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ExternalCameraPipeComponent.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ExternalCameraPipeComponent.kt
index d3ef283..e10ae41 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ExternalCameraPipeComponent.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ExternalCameraPipeComponent.kt
@@ -16,28 +16,15 @@
 
 package androidx.camera.camera2.pipe.config
 
-import android.os.HandlerThread
 import dagger.Component
-import dagger.Module
-import dagger.Provides
 import javax.inject.Singleton
 
 @Singleton
 @Component(
     modules = [
-        CameraPipeModules::class,
-        ExternalCameraPipeModule::class
+        ThreadConfigModule::class
     ]
 )
 internal interface ExternalCameraPipeComponent {
     fun cameraGraphBuilder(): ExternalCameraGraphComponent.Builder
 }
-
-@Module
-internal abstract class ExternalCameraPipeModule {
-    companion object {
-        @Provides
-        @ForCameraThread
-        fun provideExternalCameraThread(): HandlerThread? = null
-    }
-}
\ No newline at end of file

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ThreadConfigModule.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ThreadConfigModule.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ThreadConfigModule.kt
new file mode 100644
index 0000000..63774152
--- /dev/null
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ThreadConfigModule.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.camera2.pipe.config
+
+import android.os.Handler
+import android.os.HandlerThread
+import android.os.Process
+import androidx.camera.camera2.pipe.CameraPipe
+import androidx.camera.camera2.pipe.core.Threads
+import dagger.Module
+import dagger.Provides
+import kotlinx.atomicfu.atomic
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.asCoroutineDispatcher
+import java.util.concurrent.Executors
+import javax.inject.Singleton
+
+/**
+ * Configure and provide a single [Threads] object to other parts of the library.
+ */
+@Module
+internal class ThreadConfigModule(private val threadConfig: CameraPipe.ThreadConfig) {
+    @Singleton
+    @Provides
+    fun provideThreads(): Threads {
+        val threadIds = atomic(0)
+        val cameraThreadPriority =
+            Process.THREAD_PRIORITY_DISPLAY + Process.THREAD_PRIORITY_LESS_FAVORABLE
+        val defaultExecutor =
+            threadConfig.defaultLightweightExecutor ?: Executors.newFixedThreadPool(2) {
+                object : Thread(it) {
+                    init {
+                        val number = threadIds.incrementAndGet().toString().padStart(2, '0')
+                        name = "CXCP-$number"
+                    }
+
+                    override fun run() {
+                        Process.setThreadPriority(cameraThreadPriority)
+                        super.run()
+                    }
+                }
+            }
+        val defaultDispatcher = defaultExecutor.asCoroutineDispatcher()
+
+        val ioExecutor =
+            threadConfig.defaultBackgroundExecutor ?: Executors.newFixedThreadPool(8) {
+                object : Thread(it) {
+                    init {
+                        val number = threadIds.incrementAndGet().toString().padStart(2, '0')
+                        name = "CXCP-IO-$number"
+                    }
+                }
+            }
+        val ioDispatcher = ioExecutor.asCoroutineDispatcher()
+
+        val cameraHandlerFn =
+            {
+                threadConfig.defaultCameraHandler?.let { Handler(it.looper) }
+                    ?: Handler(
+                        HandlerThread("CXCP-Camera2-H").also {
+                            it.start()
+                        }.looper
+                    )
+            }
+        val cameraExecutorFn = {
+            threadConfig.defaultCameraExecutor ?: Executors.newFixedThreadPool(1) {
+                object : Thread(it) {
+                    init {
+                        name = "CXCP-Camera2-E"
+                    }
+
+                    override fun run() {
+                        Process.setThreadPriority(cameraThreadPriority)
+                        super.run()
+                    }
+                }
+            }
+        }
+
+        val globalScope = CoroutineScope(
+            defaultDispatcher.plus(CoroutineName("CXCP-Pipe"))
+        )
+
+        return Threads(
+            globalScope = globalScope,
+            defaultExecutor = defaultExecutor,
+            defaultDispatcher = defaultDispatcher,
+            ioExecutor = ioExecutor,
+            ioDispatcher = ioDispatcher,
+            camera2Handler = cameraHandlerFn,
+            camera2Executor = cameraExecutorFn
+        )
+    }
+}
\ No newline at end of file

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphProcessor.kt

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphProcessor.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphProcessor.kt
index 7ae49c8..ce74909 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphProcessor.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphProcessor.kt
@@ -73,7 +73,7 @@
     private val cameraGraphConfig: CameraGraph.Config,
     private val graphState3A: GraphState3A,
     @ForCameraGraph private val graphScope: CoroutineScope,
-    @ForCameraGraph private val graphListeners: java.util.ArrayList<Request.Listener>
+    @ForCameraGraph private val graphListeners: List<@JvmSuppressWildcards Request.Listener>
 ) : GraphProcessor {
     private val lock = Any()
 

camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/CameraPipeTest.kt

diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/CameraPipeTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/CameraPipeTest.kt
index 1f4383c..f5807d3 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/CameraPipeTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/CameraPipeTest.kt
@@ -18,7 +18,6 @@
 
 import android.content.Context
 import android.os.Build
-import androidx.camera.camera2.pipe.testing.FakeCameraDevices
 import androidx.camera.camera2.pipe.testing.FakeCameraMetadata
 import androidx.camera.camera2.pipe.testing.FakeRequestProcessor
 import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
@@ -65,7 +64,7 @@
         val context = ApplicationProvider.getApplicationContext() as Context
         val cameraPipe = CameraPipe(CameraPipe.Config(context))
         val cameras = cameraPipe.cameras()
-        val cameraList = cameras.findAll()
+        val cameraList = runBlocking { cameras.ids() }
 
         assertThat(cameraList).isNotNull()
         assertThat(cameraList.size).isEqualTo(1)
@@ -76,7 +75,6 @@
     fun createExternalCameraGraph() {
         val fakeRequestProcessor = FakeRequestProcessor()
         val fakeCameraMetadata = FakeCameraMetadata()
-        val fakeCameras = FakeCameraDevices(listOf(fakeCameraMetadata))
 
         val config = CameraGraph.Config(
             camera = fakeCameraMetadata.camera,
@@ -84,7 +82,11 @@
             defaultTemplate = RequestTemplate(0)
         )
 
-        val cameraGraph = CameraPipe.External().create(config, fakeCameras, fakeRequestProcessor)
+        val cameraGraph = CameraPipe.External().create(
+            config,
+            fakeCameraMetadata,
+            fakeRequestProcessor
+        )
         assertThat(cameraGraph).isNotNull()
 
         val request = Request(streams = emptyList())

camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactoryTest.kt

diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactoryTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactoryTest.kt
index 3f63fe0..0a8f8cd9 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactoryTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactoryTest.kt
@@ -32,7 +32,7 @@
 import androidx.camera.camera2.pipe.config.Camera2CameraPipeModules
 import androidx.camera.camera2.pipe.config.CameraGraphModules
 import androidx.camera.camera2.pipe.config.CameraGraphScope
-import androidx.camera.camera2.pipe.config.CameraPipeModules
+import androidx.camera.camera2.pipe.config.ThreadConfigModule
 import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
 import androidx.camera.camera2.pipe.testing.RobolectricCameras
 import androidx.camera.camera2.pipe.testing.FakeGraphProcessor
@@ -70,6 +70,7 @@
     fun canCreateSessionFactoryTestComponent() = runBlockingTest {
         val component: CameraSessionTestComponent = DaggerCameraSessionTestComponent.builder()
             .fakeCameraPipeModule(FakeCameraPipeModule(context, testCamera))
+            .threadConfigModule(ThreadConfigModule(CameraPipe.ThreadConfig()))
             .build()
 
         val sessionFactory = component.sessionFactory()
@@ -80,6 +81,7 @@
     fun createCameraCaptureSession() = runBlockingTest {
         val component: CameraSessionTestComponent = DaggerCameraSessionTestComponent.builder()
             .fakeCameraPipeModule(FakeCameraPipeModule(context, testCamera))
+            .threadConfigModule(ThreadConfigModule(CameraPipe.ThreadConfig()))
             .build()
 
         val sessionFactory = component.sessionFactory()
@@ -137,7 +139,7 @@
 /**
  * Utility module for testing the Dagger generated graph with a a reasonable default config.
  */
-@Module(includes = [CameraPipeModules::class, Camera2CameraPipeModules::class])
+@Module(includes = [ThreadConfigModule::class, Camera2CameraPipeModules::class])
 class FakeCameraPipeModule(
     private val context: Context,
     private val fakeCamera: RobolectricCameras.FakeCamera

camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/config/CameraPipeComponentTest.kt

diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/config/CameraPipeComponentTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/config/CameraPipeComponentTest.kt
index 4f4610b..d343347 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/config/CameraPipeComponentTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/config/CameraPipeComponentTest.kt
@@ -42,6 +42,7 @@
         val config = CameraPipe.Config(context)
         val module = CameraPipeConfigModule(config)
         builder.cameraPipeConfigModule(module)
+        builder.threadConfigModule(ThreadConfigModule(CameraPipe.ThreadConfig()))
         val component = builder.build()
         assertThat(component).isNotNull()
     }
@@ -51,6 +52,7 @@
         val context = ApplicationProvider.getApplicationContext() as Context
         val component = DaggerCameraPipeComponent.builder()
             .cameraPipeConfigModule(CameraPipeConfigModule(CameraPipe.Config(context)))
+            .threadConfigModule(ThreadConfigModule(CameraPipe.ThreadConfig()))
             .build()
 
         val cameraId = fakeCameraId
@@ -70,6 +72,7 @@
         val context = ApplicationProvider.getApplicationContext() as Context
         val component = DaggerCameraPipeComponent.builder()
             .cameraPipeConfigModule(CameraPipeConfigModule(CameraPipe.Config(context)))
+            .threadConfigModule(ThreadConfigModule(CameraPipe.ThreadConfig()))
             .build()
 
         val graphComponent = component.cameraGraphComponentBuilder()

camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/UseCaseCombinationTest.java

diff --git a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/UseCaseCombinationTest.java b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/UseCaseCombinationTest.java
deleted file mode 100644
index 1406fb1..0000000
--- a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/UseCaseCombinationTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.camera2;
-
-import android.content.Context;
-
-import androidx.camera.core.CameraSelector;
-import androidx.camera.core.CameraX;
-import androidx.camera.core.CameraXConfig;
-import androidx.camera.core.ImageAnalysis;
-import androidx.camera.core.ImageCapture;
-import androidx.camera.core.Preview;
-import androidx.camera.core.internal.CameraUseCaseAdapter;
-import androidx.camera.testing.CameraUtil;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * Contains tests for {@link androidx.camera.core.CameraX} which varies use case combinations to
- * run.
- */
-@LargeTest
-@RunWith(AndroidJUnit4.class)
-public final class UseCaseCombinationTest {
-    private static final CameraSelector DEFAULT_SELECTOR = CameraSelector.DEFAULT_BACK_CAMERA;
-
-    @Rule
-    public TestRule mCameraRule = CameraUtil.grantCameraPermissionAndPreTest();
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = ApplicationProvider.getApplicationContext();
-        final CameraXConfig config = Camera2Config.defaultConfig();
-        CameraX.initialize(mContext, config);
-    }
-
-    @After
-    public void tearDown() throws InterruptedException, ExecutionException, TimeoutException {
-        CameraX.shutdown().get(10000, TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Test Combination: Preview + ImageCapture
-     */
-    @Test
-    public void previewCombinesImageCapture()  {
-        final Preview preview = initPreview();
-        final ImageCapture imageCapture = initImageCapture();
-
-        CameraUseCaseAdapter camera = CameraUtil.createCameraUseCaseAdapter(mContext,
-                DEFAULT_SELECTOR);
-        camera.detachUseCases();
-
-        // TODO(b/160249108) move off of main thread once UseCases can be attached on any
-        //  thread
-        InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            // This should not throw CameraUseCaseAdapter.CameraException
-            try {
-                camera.addUseCases(Arrays.asList(preview, imageCapture));
-            } catch (CameraUseCaseAdapter.CameraException e) {
-                throw new IllegalArgumentException(e);
-            }
-        });
-    }
-
-    /**
-     * Test Combination: Preview + ImageAnalysis
-     */
-    @Test
-    public void previewCombinesImageAnalysis()  {
-        final Preview preview = initPreview();
-        final ImageAnalysis imageAnalysis = initImageAnalysis();
-
-        CameraUseCaseAdapter camera = CameraUtil.createCameraUseCaseAdapter(mContext,
-                DEFAULT_SELECTOR);
-        camera.detachUseCases();
-
-        // TODO(b/160249108) move off of main thread once UseCases can be attached on any
-        //  thread
-        InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            // This should not throw CameraUseCaseAdapter.CameraException
-            try {
-                camera.addUseCases(Arrays.asList(preview, imageAnalysis));
-            } catch (CameraUseCaseAdapter.CameraException e) {
-                throw new IllegalArgumentException(e);
-            }
-        });
-    }
-
-    /** Test Combination: Preview + ImageAnalysis + ImageCapture */
-    @Test
-    public void previewCombinesImageAnalysisAndImageCapture() {
-        final Preview preview = initPreview();
-        final ImageAnalysis imageAnalysis = initImageAnalysis();
-        final ImageCapture imageCapture = initImageCapture();
-
-        CameraUseCaseAdapter camera = CameraUtil.createCameraUseCaseAdapter(mContext,
-                DEFAULT_SELECTOR);
-        camera.detachUseCases();
-
-        // TODO(b/160249108) move off of main thread once UseCases can be attached on any
-        //  thread
-        InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            // This should not throw CameraUseCaseAdapter.CameraException
-            try {
-                camera.addUseCases(Arrays.asList(preview, imageAnalysis, imageCapture));
-            } catch (CameraUseCaseAdapter.CameraException e) {
-                throw new IllegalArgumentException(e);
-            }
-        });
-    }
-
-    private Preview initPreview() {
-        return new Preview.Builder().setTargetName("Preview").build();
-    }
-
-    private ImageAnalysis initImageAnalysis() {
-        return new ImageAnalysis.Builder()
-                .setTargetName("ImageAnalysis")
-                .build();
-    }
-
-    private ImageCapture initImageCapture() {
-        return new ImageCapture.Builder().build();
-    }
-}

camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java

diff --git a/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java b/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
index a42275e..90de15a 100644
--- a/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
+++ b/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
@@ -16,6 +16,7 @@
 
 package androidx.camera.extensions.impl;
 
+import android.graphics.ImageFormat;
 import android.hardware.camera2.TotalCaptureResult;
 import android.media.Image;
 import android.util.Pair;
@@ -35,9 +36,9 @@
      * <p> The result of the processing step should be written to the {@link Surface} that was
      * received by {@link #onOutputSurface(Surface, int)}.
      *
-     * @param results The map of images and metadata to process. The {@link Image} that are
-     *                contained within the map will become invalid after this method completes,
-     *                so no references to them should be kept.
+     * @param results The map of {@link ImageFormat#YUV_420_888} format images and metadata to
+     *                process. The {@link Image} that are contained within the map will become
+     *                invalid after this method completes, so no references to them should be kept.
      */
     void process(Map<Integer, Pair<Image, TotalCaptureResult>> results);
 }

camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java

diff --git a/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java b/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java
index f1817a7..2879568 100644
--- a/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java
+++ b/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java
@@ -20,6 +20,7 @@
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.params.SessionConfiguration;
 
 /**
  * Provides interfaces that the OEM needs to implement to handle the state change.
@@ -51,8 +52,9 @@
      * This will be invoked before creating a
      * {@link android.hardware.camera2.CameraCaptureSession}. The {@link CaptureRequest}
      * parameters returned via {@link CaptureStageImpl} will be passed to the camera device as
-     * part of the capture session initialization via setSessionParameters(). The valid parameter
-     * is a subset of the available capture request parameters.
+     * part of the capture session initialization via
+     * {@link SessionConfiguration#setSessionParameters(CaptureRequest)} which only supported from
+     * API level 28. The valid parameter is a subset of the available capture request parameters.
      *
      * @return The request information to set the session wide camera parameters.
      */

camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java

diff --git a/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java b/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
index 629f13c..e7ecaa1 100644
--- a/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
+++ b/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
@@ -16,6 +16,7 @@
 
 package androidx.camera.extensions.impl;
 
+import android.graphics.ImageFormat;
 import android.hardware.camera2.TotalCaptureResult;
 import android.media.Image;
 
@@ -32,8 +33,8 @@
      * <p> The result of the processing step should be written to the {@link android.view.Surface}
      * that was received by {@link ProcessorImpl#onOutputSurface(android.view.Surface, int)}.
      *
-     * @param image The image to process. This will be invalid after the method completes so no
-     *              reference to it should be kept.
+     * @param image  The {@link ImageFormat#YUV_420_888} format image to process. This will be
+     *               invalid after the method completes so no reference to it should be kept.
      * @param result The metadata associated with the image to process.
      */
     void process(Image image, TotalCaptureResult result);

camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/ImageCaptureExtenderValidationTest.java

diff --git a/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/ImageCaptureExtenderValidationTest.java b/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/ImageCaptureExtenderValidationTest.java
deleted file mode 100644
index 0a3e099..0000000
--- a/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/ImageCaptureExtenderValidationTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.extensions;
-
-import static org.junit.Assume.assumeTrue;
-
-import android.content.Context;
-import android.hardware.camera2.CameraAccessException;
-
-import androidx.camera.camera2.Camera2Config;
-import androidx.camera.core.CameraInfoUnavailableException;
-import androidx.camera.core.CameraSelector;
-import androidx.camera.core.CameraX;
-import androidx.camera.extensions.impl.ImageCaptureExtenderImpl;
-import androidx.camera.extensions.util.ExtensionsTestUtil;
-import androidx.camera.testing.CameraUtil;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-@RunWith(AndroidJUnit4.class)
-public class ImageCaptureExtenderValidationTest {
-    @Rule
-    public TestRule mUseCamera = CameraUtil.grantCameraPermissionAndPreTest();
-    private final Context mContext = ApplicationProvider.getApplicationContext();
-
-    @Before
-    public void setUp() throws InterruptedException, ExecutionException, TimeoutException {
-        assumeTrue(CameraUtil.deviceHasCamera());
-        CameraX.initialize(mContext, Camera2Config.defaultConfig());
-
-        assumeTrue(ExtensionsTestUtil.initExtensions(mContext));
-    }
-
-    @After
-    public void tearDown() throws ExecutionException, InterruptedException, TimeoutException {
-        CameraX.shutdown().get(10000, TimeUnit.MILLISECONDS);
-        ExtensionsManager.deinit().get();
-    }
-
-    @Test
-    @LargeTest
-    public void getSupportedResolutionsImplementationTest()
-            throws CameraInfoUnavailableException, CameraAccessException {
-        // getSupportedResolutions supported since version 1.1
-        assumeTrue(ExtensionVersion.getRuntimeVersion().compareTo(Version.VERSION_1_1) >= 0);
-
-        // Uses for-loop to check all possible effect/lens facing combinations
-        for (Object[] EffectLensFacingPair :
-                ExtensionsTestUtil.getAllEffectLensFacingCombinations()) {
-            ExtensionsManager.EffectMode effectMode =
-                    (ExtensionsManager.EffectMode) EffectLensFacingPair[0];
-            @CameraSelector.LensFacing int lensFacing = (int) EffectLensFacingPair[1];
-
-            assumeTrue(CameraUtil.hasCameraWithLensFacing(lensFacing));
-            assumeTrue(ExtensionsManager.isExtensionAvailable(effectMode, lensFacing));
-
-            // Retrieves the target format/resolutions pair list from vendor library for the
-            // target effect mode.
-            ImageCaptureExtenderImpl impl = ExtensionsTestUtil.createImageCaptureExtenderImpl(
-                    effectMode, lensFacing);
-
-            // NoSuchMethodError will be thrown if getSupportedResolutions is not
-            // implemented in vendor library, and then the test will fail.
-            impl.getSupportedResolutions();
-        }
-    }
-}

camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/ImageCaptureExtenderValidationTest.kt

diff --git a/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/ImageCaptureExtenderValidationTest.kt b/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/ImageCaptureExtenderValidationTest.kt
new file mode 100644
index 0000000..04abfb93
--- /dev/null
+++ b/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/ImageCaptureExtenderValidationTest.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions
+
+import android.content.Context
+import android.hardware.camera2.CameraAccessException
+import android.os.Build
+import androidx.camera.camera2.Camera2Config
+import androidx.camera.core.CameraInfoUnavailableException
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.CameraX
+import androidx.camera.extensions.util.ExtensionsTestUtil
+import androidx.camera.testing.CameraUtil
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.filters.SdkSuppress
+import androidx.test.filters.SmallTest
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Assume
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+
+@SmallTest
+@RunWith(Parameterized::class)
+class ImageCaptureExtenderValidationTest(
+    @field:Extensions.ExtensionMode @param:Extensions.ExtensionMode private val extensionMode: Int,
+    @field:CameraSelector.LensFacing @param:CameraSelector.LensFacing private val lensFacing: Int
+) {
+    private val context =
+        ApplicationProvider.getApplicationContext<Context>()
+
+    private val effectMode: ExtensionsManager.EffectMode =
+        ExtensionsTestUtil.extensionModeToEffectMode(extensionMode)
+
+    private lateinit var extensions: Extensions
+
+    @Before
+    @Throws(Exception::class)
+    fun setUp() {
+        Assume.assumeTrue(CameraUtil.deviceHasCamera())
+        CameraX.initialize(context, Camera2Config.defaultConfig()).get()
+        Assume.assumeTrue(
+            CameraUtil.hasCameraWithLensFacing(
+                lensFacing
+            )
+        )
+        Assume.assumeTrue(ExtensionsTestUtil.initExtensions(context))
+        extensions = ExtensionsManager.getExtensions(context)
+    }
+
+    @After
+    @Throws(
+        InterruptedException::class,
+        ExecutionException::class,
+        TimeoutException::class
+    )
+    fun cleanUp() {
+        CameraX.shutdown()[10000, TimeUnit.MILLISECONDS]
+        ExtensionsManager.deinit().get()
+    }
+
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters(name = "extension = {0}, facing = {1}")
+        fun initParameters(): Collection<Array<Any>> =
+            ExtensionsTestUtil.getAllExtensionsLensFacingCombinations()
+    }
+
+    @Test
+    @Throws(
+        CameraInfoUnavailableException::class,
+        CameraAccessException::class
+    )
+    fun getSupportedResolutionsImplementationTest() {
+        // getSupportedResolutions supported since version 1.1
+        Assume.assumeTrue(ExtensionVersion.getRuntimeVersion().compareTo(Version.VERSION_1_1) >= 0)
+        Assume.assumeTrue(ExtensionsManager.isExtensionAvailable(effectMode, lensFacing))
+
+        // Creates the ImageCaptureExtenderImpl to retrieve the target format/resolutions pair list
+        // from vendor library for the target effect mode.
+        val impl = ExtensionsTestUtil.createImageCaptureExtenderImpl(effectMode, lensFacing)
+
+        // NoSuchMethodError will be thrown if getSupportedResolutions is not implemented in
+        // vendor library, and then the test will fail.
+        impl.supportedResolutions
+    }
+
+    @Test
+    @SdkSuppress(maxSdkVersion = Build.VERSION_CODES.O_MR1)
+    @Throws(
+        CameraInfoUnavailableException::class,
+        CameraAccessException::class
+    )
+    fun returnsNullFromOnPresetSession_whenAPILevelOlderThan28() {
+        Assume.assumeTrue(ExtensionsManager.isExtensionAvailable(effectMode, lensFacing))
+
+        // Creates the ImageCaptureExtenderImpl to check that onPresetSession() returns null when
+        // API level is older than 28.
+        val impl = ExtensionsTestUtil.createImageCaptureExtenderImpl(effectMode, lensFacing)
+        assertThat(impl.onPresetSession()).isNull()
+    }
+}

camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/PreviewExtenderValidationTest.java

diff --git a/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/PreviewExtenderValidationTest.java b/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/PreviewExtenderValidationTest.java
deleted file mode 100644
index 48fa332..0000000
--- a/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/PreviewExtenderValidationTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.extensions;
-
-import static org.junit.Assume.assumeTrue;
-
-import android.content.Context;
-import android.hardware.camera2.CameraAccessException;
-
-import androidx.camera.camera2.Camera2Config;
-import androidx.camera.core.CameraInfoUnavailableException;
-import androidx.camera.core.CameraSelector;
-import androidx.camera.core.CameraX;
-import androidx.camera.extensions.impl.PreviewExtenderImpl;
-import androidx.camera.extensions.util.ExtensionsTestUtil;
-import androidx.camera.testing.CameraUtil;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-@RunWith(AndroidJUnit4.class)
-public class PreviewExtenderValidationTest {
-    @Rule
-    public TestRule mUseCamera = CameraUtil.grantCameraPermissionAndPreTest();
-    private final Context mContext = ApplicationProvider.getApplicationContext();
-
-    @Before
-    public void setUp() throws InterruptedException, ExecutionException, TimeoutException {
-        assumeTrue(CameraUtil.deviceHasCamera());
-        CameraX.initialize(mContext, Camera2Config.defaultConfig());
-
-        assumeTrue(ExtensionsTestUtil.initExtensions(mContext));
-    }
-
-    @After
-    public void tearDown() throws ExecutionException, InterruptedException, TimeoutException {
-        CameraX.shutdown().get(10000, TimeUnit.MILLISECONDS);
-        ExtensionsManager.deinit().get();
-    }
-
-    @Test
-    @LargeTest
-    public void getSupportedResolutionsImplementationTest()
-            throws CameraInfoUnavailableException, CameraAccessException {
-        // getSupportedResolutions supported since version 1.1
-        assumeTrue(ExtensionVersion.getRuntimeVersion().compareTo(Version.VERSION_1_1) >= 0);
-
-        // Uses for-loop to check all possible effect/lens facing combinations
-        for (Object[] EffectLensFacingPair :
-                ExtensionsTestUtil.getAllEffectLensFacingCombinations()) {
-            ExtensionsManager.EffectMode effectMode =
-                    (ExtensionsManager.EffectMode) EffectLensFacingPair[0];
-            @CameraSelector.LensFacing int lensFacing = (int) EffectLensFacingPair[1];
-
-            assumeTrue(CameraUtil.hasCameraWithLensFacing(lensFacing));
-            assumeTrue(ExtensionsManager.isExtensionAvailable(effectMode, lensFacing));
-
-            // Retrieves the target format/resolutions pair list from vendor library for the
-            // target effect mode.
-            PreviewExtenderImpl impl = ExtensionsTestUtil.createPreviewExtenderImpl(effectMode,
-                    lensFacing);
-
-            // NoSuchMethodError will be thrown if getSupportedResolutions is not
-            // implemented in vendor library, and then the test will fail.
-            impl.getSupportedResolutions();
-        }
-    }
-}

camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/PreviewExtenderValidationTest.kt

diff --git a/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/PreviewExtenderValidationTest.kt b/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/PreviewExtenderValidationTest.kt
new file mode 100644
index 0000000..a94b9ce
--- /dev/null
+++ b/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/PreviewExtenderValidationTest.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions
+
+import android.content.Context
+import android.hardware.camera2.CameraAccessException
+import android.os.Build
+import androidx.camera.camera2.Camera2Config
+import androidx.camera.core.CameraInfoUnavailableException
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.CameraX
+import androidx.camera.extensions.util.ExtensionsTestUtil
+import androidx.camera.testing.CameraUtil
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.filters.SdkSuppress
+import androidx.test.filters.SmallTest
+import com.google.common.truth.Truth
+import org.junit.After
+import org.junit.Assume
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+
+@SmallTest
+@RunWith(Parameterized::class)
+class PreviewExtenderValidationTest(
+    @field:Extensions.ExtensionMode @param:Extensions.ExtensionMode private val extensionMode: Int,
+    @field:CameraSelector.LensFacing @param:CameraSelector.LensFacing private val lensFacing: Int
+) {
+    private val context =
+        ApplicationProvider.getApplicationContext<Context>()
+
+    private val effectMode: ExtensionsManager.EffectMode =
+        ExtensionsTestUtil.extensionModeToEffectMode(extensionMode)
+
+    private lateinit var extensions: Extensions
+
+    @Before
+    @Throws(Exception::class)
+    fun setUp() {
+        Assume.assumeTrue(CameraUtil.deviceHasCamera())
+        CameraX.initialize(context, Camera2Config.defaultConfig()).get()
+        Assume.assumeTrue(
+            CameraUtil.hasCameraWithLensFacing(
+                lensFacing
+            )
+        )
+        Assume.assumeTrue(ExtensionsTestUtil.initExtensions(context))
+        extensions = ExtensionsManager.getExtensions(context)
+    }
+
+    @After
+    @Throws(
+        InterruptedException::class,
+        ExecutionException::class,
+        TimeoutException::class
+    )
+    fun cleanUp() {
+        CameraX.shutdown()[10000, TimeUnit.MILLISECONDS]
+        ExtensionsManager.deinit().get()
+    }
+
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters(name = "extension = {0}, facing = {1}")
+        fun initParameters(): Collection<Array<Any>> =
+            ExtensionsTestUtil.getAllExtensionsLensFacingCombinations()
+    }
+
+    @Test
+    @Throws(
+        CameraInfoUnavailableException::class,
+        CameraAccessException::class
+    )
+    fun getSupportedResolutionsImplementationTest() {
+        // getSupportedResolutions supported since version 1.1
+        Assume.assumeTrue(ExtensionVersion.getRuntimeVersion().compareTo(Version.VERSION_1_1) >= 0)
+        Assume.assumeTrue(ExtensionsManager.isExtensionAvailable(effectMode, lensFacing))
+
+        // Creates the ImageCaptureExtenderImpl to retrieve the target format/resolutions pair list
+        // from vendor library for the target effect mode.
+        val impl = ExtensionsTestUtil.createPreviewExtenderImpl(effectMode, lensFacing)
+
+        // NoSuchMethodError will be thrown if getSupportedResolutions is not implemented in
+        // vendor library, and then the test will fail.
+        impl.supportedResolutions
+    }
+
+    @Test
+    @SdkSuppress(maxSdkVersion = Build.VERSION_CODES.O_MR1)
+    @Throws(
+        CameraInfoUnavailableException::class,
+        CameraAccessException::class
+    )
+    fun returnsNullFromOnPresetSession_whenAPILevelOlderThan28() {
+        Assume.assumeTrue(ExtensionsManager.isExtensionAvailable(effectMode, lensFacing))
+
+        // Creates the ImageCaptureExtenderImpl to check that onPresetSession() returns null when
+        // API level is older than 28.
+        val impl = ExtensionsTestUtil.createPreviewExtenderImpl(effectMode, lensFacing)
+        Truth.assertThat(impl.onPresetSession()).isNull()
+    }
+}

camera/camera-extensions/src/main/java/androidx/camera/extensions/ImageCaptureExtender.java

diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/ImageCaptureExtender.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/ImageCaptureExtender.java
index 6605fce..a816eeb 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/ImageCaptureExtender.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/ImageCaptureExtender.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.hardware.camera2.CameraCharacteristics;
+import android.os.Build;
 import android.util.Pair;
 import android.util.Size;
 
@@ -301,7 +302,15 @@
             if (mActive.get()) {
                 CaptureStageImpl captureStageImpl = mImpl.onPresetSession();
                 if (captureStageImpl != null) {
-                    return new AdaptingCaptureStage(captureStageImpl).getCaptureConfig();
+                    if (Build.VERSION.SDK_INT >= 28) {
+                        return new AdaptingCaptureStage(captureStageImpl).getCaptureConfig();
+                    } else {
+                        Logger.w(TAG, "The CaptureRequest parameters returned from "
+                                + "onPresetSession() will be passed to the camera device as part "
+                                + "of the capture session via "
+                                + "SessionConfiguration#setSessionParameters(CaptureRequest) "
+                                + "which only supported from API level 28!");
+                    }
                 }
             }
             return null;

camera/camera-extensions/src/main/java/androidx/camera/extensions/PreviewExtender.java

diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/PreviewExtender.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/PreviewExtender.java
index 4a40b8a..9928a80 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/PreviewExtender.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/PreviewExtender.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.hardware.camera2.CameraCharacteristics;
+import android.os.Build;
 import android.util.Pair;
 import android.util.Size;
 
@@ -320,7 +321,15 @@
             synchronized (mLock) {
                 CaptureStageImpl captureStageImpl = mImpl.onPresetSession();
                 if (captureStageImpl != null) {
-                    return new AdaptingCaptureStage(captureStageImpl).getCaptureConfig();
+                    if (Build.VERSION.SDK_INT >= 28) {
+                        return new AdaptingCaptureStage(captureStageImpl).getCaptureConfig();
+                    } else {
+                        Logger.w(TAG, "The CaptureRequest parameters returned from "
+                                + "onPresetSession() will be passed to the camera device as part "
+                                + "of the capture session via "
+                                + "SessionConfiguration#setSessionParameters(CaptureRequest) "
+                                + "which only supported from API level 28!");
+                    }
                 }
             }
 

camera/camera-view/dependencies.gradle

diff --git a/camera/camera-view/dependencies.gradle b/camera/camera-view/dependencies.gradle
index 5795377..ce7090a 100644
--- a/camera/camera-view/dependencies.gradle
+++ b/camera/camera-view/dependencies.gradle
@@ -16,5 +16,5 @@
 
 ext {
     // camera-view temporarily pins same-group depenencies to RC/stable until beta
-    VIEW_ATOMIC_GROUP_PINNED_VER = "1.0.0-rc03"
+    VIEW_ATOMIC_GROUP_PINNED_VER = "1.0.0-rc04"
 }

camera/camera-view/src/androidTest/AndroidManifest.xml

diff --git a/camera/camera-view/src/androidTest/AndroidManifest.xml b/camera/camera-view/src/androidTest/AndroidManifest.xml
index f6bc677..fd947bb 100644
--- a/camera/camera-view/src/androidTest/AndroidManifest.xml
+++ b/camera/camera-view/src/androidTest/AndroidManifest.xml
@@ -17,6 +17,7 @@
     package="androidx.camera.camera2.view">
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application>
          <activity
             android:name="androidx.camera.testing.fakes.FakeActivity"

camera/camera-view/src/androidTest/java/androidx/camera/view/transform/FileTransformFactoryDeviceTest.kt

diff --git a/camera/camera-view/src/androidTest/java/androidx/camera/view/transform/FileTransformFactoryDeviceTest.kt b/camera/camera-view/src/androidTest/java/androidx/camera/view/transform/FileTransformFactoryDeviceTest.kt
new file mode 100644
index 0000000..da197b5
--- /dev/null
+++ b/camera/camera-view/src/androidTest/java/androidx/camera/view/transform/FileTransformFactoryDeviceTest.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.view.transform
+
+import android.Manifest
+import android.content.ContentValues
+import android.content.Context
+import android.graphics.Bitmap
+import android.net.Uri
+import android.provider.MediaStore
+import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.rule.GrantPermissionRule
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+
+private const val WIDTH = 80
+private const val HEIGHT = 60
+
+/**
+ * Instrument test for [FileTransformFactory].
+ */
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+public class FileTransformFactoryDeviceTest {
+
+    private val factory = FileTransformFactory.Builder().build()
+    private val contentResolver = getApplicationContext<Context>().contentResolver
+
+    @get:Rule
+    public val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE
+    )
+
+    @Test
+    public fun extractFromFile() {
+        factory.getOutputTransform(createImageFile()).assertMapping(1f, 1f, WIDTH, HEIGHT)
+    }
+
+    @Test
+    public fun extractFromInputStream() {
+        FileInputStream(createImageFile()).use {
+            factory.getOutputTransform(it).assertMapping(1f, 1f, WIDTH, HEIGHT)
+        }
+    }
+
+    @Test
+    public fun extractFromMediaStoreUri() {
+        val uri = createMediaStoreImage()
+        factory.getOutputTransform(contentResolver, uri).assertMapping(1f, 1f, WIDTH, HEIGHT)
+        contentResolver.delete(uri, null, null)
+    }
+
+    /**
+     * Asserts that the [OutputTransform] maps normalized (x, y) to image (x, y).
+     */
+    private fun OutputTransform.assertMapping(
+        normalizedX: Float,
+        normalizedY: Float,
+        imageX: Int,
+        imageY: Int
+    ) {
+        val point = floatArrayOf(normalizedX, normalizedY)
+        matrix.mapPoints(point)
+        assertThat(point).usingTolerance(0.001)
+            .containsExactly((floatArrayOf(imageX.toFloat(), imageY.toFloat())))
+    }
+
+    private fun createImageFile(): File {
+        val tempFile = File.createTempFile("FileTransformFactoryDeviceTest", "tempFile")
+        tempFile.deleteOnExit()
+        FileOutputStream(tempFile).use {
+            createBitmap().compress(Bitmap.CompressFormat.JPEG, 100, it)
+        }
+        return tempFile
+    }
+
+    private fun createMediaStoreImage(): Uri {
+        val contentValues = ContentValues()
+        contentValues.put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg")
+        val uri = contentResolver.insert(
+            MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+            contentValues
+        )
+        contentResolver.openOutputStream(uri!!).use {
+            createBitmap().compress(Bitmap.CompressFormat.JPEG, 100, it)
+        }
+        return uri
+    }
+
+    private fun createBitmap(): Bitmap {
+        return Bitmap.createBitmap(WIDTH, HEIGHT, Bitmap.Config.ARGB_8888)
+    }
+}
\ No newline at end of file

camera/camera-view/src/main/java/androidx/camera/view/PreviewView.java

diff --git a/camera/camera-view/src/main/java/androidx/camera/view/PreviewView.java b/camera/camera-view/src/main/java/androidx/camera/view/PreviewView.java
index 3b44754..e537265 100644
--- a/camera/camera-view/src/main/java/androidx/camera/view/PreviewView.java
+++ b/camera/camera-view/src/main/java/androidx/camera/view/PreviewView.java
@@ -64,6 +64,8 @@
 import androidx.camera.core.impl.CameraInternal;
 import androidx.camera.core.impl.ImageOutputConfig;
 import androidx.camera.core.impl.utils.Threads;
+import androidx.camera.view.internal.compat.quirk.DeviceQuirks;
+import androidx.camera.view.internal.compat.quirk.SurfaceViewStretchedQuirk;
 import androidx.camera.view.transform.CoordinateTransform;
 import androidx.camera.view.transform.OutputTransform;
 import androidx.core.content.ContextCompat;
@@ -594,14 +596,16 @@
 
     // Synthetic access
     @SuppressWarnings("WeakerAccess")
-    boolean shouldUseTextureView(@NonNull SurfaceRequest surfaceRequest,
+    static boolean shouldUseTextureView(@NonNull SurfaceRequest surfaceRequest,
             @NonNull final ImplementationMode implementationMode) {
         // TODO(b/159127402): use TextureView if target rotation is not display rotation.
         boolean isLegacyDevice = surfaceRequest.getCamera().getCameraInfoInternal()
                 .getImplementationType().equals(CameraInfo.IMPLEMENTATION_TYPE_CAMERA2_LEGACY);
-        if (surfaceRequest.isRGBA8888Required() || Build.VERSION.SDK_INT <= 24 || isLegacyDevice) {
+        boolean hasSurfaceViewQuirk = DeviceQuirks.get(SurfaceViewStretchedQuirk.class) != null;
+        if (surfaceRequest.isRGBA8888Required() || Build.VERSION.SDK_INT <= 24 || isLegacyDevice
+                || hasSurfaceViewQuirk) {
             // Force to use TextureView when the device is running android 7.0 and below, legacy
-            // level or RGBA8888 is required.
+            // level, RGBA8888 is required or SurfaceView has quirks.
             return true;
         }
         switch (implementationMode) {

camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/DeviceQuirksLoader.java

diff --git a/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/DeviceQuirksLoader.java b/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/DeviceQuirksLoader.java
index 65e35b3..1fca5fe 100644
--- a/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/DeviceQuirksLoader.java
+++ b/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/DeviceQuirksLoader.java
@@ -43,6 +43,10 @@
             quirks.add(new PreviewStretchedQuirk());
         }
 
+        if (SurfaceViewStretchedQuirk.load()) {
+            quirks.add(new SurfaceViewStretchedQuirk());
+        }
+
         return quirks;
     }
 }

camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirk.java

diff --git a/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirk.java b/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirk.java
new file mode 100644
index 0000000..46b49f5
--- /dev/null
+++ b/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirk.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.view.internal.compat.quirk;
+
+import android.os.Build;
+
+import androidx.camera.core.impl.Quirk;
+
+/**
+ * A quirk where SurfaceView is stretched.
+ *
+ * <p> On Samsung Galaxy Z Fold2, transform APIs (e.g. View#setScaleX) do not work as intended.
+ * b/129403806
+ */
+public class SurfaceViewStretchedQuirk implements Quirk {
+
+    // Samsung Galaxy Z Fold2 b/129403806
+    private static final String SAMSUNG = "SAMSUNG";
+    private static final String GALAXY_Z_FOLD_2 = "F2Q";
+
+    static boolean load() {
+        return SAMSUNG.equals(Build.MANUFACTURER.toUpperCase()) && GALAXY_Z_FOLD_2.equals(
+                Build.DEVICE.toUpperCase());
+    }
+}

camera/camera-view/src/main/java/androidx/camera/view/transform/FileTransformFactory.java

diff --git a/camera/camera-view/src/main/java/androidx/camera/view/transform/FileTransformFactory.java b/camera/camera-view/src/main/java/androidx/camera/view/transform/FileTransformFactory.java
new file mode 100644
index 0000000..74283a5
--- /dev/null
+++ b/camera/camera-view/src/main/java/androidx/camera/view/transform/FileTransformFactory.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.view.transform;
+
+import static androidx.camera.view.TransformUtils.rectToSize;
+import static androidx.camera.view.TransformUtils.rectToVertices;
+import static androidx.camera.view.transform.ImageProxyTransformFactory.getRotatedVertices;
+import static androidx.camera.view.transform.OutputTransform.getNormalizedToBuffer;
+
+import android.content.ContentResolver;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.media.ExifInterface;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.camera.core.impl.utils.Exif;
+import androidx.camera.view.TransformExperimental;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Factory for extracting transform info from on disk image files.
+ *
+ * TODO(b/179827713): unhide this class once all transform utils are done.
+ *
+ * @hide
+ */
+@TransformExperimental
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class FileTransformFactory {
+
+    private final boolean mUseExifOrientation;
+
+    FileTransformFactory(boolean useExifOrientation) {
+        mUseExifOrientation = useExifOrientation;
+    }
+
+    /**
+     * Extracts transform from the given {@link Uri}.
+     */
+    @NonNull
+    public OutputTransform getOutputTransform(@NonNull ContentResolver contentResolver,
+            @NonNull Uri uri)
+            throws IOException {
+        try (InputStream inputStream = contentResolver.openInputStream(uri)) {
+            return getOutputTransform(inputStream);
+        }
+    }
+
+    /**
+     * Extracts transform from the given {@link File}.
+     */
+    @NonNull
+    public OutputTransform getOutputTransform(@NonNull File file) throws IOException {
+        try (InputStream inputStream = new FileInputStream(file)) {
+            return getOutputTransform(inputStream);
+        }
+    }
+
+    /**
+     * Extracts transform from the given {@link InputStream}.
+     */
+    @NonNull
+    public OutputTransform getOutputTransform(@NonNull InputStream inputStream) throws IOException {
+        Exif exif = Exif.createFromInputStream(inputStream);
+        Rect cropRect = new Rect(0, 0, exif.getWidth(), exif.getHeight());
+
+        // TODO(b/179827713): reuse the following code with ImageProxyTransformFactory.
+        float[] cropRectVertices = rectToVertices(new RectF(cropRect));
+        float[] outputVertices = getRotatedVertices(cropRectVertices, 0);
+
+        Matrix matrix = new Matrix();
+        matrix.setPolyToPoly(cropRectVertices, 0, outputVertices, 0, 4);
+        // Map the normalized space to viewport.
+        matrix.preConcat(getNormalizedToBuffer(cropRect));
+
+        if (mUseExifOrientation) {
+            // TODO(b/179827713): apply exif orientation.
+        }
+
+        return new OutputTransform(matrix, rectToSize(cropRect));
+    }
+
+    /**
+     * Builder for {@link FileTransformFactory}.
+     *
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public static class Builder {
+        boolean mUseExifOrientation = false;
+
+        /**
+         * Builds {@link FileTransformFactory}.
+         */
+        @NonNull
+        public FileTransformFactory build() {
+            return new FileTransformFactory(mUseExifOrientation);
+        }
+
+        /**
+         * Whether to include the {@link ExifInterface#TAG_ORIENTATION}.
+         *
+         * <p> By default, the value is false. Loading image with {@link BitmapFactory} does not
+         * apply the exif orientation to the loaded {@link Bitmap}. Only set this if the exif
+         * orientation is applied to the loaded file. For example, if the image is loaded by a 3P
+         * library that automatically applies exif orientation.
+         */
+        public void setUseExifOrientation() {
+            mUseExifOrientation = true;
+        }
+    }
+
+}

camera/camera-view/src/test/java/androidx/camera/view/PreviewViewTest.java

diff --git a/camera/camera-view/src/test/java/androidx/camera/view/PreviewViewTest.java b/camera/camera-view/src/test/java/androidx/camera/view/PreviewViewTest.java
new file mode 100644
index 0000000..82c2e25
--- /dev/null
+++ b/camera/camera-view/src/test/java/androidx/camera/view/PreviewViewTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.view;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Build;
+import android.util.Size;
+
+import androidx.camera.core.CameraInfo;
+import androidx.camera.core.SurfaceRequest;
+import androidx.camera.testing.fakes.FakeCamera;
+import androidx.camera.testing.fakes.FakeCameraInfoInternal;
+import androidx.camera.view.internal.compat.quirk.QuirkInjector;
+import androidx.camera.view.internal.compat.quirk.SurfaceViewStretchedQuirk;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(RobolectricTestRunner.class)
+@DoNotInstrument
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+public class PreviewViewTest {
+
+    @After
+    public void tearDown() {
+        QuirkInjector.clear();
+    }
+
+    @Test
+    @Config(minSdk = Build.VERSION_CODES.N_MR1)
+    public void surfaceViewNormal_useSurfaceView() {
+        // Assert: SurfaceView is used.
+        assertThat(PreviewView.shouldUseTextureView(
+                createSurfaceRequestCompatibleWithSurfaceView(),
+                PreviewView.ImplementationMode.PERFORMANCE)).isFalse();
+    }
+
+    @Test
+    public void surfaceViewHasQuirk_useTextureView() {
+        // Arrange:
+        QuirkInjector.inject(new SurfaceViewStretchedQuirk());
+
+        // Assert: TextureView is used even the SurfaceRequest is compatible with SurfaceView.
+        assertThat(PreviewView.shouldUseTextureView(
+                createSurfaceRequestCompatibleWithSurfaceView(),
+                PreviewView.ImplementationMode.PERFORMANCE)).isTrue();
+    }
+
+    private SurfaceRequest createSurfaceRequestCompatibleWithSurfaceView() {
+        FakeCameraInfoInternal cameraInfoInternal = new FakeCameraInfoInternal();
+        cameraInfoInternal.setImplementationType(CameraInfo.IMPLEMENTATION_TYPE_CAMERA2);
+        return new SurfaceRequest(new Size(800, 600),
+                new FakeCamera(null, cameraInfoInternal),
+                /*isRGB8888Required*/ false);
+    }
+}

camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/DeviceQuirks.java

diff --git a/camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/DeviceQuirks.java b/camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/DeviceQuirks.java
new file mode 100644
index 0000000..d9f5964
--- /dev/null
+++ b/camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/DeviceQuirks.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.view.internal.compat.quirk;
+
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.camera.core.impl.Quirk;
+
+import java.util.List;
+
+/**
+ * Tests version of main/.../DeviceQuirks.java, which provides device specific quirks, used for
+ * device specific workarounds.
+ * <p>
+ * In main/.../DeviceQuirks, Device quirks are loaded the first time a device workaround is
+ * encountered, and remain in memory until the process is killed. When running tests, this means
+ * that the same device quirks are used for all the tests. This causes an issue when tests modify
+ * device properties (using Robolectric for instance). Instead of force-reloading the device
+ * quirks in every test that uses a device workaround, this class internally reloads the quirks
+ * every time a device workaround is needed.
+ */
+public class DeviceQuirks {
+
+    private DeviceQuirks() {
+    }
+
+    /**
+     * Retrieves a specific device {@link Quirk} instance given its type.
+     *
+     * @param quirkClass The type of device quirk to retrieve.
+     * @return A device {@link Quirk} instance of the provided type, or {@code null} if it isn't
+     * found.
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public static <T extends Quirk> T get(@NonNull final Class<T> quirkClass) {
+        final List<Quirk> quirks = DeviceQuirksLoader.loadQuirks();
+        quirks.addAll(QuirkInjector.INJECTED_QUIRKS);
+        for (final Quirk quirk : quirks) {
+            if (quirk.getClass() == quirkClass) {
+                return (T) quirk;
+            }
+        }
+        return null;
+    }
+}

camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/QuirkInjector.java

diff --git a/camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/QuirkInjector.java b/camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/QuirkInjector.java
new file mode 100644
index 0000000..d7568c3
--- /dev/null
+++ b/camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/QuirkInjector.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.view.internal.compat.quirk;
+
+import androidx.annotation.NonNull;
+import androidx.camera.core.impl.Quirk;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Inject quirks for unit tests.
+ *
+ * <p> Used with the test version of {@link DeviceQuirks} to test the behavior of quirks.
+ */
+public class QuirkInjector {
+
+    static final List<Quirk> INJECTED_QUIRKS = new ArrayList<>();
+
+    /**
+     * Inject a quirk. The injected quirk will be loaded by {@link DeviceQuirks}.
+     */
+    public static void inject(@NonNull Quirk quirk) {
+        INJECTED_QUIRKS.add(quirk);
+    }
+
+    /**
+     * Clears all injected quirks.
+     */
+    public static void clear() {
+        INJECTED_QUIRKS.clear();
+    }
+}

camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirkTest.java

diff --git a/camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirkTest.java b/camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirkTest.java
new file mode 100644
index 0000000..965357e
--- /dev/null
+++ b/camera/camera-view/src/test/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirkTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.view.internal.compat.quirk;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Build;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.internal.DoNotInstrument;
+import org.robolectric.util.ReflectionHelpers;
+
+/**
+ * Unit test for {@link SurfaceViewStretchedQuirk}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@DoNotInstrument
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+public class SurfaceViewStretchedQuirkTest {
+
+    @Test
+    public void quirkExistsOnSamsungGalaxyZFold2() {
+        // Arrange.
+        ReflectionHelpers.setStaticField(Build.class, "DEVICE", "F2Q");
+        ReflectionHelpers.setStaticField(Build.class, "MANUFACTURER", "SAMSUNG");
+
+        // Act.
+        final SurfaceViewStretchedQuirk quirk = DeviceQuirks.get(SurfaceViewStretchedQuirk.class);
+
+        // Assert.
+        assertThat(quirk).isNotNull();
+    }
+}

camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeActivity.kt

diff --git a/camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeActivity.kt b/camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeActivity.kt
index 1ef90b7..62d9a03 100644
--- a/camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeActivity.kt
+++ b/camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeActivity.kt
@@ -26,6 +26,7 @@
 import android.view.WindowManager
 import androidx.camera.camera2.pipe.CameraId
 import androidx.camera.camera2.pipe.CameraPipe
+import kotlinx.coroutines.runBlocking
 
 /**
  * This is the main activity for the CameraPipe test application.
@@ -106,7 +107,7 @@
         Trace.endSection()
 
         Trace.beginSection("CXCP-App#findNextCamera")
-        val cameraId = findNextCamera(lastCameraId)
+        val cameraId = runBlocking { findNextCamera(lastCameraId) }
         Trace.endSection()
 
         Trace.beginSection("CXCP-App#startCameraGraph")
@@ -122,23 +123,24 @@
         Trace.endSection()
     }
 
-    private fun findNextCamera(lastCameraId: CameraId?): CameraId {
+    private suspend fun findNextCamera(lastCameraId: CameraId?): CameraId {
+        val cameras: List<CameraId> = cameraPipe.cameras().ids()
         // By default, open the first back facing camera if no camera was previously configured.
         if (lastCameraId == null) {
-            return cameraPipe.cameras().findAll().firstOrNull {
-                cameraPipe.cameras().awaitMetadata(it)[CameraCharacteristics.LENS_FACING] ==
+            return cameras.firstOrNull {
+                cameraPipe.cameras().getMetadata(it)[CameraCharacteristics.LENS_FACING] ==
                     CameraCharacteristics.LENS_FACING_BACK
-            } ?: cameraPipe.cameras().findAll().first()
+            } ?: cameras.first()
         }
 
         // If a camera was previously open, select the next camera in the list of all cameras. It is
         // possible that the list of cameras contains only one camera, in which case this will return
         // the same camera as "currentCameraId"
-        val cameras: List<CameraId> = cameraPipe.cameras().findAll()
+
         val lastCameraIndex = cameras.indexOf(lastCameraId)
         if (cameras.isEmpty() || lastCameraIndex == -1) {
             Log.e("CXCP-App", "Failed to find matching camera!")
-            return cameraPipe.cameras().findAll().first()
+            return cameras.first()
         }
 
         // When we reach the end of the list of cameras, loop.

camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/SimpleCamera.kt

diff --git a/camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/SimpleCamera.kt b/camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/SimpleCamera.kt
index aa66295..af336e7 100644
--- a/camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/SimpleCamera.kt
+++ b/camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/SimpleCamera.kt
@@ -17,6 +17,7 @@
 package androidx.camera.integration.camera2.pipe
 
 import android.graphics.ImageFormat
+import android.hardware.camera2.CameraCharacteristics
 import android.hardware.camera2.CameraDevice
 import android.media.ImageReader
 import android.os.Handler
@@ -59,7 +60,9 @@
             Log.i("CXCP-App", "Selected $cameraId to open.")
 
             val cameraMetadata = cameraPipe.cameras().awaitMetadata(cameraId)
-            var yuvSizes = cameraMetadata.streamMap.getOutputSizes(ImageFormat.YUV_420_888).toList()
+            var yuvSizes =
+                cameraMetadata[CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP]!!
+                    .getOutputSizes(ImageFormat.YUV_420_888).toList()
 
             val closestAspectRatioSize = yuvSizes.minByOrNull {
                 (it.aspectRatio() - defaultAspectRatio).absoluteValue

camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ExistingActivityLifecycleTest.kt

diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ExistingActivityLifecycleTest.kt b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ExistingActivityLifecycleTest.kt
index 382ec89..79ad758 100644
--- a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ExistingActivityLifecycleTest.kt
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ExistingActivityLifecycleTest.kt
@@ -18,6 +18,7 @@
 import android.Manifest
 import android.app.Instrumentation
 import androidx.camera.core.CameraSelector
+import androidx.camera.core.CameraX
 import androidx.camera.testing.CameraUtil
 import androidx.camera.testing.CoreAppTestUtil
 import androidx.lifecycle.Lifecycle.State.CREATED
@@ -35,12 +36,14 @@
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import org.junit.After
+import org.junit.AfterClass
 import org.junit.Assume
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
 
 private const val HOME_TIMEOUT_MS = 3000L
 private const val ROTATE_TIMEOUT_MS = 2000L
@@ -62,6 +65,14 @@
             Manifest.permission.RECORD_AUDIO
         )
 
+    companion object {
+        @AfterClass
+        @JvmStatic
+        fun shutdownCameraX() {
+            CameraX.shutdown().get(10, TimeUnit.SECONDS)
+        }
+    }
+
     @Before
     fun setup() {
         Assume.assumeTrue(CameraUtil.deviceHasCamera())

camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/InitializationTest.kt

diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/InitializationTest.kt b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/InitializationTest.kt
index 5887576..42dce52 100644
--- a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/InitializationTest.kt
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/InitializationTest.kt
@@ -17,6 +17,7 @@
 package androidx.camera.integration.core
 
 import android.content.Context
+import androidx.camera.core.CameraX
 import androidx.camera.testing.CameraUtil
 import androidx.camera.testing.CoreAppTestUtil
 import androidx.concurrent.futures.await
@@ -32,6 +33,7 @@
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.runBlocking
 import org.junit.After
+import org.junit.AfterClass
 import org.junit.Assume
 import org.junit.Before
 import org.junit.Rule
@@ -39,6 +41,7 @@
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
+import java.util.concurrent.TimeUnit
 
 @LargeTest
 @RunWith(Parameterized::class)
@@ -70,6 +73,12 @@
                     TestConfig(orientation)
                 }
         }
+
+        @AfterClass
+        @JvmStatic
+        fun shutdownCameraX() {
+            CameraX.shutdown().get(10, TimeUnit.SECONDS)
+        }
     }
 
     private var providerResult: CameraXViewModel.CameraProviderResult? = null

camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/NewActivityLifecycleTest.java

diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/NewActivityLifecycleTest.java b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/NewActivityLifecycleTest.java
index 050cd6f..b1b8a1b 100644
--- a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/NewActivityLifecycleTest.java
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/NewActivityLifecycleTest.java
@@ -26,6 +26,7 @@
 import android.content.Context;
 import android.content.Intent;
 
+import androidx.camera.core.CameraX;
 import androidx.camera.testing.CameraUtil;
 import androidx.camera.testing.CoreAppTestUtil;
 import androidx.test.core.app.ApplicationProvider;
@@ -38,12 +39,17 @@
 import androidx.test.uiautomator.UiDevice;
 
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
 // Test new activity lifecycle when using CameraX.
 @RunWith(AndroidJUnit4.class)
 @LargeTest
@@ -96,6 +102,12 @@
         pressHomeButton();
     }
 
+    @AfterClass
+    public static void shutdownCameraX()
+            throws InterruptedException, ExecutionException, TimeoutException {
+        CameraX.shutdown().get(10, TimeUnit.SECONDS);
+    }
+
     @Test
     public void checkPreviewUpdatedWithNewInstance() {
 

camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/TakePictureTest.kt

diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/TakePictureTest.kt b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/TakePictureTest.kt
index 71cdc95..1c1704e 100644
--- a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/TakePictureTest.kt
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/TakePictureTest.kt
@@ -17,6 +17,7 @@
 package androidx.camera.integration.core
 
 import android.Manifest
+import androidx.camera.core.CameraX
 import androidx.camera.testing.CameraUtil
 import androidx.camera.testing.CoreAppTestUtil
 import androidx.test.core.app.ActivityScenario
@@ -27,12 +28,14 @@
 import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
+import org.junit.AfterClass
 import org.junit.Assume.assumeTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
 
 @LargeTest
 @RunWith(AndroidJUnit4::class)
@@ -47,6 +50,14 @@
             Manifest.permission.RECORD_AUDIO
         )
 
+    companion object {
+        @AfterClass
+        @JvmStatic
+        fun tearDown() {
+            CameraX.shutdown().get(10, TimeUnit.SECONDS)
+        }
+    }
+
     @Before
     fun setUp() {
         assumeTrue(CameraUtil.deviceHasCamera())

camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ToggleButtonUITest.java

diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ToggleButtonUITest.java b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ToggleButtonUITest.java
index 2551bb3..70eccd1 100644
--- a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ToggleButtonUITest.java
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ToggleButtonUITest.java
@@ -34,6 +34,7 @@
 
 import androidx.camera.core.CameraInfo;
 import androidx.camera.core.CameraSelector;
+import androidx.camera.core.CameraX;
 import androidx.camera.core.ImageCapture;
 import androidx.camera.core.TorchState;
 import androidx.camera.integration.core.idlingresource.ElapsedTimeIdlingResource;
@@ -54,12 +55,17 @@
 import junit.framework.AssertionFailedError;
 
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
 /** Test toggle buttons in CoreTestApp. */
 @RunWith(AndroidJUnit4.class)
 @LargeTest
@@ -118,6 +124,12 @@
         mDevice.waitForIdle(IDLE_TIMEOUT_MS);
     }
 
+    @AfterClass
+    public static void shutdownCameraX()
+            throws InterruptedException, ExecutionException, TimeoutException {
+        CameraX.shutdown().get(10, TimeUnit.SECONDS);
+    }
+
     @Test
     public void testFlashToggleButton() {
         waitFor(new WaitForViewToShow(R.id.constraintLayout));

camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/UseCaseCombinationTest.kt

diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/UseCaseCombinationTest.kt b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/UseCaseCombinationTest.kt
new file mode 100644
index 0000000..9cdff8a
--- /dev/null
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/UseCaseCombinationTest.kt
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.camera.integration.core
+
+import android.content.Context
+import androidx.camera.camera2.Camera2Config
+import androidx.camera.camera2.pipe.integration.CameraPipeConfig
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.CameraX
+import androidx.camera.core.CameraXConfig
+import androidx.camera.core.ImageAnalysis
+import androidx.camera.core.ImageCapture
+import androidx.camera.core.Preview
+import androidx.camera.testing.CameraUtil
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.filters.LargeTest
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import java.util.concurrent.TimeUnit
+
+private val DEFAULT_SELECTOR = CameraSelector.DEFAULT_BACK_CAMERA
+
+/** Contains tests for [CameraX] which varies use case combinations to run. */
+@LargeTest
+@RunWith(Parameterized::class)
+class UseCaseCombinationTest(
+    private val implName: String,
+    private val cameraConfig: CameraXConfig
+) {
+
+    @get:Rule
+    val cameraRule = CameraUtil.grantCameraPermissionAndPreTest()
+
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters(name = "{0}")
+        fun data() = listOf(
+            arrayOf(Camera2Config::class.simpleName, Camera2Config.defaultConfig()),
+            arrayOf(CameraPipeConfig::class.simpleName, CameraPipeConfig.defaultConfig())
+        )
+    }
+
+    private val context: Context = ApplicationProvider.getApplicationContext()
+
+    @Before
+    fun initializeCameraX(): Unit = runBlocking {
+        CameraX.initialize(context, cameraConfig).get(10, TimeUnit.SECONDS)
+    }
+
+    @After
+    fun shutdownCameraX(): Unit = runBlocking {
+        CameraX.shutdown().get(10, TimeUnit.SECONDS)
+    }
+
+    /** Test Combination: Preview + ImageCapture */
+    @Test
+    fun previewCombinesImageCapture() = runBlocking {
+        val preview = initPreview()
+        val imageCapture = initImageCapture()
+
+        val camera = CameraUtil.createCameraUseCaseAdapter(context, DEFAULT_SELECTOR)
+        camera.detachUseCases()
+
+        // TODO(b/160249108) move off of main thread once UseCases can be attached on any thread
+        withContext(Dispatchers.Main) {
+            camera.addUseCases(listOf(preview, imageCapture))
+        }
+    }
+
+    /** Test Combination: Preview + ImageAnalysis */
+    @Test
+    fun previewCombinesImageAnalysis() = runBlocking {
+        val preview = initPreview()
+        val imageAnalysis = initImageAnalysis()
+
+        val camera = CameraUtil.createCameraUseCaseAdapter(context, DEFAULT_SELECTOR)
+        camera.detachUseCases()
+
+        // TODO(b/160249108) move off of main thread once UseCases can be attached on any thread
+        withContext(Dispatchers.Main) {
+            camera.addUseCases(listOf(preview, imageAnalysis))
+        }
+    }
+
+    /** Test Combination: Preview + ImageAnalysis + ImageCapture  */
+    @Test
+    fun previewCombinesImageAnalysisAndImageCapture() = runBlocking {
+        val preview = initPreview()
+        val imageAnalysis = initImageAnalysis()
+        val imageCapture = initImageCapture()
+
+        val camera = CameraUtil.createCameraUseCaseAdapter(context, DEFAULT_SELECTOR)
+        camera.detachUseCases()
+
+        // TODO(b/160249108) move off of main thread once UseCases can be attached on any
+        //  thread
+        withContext(Dispatchers.Main) {
+            camera.addUseCases(listOf(preview, imageAnalysis, imageCapture))
+        }
+    }
+
+    private fun initPreview(): Preview {
+        return Preview.Builder()
+            .setTargetName("Preview")
+            .build()
+    }
+
+    private fun initImageAnalysis(): ImageAnalysis {
+        return ImageAnalysis.Builder()
+            .setTargetName("ImageAnalysis")
+            .build()
+    }
+
+    private fun initImageCapture(): ImageCapture {
+        return ImageCapture.Builder().build()
+    }
+}

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java
index 177210e..7c9077f 100755
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java
@@ -151,6 +151,12 @@
 
     @Override
     public CaptureStageImpl onPresetSession() {
+        // The CaptureRequest parameters will be set via SessionConfiguration#setSessionParameters
+        // (CaptureRequest) which only supported from API level 28.
+        if (Build.VERSION.SDK_INT < 28) {
+            return null;
+        }
+
         // Set the necessary CaptureRequest parameters via CaptureStage, here we use some
         // placeholder set of CaptureRequest.Key values
         SettableCaptureStage captureStage = new SettableCaptureStage(SESSION_STAGE_ID);

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java
index fbf70ba..0814b3d 100755
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java
@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CaptureRequest;
+import android.os.Build;
 import android.util.Pair;
 import android.util.Size;
 
@@ -96,6 +97,12 @@
 
     @Override
     public CaptureStageImpl onPresetSession() {
+        // The CaptureRequest parameters will be set via SessionConfiguration#setSessionParameters
+        // (CaptureRequest) which only supported from API level 28.
+        if (Build.VERSION.SDK_INT < 28) {
+            return null;
+        }
+
         // Set the necessary CaptureRequest parameters via CaptureStage, here we use some
         // placeholder set of CaptureRequest.Key values
         SettableCaptureStage captureStage = new SettableCaptureStage(SESSION_STAGE_ID);

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java
index 17b1eaa..e23aeb9 100755
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java
@@ -156,6 +156,12 @@
 
     @Override
     public CaptureStageImpl onPresetSession() {
+        // The CaptureRequest parameters will be set via SessionConfiguration#setSessionParameters
+        // (CaptureRequest) which only supported from API level 28.
+        if (Build.VERSION.SDK_INT < 28) {
+            return null;
+        }
+
         // Set the necessary CaptureRequest parameters via CaptureStage, here we use some
         // placeholder set of CaptureRequest.Key values
         SettableCaptureStage captureStage = new SettableCaptureStage(SESSION_STAGE_ID);

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java
index 0a8a654..4801055 100755
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java
@@ -20,6 +20,7 @@
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.params.StreamConfigurationMap;
+import android.os.Build;
 import android.util.Pair;
 import android.util.Size;
 
@@ -117,6 +118,12 @@
 
     @Override
     public CaptureStageImpl onPresetSession() {
+        // The CaptureRequest parameters will be set via SessionConfiguration#setSessionParameters
+        // (CaptureRequest) which only supported from API level 28.
+        if (Build.VERSION.SDK_INT < 28) {
+            return null;
+        }
+
         // Set the necessary CaptureRequest parameters via CaptureStage, here we use some
         // placeholder set of CaptureRequest.Key values
         SettableCaptureStage captureStage = new SettableCaptureStage(SESSION_STAGE_ID);

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java
index f2d82b1..eff6232 100644
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java
@@ -152,6 +152,12 @@
 
     @Override
     public CaptureStageImpl onPresetSession() {
+        // The CaptureRequest parameters will be set via SessionConfiguration#setSessionParameters
+        // (CaptureRequest) which only supported from API level 28.
+        if (Build.VERSION.SDK_INT < 28) {
+            return null;
+        }
+
         // Set the necessary CaptureRequest parameters via CaptureStage, here we use some
         // placeholder set of CaptureRequest.Key values
         SettableCaptureStage captureStage = new SettableCaptureStage(SESSION_STAGE_ID);

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java
index 9136f89..ca6a8da 100644
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java
@@ -19,6 +19,7 @@
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.TotalCaptureResult;
+import android.os.Build;
 import android.util.Pair;
 import android.util.Size;
 import android.view.Surface;
@@ -135,6 +136,12 @@
 
     @Override
     public CaptureStageImpl onPresetSession() {
+        // The CaptureRequest parameters will be set via SessionConfiguration#setSessionParameters
+        // (CaptureRequest) which only supported from API level 28.
+        if (Build.VERSION.SDK_INT < 28) {
+            return null;
+        }
+
         // Set the necessary CaptureRequest parameters via CaptureStage, here we use some
         // placeholder set of CaptureRequest.Key values
         SettableCaptureStage captureStage = new SettableCaptureStage(SESSION_STAGE_ID);

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
index f571dd9..564e941 100644
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
@@ -16,6 +16,7 @@
 
 package androidx.camera.extensions.impl;
 
+import android.graphics.ImageFormat;
 import android.hardware.camera2.TotalCaptureResult;
 import android.media.Image;
 import android.util.Pair;
@@ -45,9 +46,9 @@
      * <p> The result of the processing step should be written to the {@link Surface} that was
      * received by {@link #onOutputSurface(Surface, int)}.
      *
-     * @param results The map of images and metadata to process. The {@link Image} that are
-     *                contained within the map will become invalid after this method completes,
-     *                so no references to them should be kept.
+     * @param results The map of {@link ImageFormat#YUV_420_888} format images and metadata to
+     *                process. The {@link Image} that are contained within the map will become
+     *                invalid after this method completes, so no references to them should be kept.
      */
     void process(Map<Integer, Pair<Image, TotalCaptureResult>> results);
 

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java
index f1817a7..010ce68 100644
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java
@@ -20,6 +20,7 @@
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.params.SessionConfiguration;
 
 /**
  * Provides interfaces that the OEM needs to implement to handle the state change.
@@ -51,8 +52,10 @@
      * This will be invoked before creating a
      * {@link android.hardware.camera2.CameraCaptureSession}. The {@link CaptureRequest}
      * parameters returned via {@link CaptureStageImpl} will be passed to the camera device as
-     * part of the capture session initialization via setSessionParameters(). The valid parameter
-     * is a subset of the available capture request parameters.
+     * part of the capture session initialization via
+     * {@link SessionConfiguration#setSessionParameters(CaptureRequest)} which only supported
+     * from API level 28. The valid parameter is a subset of the available capture request
+     * parameters.
      *
      * @return The request information to set the session wide camera parameters.
      */

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java
index 6ac0f3e..2ac4548 100644
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java
@@ -229,6 +229,12 @@
 
     @Override
     public CaptureStageImpl onPresetSession() {
+        // The CaptureRequest parameters will be set via SessionConfiguration#setSessionParameters
+        // (CaptureRequest) which only supported from API level 28.
+        if (Build.VERSION.SDK_INT < 28) {
+            return null;
+        }
+
         SettableCaptureStage captureStage = new SettableCaptureStage(SESSION_STAGE_ID);
         return captureStage;
     }

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java
index 7b0eb61..1434871 100755
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java
@@ -151,6 +151,12 @@
 
     @Override
     public CaptureStageImpl onPresetSession() {
+        // The CaptureRequest parameters will be set via SessionConfiguration#setSessionParameters
+        // (CaptureRequest) which only supported from API level 28.
+        if (Build.VERSION.SDK_INT < 28) {
+            return null;
+        }
+
         // Set the necessary CaptureRequest parameters via CaptureStage, here we use some
         // placeholder set of CaptureRequest.Key values
         SettableCaptureStage captureStage = new SettableCaptureStage(SESSION_STAGE_ID);

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java
index fb4a855..8bb6074 100755
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java
@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CaptureRequest;
+import android.os.Build;
 import android.util.Pair;
 import android.util.Size;
 
@@ -96,6 +97,12 @@
 
     @Override
     public CaptureStageImpl onPresetSession() {
+        // The CaptureRequest parameters will be set via SessionConfiguration#setSessionParameters
+        // (CaptureRequest) which only supported from API level 28.
+        if (Build.VERSION.SDK_INT < 28) {
+            return null;
+        }
+
         // Set the necessary CaptureRequest parameters via CaptureStage, here we use some
         // placeholder set of CaptureRequest.Key values
         SettableCaptureStage captureStage = new SettableCaptureStage(SESSION_STAGE_ID);

camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
index 0e7879e..7caad1a 100644
--- a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
+++ b/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
@@ -16,6 +16,7 @@
 
 package androidx.camera.extensions.impl;
 
+import android.graphics.ImageFormat;
 import android.hardware.camera2.TotalCaptureResult;
 import android.media.Image;
 
@@ -32,8 +33,8 @@
      * <p> The result of the processing step should be written to the {@link android.view.Surface}
      * that was received by {@link ProcessorImpl#onOutputSurface(android.view.Surface, int)}.
      *
-     * @param image The image to process. This will be invalid after the method completes so no
-     *              reference to it should be kept.
+     * @param image  The {@link ImageFormat#YUV_420_888} format image to process. This will be
+     *               invalid after the method completes so no reference to it should be kept.
      * @param result The metadata associated with the image to process.
      */
     void process(Image image, TotalCaptureResult result);

camera/integration-tests/viewtestapp/build.gradle

diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle
index ca49b03..689feab 100644
--- a/camera/integration-tests/viewtestapp/build.gradle
+++ b/camera/integration-tests/viewtestapp/build.gradle
@@ -58,6 +58,7 @@
     implementation(project(":lifecycle:lifecycle-runtime"))
     implementation(project(":camera:camera-view"))
     implementation(GUAVA_ANDROID)
+    implementation("androidx.exifinterface:exifinterface:1.3.2")
 
     // Lifecycle and LiveData
     implementation("androidx.lifecycle:lifecycle-livedata:2.2.0")

camera/integration-tests/viewtestapp/src/main/java/androidx/camera/integration/view/TransformFragment.java

diff --git a/camera/integration-tests/viewtestapp/src/main/java/androidx/camera/integration/view/TransformFragment.java b/camera/integration-tests/viewtestapp/src/main/java/androidx/camera/integration/view/TransformFragment.java
index fc44966..d15867e 100644
--- a/camera/integration-tests/viewtestapp/src/main/java/androidx/camera/integration/view/TransformFragment.java
+++ b/camera/integration-tests/viewtestapp/src/main/java/androidx/camera/integration/view/TransformFragment.java
@@ -16,41 +16,68 @@
 
 package androidx.camera.integration.view;
 
+import android.annotation.SuppressLint;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Matrix;
+import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.net.Uri;
 import android.os.Bundle;
+import android.provider.MediaStore;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 import android.widget.ToggleButton;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.experimental.UseExperimental;
+import androidx.camera.core.CameraSelector;
 import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.ImageCapture;
+import androidx.camera.core.ImageCaptureException;
 import androidx.camera.core.ImageProxy;
+import androidx.camera.core.Logger;
 import androidx.camera.view.LifecycleCameraController;
 import androidx.camera.view.PreviewView;
 import androidx.camera.view.TransformExperimental;
 import androidx.camera.view.transform.CoordinateTransform;
+import androidx.camera.view.transform.FileTransformFactory;
 import androidx.camera.view.transform.ImageProxyTransformFactory;
 import androidx.camera.view.transform.OutputTransform;
+import androidx.exifinterface.media.ExifInterface;
 import androidx.fragment.app.Fragment;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
  * A fragment that demos transform utilities.
  */
+@SuppressLint("RestrictedAPI")
 public final class TransformFragment extends Fragment {
 
+    private static final String TAG = "TransformFragment";
+
     private static final int TILE_COUNT = 4;
 
     private LifecycleCameraController mCameraController;
     private ExecutorService mExecutorService;
     private ToggleButton mMirror;
+    private ToggleButton mCameraToggle;
 
     // Synthetic access
     @SuppressWarnings("WeakerAccess")
@@ -59,6 +86,19 @@
     @SuppressWarnings("WeakerAccess")
     OverlayView mOverlayView;
 
+    // The following two variables should only be accessed from mExecutorService.
+    // Synthetic access
+    @Nullable
+    @SuppressWarnings("WeakerAccess")
+    OutputTransform mImageProxyTransform;
+    // Synthetic access
+    @Nullable
+    @SuppressWarnings("WeakerAccess")
+    RectF mBrightestTile;
+
+    private final FileTransformFactory mFileTransformFactory =
+            new FileTransformFactory.Builder().build();
+
     private final ImageAnalysis.Analyzer mAnalyzer = new ImageAnalysis.Analyzer() {
 
         private final ImageProxyTransformFactory mImageProxyTransformFactory =
@@ -68,30 +108,35 @@
         @UseExperimental(markerClass = TransformExperimental.class)
         @SuppressWarnings("RestrictedApi")
         public void analyze(@NonNull ImageProxy imageProxy) {
-            // Find the tile to highlight.
-            RectF brightestTile = findBrightestTile(imageProxy);
+            // Find the brightest tile to highlight.
+            mBrightestTile = findBrightestTile(imageProxy);
+            mImageProxyTransform =
+                    mImageProxyTransformFactory.getOutputTransform(imageProxy);
+            imageProxy.close();
+
+            // Take a snapshot of the analyze result for thread safety.
+            final RectF brightestTile = new RectF(mBrightestTile);
+            final OutputTransform imageProxyTransform = mImageProxyTransform;
 
             // Calculate PreviewView transform on UI thread.
             mOverlayView.post(() -> {
                 // Calculate the transform.
-                try (ImageProxy imageToClose = imageProxy)  {
-                    OutputTransform previewViewTransform = mPreviewView.getOutputTransform();
-                    if (previewViewTransform == null) {
-                        // PreviewView transform info is not ready. No-op.
-                        return;
-                    }
-                    CoordinateTransform transform = new CoordinateTransform(
-                            mImageProxyTransformFactory.getOutputTransform(imageToClose),
-                            previewViewTransform);
-                    Matrix analysisToPreview = new Matrix();
-                    transform.getTransform(analysisToPreview);
-
-                    // Map the tile to PreviewView coordinates.
-                    analysisToPreview.mapRect(brightestTile);
-                    // Draw the tile on top of PreviewView.
-                    mOverlayView.setTileRect(brightestTile);
-                    mOverlayView.postInvalidate();
+                OutputTransform previewViewTransform = mPreviewView.getOutputTransform();
+                if (previewViewTransform == null) {
+                    // PreviewView transform info is not ready. No-op.
+                    return;
                 }
+                CoordinateTransform transform = new CoordinateTransform(
+                        imageProxyTransform,
+                        previewViewTransform);
+                Matrix analysisToPreview = new Matrix();
+                transform.getTransform(analysisToPreview);
+
+                // Map the tile to PreviewView coordinates.
+                analysisToPreview.mapRect(brightestTile);
+                // Draw the tile on top of PreviewView.
+                mOverlayView.setTileRect(brightestTile);
+                mOverlayView.postInvalidate();
             });
         }
     };
@@ -167,10 +212,79 @@
         mMirror = view.findViewById(R.id.mirror_preview);
         mMirror.setOnCheckedChangeListener((buttonView, isChecked) -> updateMirrorState());
 
+        mCameraToggle = view.findViewById(R.id.toggle_camera);
+        mCameraToggle.setOnCheckedChangeListener(
+                (buttonView, isChecked) -> updateCameraOrientation());
+
+        view.findViewById(R.id.capture).setOnClickListener(
+                v -> saveHighlightedFilePreservingExif());
+
         updateMirrorState();
+        updateCameraOrientation();
         return view;
     }
 
+    // Synthetic access
+    @SuppressWarnings("WeakerAccess")
+    void showToast(String message) {
+        requireActivity().runOnUiThread(
+                () -> Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show());
+    }
+
+    /**
+     * Takes a picture, highlights the brightest tile and saves it to MediaStore preserving Exif
+     * info.
+     */
+    private void saveHighlightedFilePreservingExif() {
+        // Create an internal temp file for drawing an overlay.
+        File tempFile;
+        try {
+            tempFile = File.createTempFile("camerax-view-test_transform-test", ".jpg");
+            tempFile.deleteOnExit();
+        } catch (IOException e) {
+            showToast("Failed to create temp file. " + e);
+            return;
+        }
+
+        // Take a picture.
+        ImageCapture.OutputFileOptions outputFileOptions =
+                new ImageCapture.OutputFileOptions.Builder(tempFile).build();
+        mCameraController.takePicture(outputFileOptions, mExecutorService,
+                new ImageCapture.OnImageSavedCallback() {
+                    @Override
+                    public void onImageSaved(
+                            @NonNull ImageCapture.OutputFileResults outputFileResults) {
+                        if (mImageProxyTransform == null || mBrightestTile == null) {
+                            Logger.d(TAG, "ImageAnalysis result not ready.");
+                            return;
+                        }
+                        try {
+                            RectF tileInFile = getBrightestTileInFile(
+                                    tempFile,
+                                    mImageProxyTransform,
+                                    mBrightestTile);
+                            // Load a mutable Bitmap.
+                            BitmapFactory.Options options = new BitmapFactory.Options();
+                            options.inMutable = true;
+                            Bitmap bitmap = BitmapFactory.decodeFile(tempFile.getAbsolutePath(),
+                                    options);
+                            drawRectOnBitmap(bitmap, tileInFile);
+                            saveBitmapToFilePreservingExif(tempFile, bitmap);
+                            insertFileToMediaStore(tempFile);
+                        } catch (IOException e) {
+                            showToast("Failed to draw on file. " + e);
+                            return;
+                        }
+                        showToast("Image saved.");
+                    }
+
+                    @Override
+                    public void onError(@NonNull ImageCaptureException exception) {
+                        showToast("Failed to capture image. " + exception);
+                    }
+                });
+    }
+
     private void updateMirrorState() {
         if (mMirror.isChecked()) {
             mPreviewView.setScaleX(-1);
@@ -179,6 +293,81 @@
         }
     }
 
+    private void updateCameraOrientation() {
+        if (mCameraToggle.isChecked()) {
+            mCameraController.setCameraSelector(CameraSelector.DEFAULT_BACK_CAMERA);
+        } else {
+            mCameraController.setCameraSelector(CameraSelector.DEFAULT_FRONT_CAMERA);
+        }
+    }
+
+    /**
+     * Saves the Bitmap to the given File while preserving the File's exif orientation.
+     */
+    void saveBitmapToFilePreservingExif(@NonNull File originalFile, @NonNull Bitmap bitmap)
+            throws IOException {
+        ExifInterface exifInterface = new ExifInterface(originalFile);
+        int orientation = exifInterface.getAttributeInt(
+                ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED);
+        try (OutputStream outputStream = new FileOutputStream(originalFile)) {
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
+        }
+        exifInterface = new ExifInterface(originalFile);
+        exifInterface.setAttribute(ExifInterface.TAG_ORIENTATION, String.valueOf(orientation));
+        exifInterface.saveAttributes();
+    }
+
+    void insertFileToMediaStore(@NonNull File file) throws IOException {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg");
+        ContentResolver contentResolver = requireContext().getContentResolver();
+        Uri uri = contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                contentValues);
+        try (OutputStream outputStream = contentResolver.openOutputStream(uri)) {
+            try (InputStream inputStream = new FileInputStream(file)) {
+                byte[] buf = new byte[1024];
+                int len;
+                while ((len = inputStream.read(buf)) > 0) {
+                    outputStream.write(buf, 0, len);
+                }
+            }
+        }
+    }
+
+    // Synthetic access
+    @SuppressWarnings("WeakerAccess")
+    void drawRectOnBitmap(@NonNull Bitmap bitmap, @NonNull RectF rectF) {
+        Paint paint = new Paint();
+        paint.setStyle(Paint.Style.STROKE);
+
+        Canvas canvas = new Canvas(bitmap);
+
+        // Draw a rect with black stroke and white glow so it's always visible regardless of
+        // background.
+        paint.setStrokeWidth(20);
+        paint.setColor(Color.WHITE);
+        canvas.drawRect(rectF, paint);
+
+        paint.setStrokeWidth(10);
+        paint.setColor(Color.BLACK);
+        canvas.drawRect(rectF, paint);
+    }
+
+    // Synthetic access
+    @SuppressWarnings("WeakerAccess")
+    @UseExperimental(markerClass = TransformExperimental.class)
+    RectF getBrightestTileInFile(@NonNull File file,
+            @NonNull OutputTransform imageProxyTransform,
+            @NonNull RectF imageProxyTile) throws IOException {
+        OutputTransform fileTransform = mFileTransformFactory.getOutputTransform(file);
+        CoordinateTransform transform = new CoordinateTransform(
+                imageProxyTransform, fileTransform);
+        Matrix matrix = new Matrix();
+        transform.getTransform(matrix);
+        matrix.mapRect(imageProxyTile);
+        return imageProxyTile;
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();

camera/integration-tests/viewtestapp/src/main/res/layout-land/transform_view.xml

diff --git a/camera/integration-tests/viewtestapp/src/main/res/layout-land/transform_view.xml b/camera/integration-tests/viewtestapp/src/main/res/layout-land/transform_view.xml
index f7f80f0..4098727 100644
--- a/camera/integration-tests/viewtestapp/src/main/res/layout-land/transform_view.xml
+++ b/camera/integration-tests/viewtestapp/src/main/res/layout-land/transform_view.xml
@@ -43,5 +43,17 @@
             android:textOff="@string/mirror_off"
             android:textOn="@string/mirror_on"
             android:checked="false"/>
+        <ToggleButton
+            android:id="@+id/toggle_camera"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textOff="@string/toggle_camera_front"
+            android:textOn="@string/toggle_camera_back"
+            android:checked="true"/>
+        <Button
+            android:id="@+id/capture"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/btn_capture"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

camera/integration-tests/viewtestapp/src/main/res/layout/transform_view.xml

diff --git a/camera/integration-tests/viewtestapp/src/main/res/layout/transform_view.xml b/camera/integration-tests/viewtestapp/src/main/res/layout/transform_view.xml
index 7c75d7f..94e7483 100644
--- a/camera/integration-tests/viewtestapp/src/main/res/layout/transform_view.xml
+++ b/camera/integration-tests/viewtestapp/src/main/res/layout/transform_view.xml
@@ -43,5 +43,17 @@
             android:textOff="@string/mirror_off"
             android:textOn="@string/mirror_on"
             android:checked="false"/>
+        <ToggleButton
+            android:id="@+id/toggle_camera"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textOff="@string/toggle_camera_front"
+            android:textOn="@string/toggle_camera_back"
+            android:checked="true"/>
+        <Button
+            android:id="@+id/capture"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/btn_capture"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

car/app/app-activity/build.gradle

diff --git a/car/app/app-activity/build.gradle b/car/app/app-activity/build.gradle
index 0e4edad..8db6fb3 100644
--- a/car/app/app-activity/build.gradle
+++ b/car/app/app-activity/build.gradle
@@ -55,8 +55,6 @@
 androidx {
     name = "Android for Cars App Library Activity Extension"
     type = LibraryType.PUBLISHED_LIBRARY
-    // Special pre-release version to exclude the app-activity module from the 1.0.0 release.
-    mavenVersion = LibraryVersions.CAR_APP_PRE_RELEASE
     mavenGroup = LibraryGroups.CAR_APP
     inceptionYear = "2021"
     description = "Activity rendering specific funationaltiy to build navigation, parking, and charging apps for cars"

car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IRendererCallback.aidl

diff --git a/car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IRendererCallback.aidl b/car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IRendererCallback.aidl
index 9a44a55..81b3b12 100644
--- a/car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IRendererCallback.aidl
+++ b/car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IRendererCallback.aidl
@@ -66,26 +66,5 @@
    *   remote {@code InputConnection} should occur
    */
   IProxyInputConnection onCreateInputConnection(in EditorInfo editorInfo) = 8;
-
-  /**
-   * Notifies of a rotary rotation.
-   *
-   * @param steps the number of rotation steps detected. Should be a positive number
-   * @param isClockwise true if the rotation direction is clockwise
-   */
-  void onRotate(int steps, boolean isClockwise) = 9;
-
-  /**
-   * Notifies of a nudge event.
-   *
-   * @param key the nudge key code. It can be {@code KEYCODE_DPAD_RIGHT}, {@code KEYCODE_DPAD_LEFT},
-   * {@code KEYCODE_DPAD_UP}, {@code KEYCODE_DPAD_DOWN}.
-   *
-   * @return true if handled successfully
-   */
-  boolean onNudge(int keyCode) = 10;
-
-  /** Will be called when rotary select is triggered. */
-  void onSelect() = 11;
 }
 

car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppActivity.java

diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppActivity.java b/car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppActivity.java
index 8b29ce1..7b2ba58 100644
--- a/car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppActivity.java
+++ b/car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppActivity.java
@@ -43,7 +43,6 @@
 import androidx.car.app.activity.renderer.IRendererService;
 import androidx.car.app.activity.renderer.surface.ISurfaceListener;
 import androidx.car.app.activity.renderer.surface.OnBackPressedListener;
-import androidx.car.app.activity.renderer.surface.RotaryEventCallback;
 import androidx.car.app.activity.renderer.surface.SurfaceHolderListener;
 import androidx.car.app.activity.renderer.surface.SurfaceWrapperProvider;
 import androidx.car.app.activity.renderer.surface.TemplateSurfaceView;
@@ -127,41 +126,6 @@
         public void registerRendererCallback(@NonNull IRendererCallback callback) {
             requireNonNull(callback);
             ThreadUtils.runOnMain(() -> {
-                mSurfaceView.registerRotaryEventCallback(new RotaryEventCallback() {
-                    @Override
-                    public void onRotate(int steps, boolean isClockwise) {
-                        try {
-                            callback.onRotate(steps, isClockwise);
-                        } catch (RemoteException e) {
-                            onServiceConnectionError("Failed to send rotary onRotate event to "
-                                    + "renderer: " + e.getMessage());
-                        }
-                    }
-
-                    @Override
-                    public boolean onNudge(int keyCode) {
-                        try {
-                            return callback.onNudge(keyCode);
-                        } catch (RemoteException e) {
-                            onServiceConnectionError("Failed to send rotary onNudge event to "
-                                    + "renderer: " + e.getMessage());
-                        }
-
-                        return false;
-                    }
-
-                    @Override
-                    public void onSelect() {
-                        try {
-                            callback.onSelect();
-                        } catch (RemoteException e) {
-                            onServiceConnectionError(
-                                    "Failed to send rotary onSelect event to renderer: "
-                                            + e.getMessage());
-                        }
-                    }
-                });
-
                 mSurfaceView.setOnCreateInputConnectionListener(editorInfo -> {
                     try {
                         return callback.onCreateInputConnection(editorInfo);
@@ -182,7 +146,6 @@
                                         + e.getMessage());
                     }
                 };
-                mSurfaceView.setOnBackPressedListener(mOnBackPressedListener);
                 mActivityLifecycleDelegate.registerRendererCallback(callback);
             });
         }
@@ -372,7 +335,8 @@
             //TODO("b/177083268: Multiple hosts support is not implemented")
         }
 
-        if (!bindService(rendererIntent, mServiceConnectionImpl, Context.BIND_AUTO_CREATE)) {
+        if (!bindService(rendererIntent, mServiceConnectionImpl,
+                Context.BIND_AUTO_CREATE | Context.BIND_INCLUDE_CAPABILITIES)) {
             onServiceConnectionError(
                     "Cannot bind to the renderer host with intent: " + rendererIntent);
         }

car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/rotary/FocusDispatcherView.java

diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/rotary/FocusDispatcherView.java b/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/rotary/FocusDispatcherView.java
deleted file mode 100644
index 0369f16..0000000
--- a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/rotary/FocusDispatcherView.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.car.app.activity.renderer.rotary;
-
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
-import androidx.car.app.activity.R;
-
-/**
- * A view to dispatch the focus to another view.
- *
- * Once focused, dispatches the focus to the focus target specified as app:focusTarget.
- *
- * @hide
- */
-@RestrictTo(LIBRARY)
-public final class FocusDispatcherView extends View {
-    private final int mFocusTargetId;
-
-    public FocusDispatcherView(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs, 0);
-        // This view is focusable, visible and enabled so it can take focus.
-        setFocusable(FOCUSABLE);
-        setVisibility(VISIBLE);
-        setEnabled(true);
-
-        // This view is always transparent.
-        setAlpha(0.0F);
-
-        // Prevent Android from drawing the default focus highlight for this view when it's focused.
-        setDefaultFocusHighlightEnabled(false);
-
-        // Get the focus target reference.
-        TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.FocusDispatcherView, 0,
-                0);
-        try {
-            mFocusTargetId = ta.getResourceId(R.styleable.FocusDispatcherView_focusTarget, 0);
-        } finally {
-            ta.recycle();
-        }
-    }
-
-    @Override
-    protected void onFocusChanged(boolean gainFocus, int direction,
-            @Nullable Rect previouslyFocusedRect) {
-        super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
-        if (gainFocus) {
-            // Need to query the focus view every time since it is not a child view and can be
-            // changed without our knowledge.
-            View targetView = getRootView().findViewById(mFocusTargetId);
-            if (targetView != null) {
-                targetView.requestFocus();
-            }
-        }
-    }
-}

car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/rotary/FocusParkingView.java

diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/rotary/FocusParkingView.java b/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/rotary/FocusParkingView.java
deleted file mode 100644
index 759a2b1..0000000
--- a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/rotary/FocusParkingView.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.car.app.activity.renderer.rotary;
-
-import static android.view.accessibility.AccessibilityNodeInfo.ACTION_FOCUS;
-
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
-
-/**
- * A transparent {@link View} that can take focus. It's used by the Rotary service to support rotary
- * controller navigation. It's also used to initialize the focus when in rotary mode.
- * <p>
- * To support the rotary controller, each {@link android.view.Window} must have a FocusParkingView
- * as the first focusable view in the view tree.
- * <p>
- * Android doesn't clear focus automatically when focus is set in another window. If we try to clear
- * focus in the previous window, Android will re-focus a view in that window, resulting in two
- * windows being focused simultaneously. Adding this view to each window can fix this issue. This
- * view is transparent and its default focus highlight is disabled, so it's invisible to the user no
- * matter whether it's focused or not. It can take focus so that RotaryService can "park" the focus
- * on it to remove the focus highlight.
- * <p>
- * If there is only one focus area in the current window, rotating the controller within the focus
- * area will cause RotaryService to move the focus around from the view on the right to the view on
- * the left or vice versa. Adding this view to each window can fix this issue. When RotaryService
- * finds out the focus target is a FocusParkingView, it will know a wrap-around is going to happen.
- * Then it will avoid the wrap-around by not moving focus.
- * <p>
- * To ensure the focus is initialized properly when there is a window change, the FocusParkingView
- * will not get focused when the framework wants to focus on it. Instead, it will try to find a
- * better focus target in the window and focus on the target. That said, the FocusParkingView can
- * still be focused in order to clear focus highlight in the window, such as when RotaryService
- * performs {@link android.view.accessibility.AccessibilityNodeInfo#ACTION_FOCUS} on the
- * FocusParkingView, or the window has lost focus.
- *
- * @hide
- */
-@RestrictTo(LIBRARY)
-public class FocusParkingView extends View {
-    /**
-     * This value should not change, even if the actual package containing this class is different
-     * as this value must match the value defined at
-     * <a href="https://android.googlesource.com/platform/packages/apps/Car/RotaryController/+/refs/heads/android11-release/src/com/android/car/rotary/Utils.java#46">Utils#FOCUS_PARKING_VIEW_CLASS_NAME</a>
-     */
-    private static final String FOCUS_PARKING_VIEW_LITE_CLASS_NAME =
-            "com.android.car.rotary.FocusParkingView";
-
-    /** Action performed on this view to hide the IME. */
-    private static final int ACTION_HIDE_IME = 0x08000000;
-
-    public FocusParkingView(@NonNull Context context) {
-        super(context);
-        init();
-    }
-
-    public FocusParkingView(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public FocusParkingView(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    public FocusParkingView(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr,
-            int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init();
-    }
-
-    private void init() {
-        // This view is focusable, visible and enabled so it can take focus.
-        setFocusable(View.FOCUSABLE);
-        setVisibility(VISIBLE);
-        setEnabled(true);
-
-        // This view is not clickable so it won't affect the app's behavior when the user clicks on
-        // it by accident.
-        setClickable(false);
-
-        // This view is always transparent.
-        setAlpha(0f);
-
-        // Prevent Android from drawing the default focus highlight for this view when it's focused.
-        setDefaultFocusHighlightEnabled(false);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        // This size of the view is always 1 x 1 pixel, no matter what value is set in the layout
-        // file (match_parent, wrap_content, 100dp, 0dp, etc). Small size is to ensure it has little
-        // impact on the layout, non-zero size is to ensure it can take focus.
-        setMeasuredDimension(1, 1);
-    }
-
-    @Override
-    public void onWindowFocusChanged(boolean hasWindowFocus) {
-        if (!hasWindowFocus) {
-            // We need to clear the focus highlight(by parking the focus on this view)
-            // once the current window goes to background. This can't be done by RotaryService
-            // because RotaryService sees the window as removed, thus can't perform any action
-            // (such as focus, clear focus) on the nodes in the window. So this view has to
-            // grab the focus proactively.
-            super.requestFocus(FOCUS_DOWN, null);
-        }
-        super.onWindowFocusChanged(hasWindowFocus);
-    }
-
-    @NonNull
-    @Override
-    public CharSequence getAccessibilityClassName() {
-        return FOCUS_PARKING_VIEW_LITE_CLASS_NAME;
-    }
-
-    @Override
-    public boolean performAccessibilityAction(int action, @Nullable Bundle arguments) {
-        switch (action) {
-            case ACTION_HIDE_IME:
-                InputMethodManager inputMethodManager =
-                        getContext().getSystemService(InputMethodManager.class);
-                return inputMethodManager.hideSoftInputFromWindow(getWindowToken(),
-                        /* flags= */ 0);
-            case ACTION_FOCUS:
-                // Don't leave this to View to handle as it will exit touch mode.
-                if (!hasFocus()) {
-                    return super.requestFocus(FOCUS_DOWN, null);
-                }
-                return false;
-        }
-        return super.performAccessibilityAction(action, arguments);
-    }
-}

car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/RotaryEventCallback.java

diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/RotaryEventCallback.java b/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/RotaryEventCallback.java
deleted file mode 100644
index 5bff6c1..0000000
--- a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/RotaryEventCallback.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.car.app.activity.renderer.surface;
-
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
-
-import androidx.annotation.RestrictTo;
-
-/**
- * Interface to receive rotary events.
- *
- * @hide
- */
-@RestrictTo(LIBRARY)
-public interface RotaryEventCallback {
-    /**
-     * Notifies of a rotary rotation.
-     *
-     * @param steps the number of rotation steps detected. Should be a positive number
-     * @param isClockwise true if the rotation direction is clockwise
-     */
-    void onRotate(int steps, boolean isClockwise);
-
-    /**
-     * Notifies of a nudge event.
-     *
-     * @param keyCode the nudge key code. It can be {@code KEYCODE_DPAD_RIGHT}, {@code
-     * KEYCODE_DPAD_LEFT}, {@code KEYCODE_DPAD_UP}, {@code KEYCODE_DPAD_DOWN}.
-     *
-     * @return true if handled successfully
-     */
-    boolean onNudge(int keyCode);
-
-    /** Will be called when rotary select is triggered. */
-    void onSelect();
-}

car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/TemplateSurfaceView.java

diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/TemplateSurfaceView.java b/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/TemplateSurfaceView.java
index 107598e..d9e8eba 100644
--- a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/TemplateSurfaceView.java
+++ b/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/TemplateSurfaceView.java
@@ -16,14 +16,6 @@
 
 package androidx.car.app.activity.renderer.surface;
 
-import static android.view.KeyEvent.ACTION_DOWN;
-import static android.view.KeyEvent.KEYCODE_BACK;
-import static android.view.KeyEvent.KEYCODE_DPAD_CENTER;
-import static android.view.KeyEvent.KEYCODE_DPAD_DOWN;
-import static android.view.KeyEvent.KEYCODE_DPAD_LEFT;
-import static android.view.KeyEvent.KEYCODE_DPAD_RIGHT;
-import static android.view.KeyEvent.KEYCODE_DPAD_UP;
-
 import static androidx.annotation.RestrictTo.Scope.LIBRARY;
 import static androidx.car.app.activity.LogTags.TAG;
 
@@ -38,16 +30,12 @@
 import android.os.RemoteException;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.SurfaceControlViewHost.SurfacePackage;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.ViewTreeObserver.OnTouchModeChangeListener;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
@@ -72,27 +60,8 @@
 public final class TemplateSurfaceView extends SurfaceView {
     private static final boolean SUPPORTS_SURFACE_CONTROL =
             VERSION.SDK_INT >= Build.VERSION_CODES.R;
-
-    /**
-     * StateDescription for a {@link View} to support direct manipulation mode. It's also used as
-     * class name of {@link AccessibilityEvent} to indicate that the {@link AccessibilityEvent}
-     * represents a request to toggle direct manipulation mode.
-     *
-     * This value should not change, even if the actual package containing this class is different
-     * as this value must match the value defined at
-     * <a href="https://android.googlesource.com/platform/packages/apps/Car/libs/+/refs/heads/androi
-     * d11-release/car-ui-lib/src/com/android/car/ui/utils/DirectManipulationHelper.java#38">DIRECT_
-     * MANIPULATION</a>
-     */
-    private static final String DIRECT_MANIPULATION = "com.android.car.ui.utils"
-            + ".DIRECT_MANIPULATION";
-
-    @Nullable
-    private RotaryEventCallback mRotaryEventCallback;
     @Nullable
     private OnCreateInputConnectionListener mOnCreateInputConnectionListener;
-    @Nullable
-    private OnBackPressedListener mOnBackPressedListener;
 
     @Nullable
     ISurfaceControl mSurfaceControl;
@@ -121,13 +90,6 @@
     }
 
     /**
-     * Registers a {@link RotaryEventCallback} that is notified of rotary events.
-     */
-    public void registerRotaryEventCallback(@Nullable RotaryEventCallback callback) {
-        mRotaryEventCallback = callback;
-    }
-
-    /**
      * Registers a {@link OnCreateInputConnectionListener} that is notified of invocations on
      * {@link #onCreateInputConnection(EditorInfo)}.
      */
@@ -137,13 +99,6 @@
     }
 
     /**
-     * Registers a {@link OnBackPressedListener} that is notified of back button presses.
-     */
-    public void setOnBackPressedListener(@Nullable OnBackPressedListener listener) {
-        mOnBackPressedListener = listener;
-    }
-
-    /**
      * Returns the surface token used to create a {@link android.view.SurfaceControlViewHost}, or
      * null if not available.
      */
@@ -157,16 +112,6 @@
     }
 
     @Override
-    @NonNull
-    public AccessibilityNodeInfo createAccessibilityNodeInfo() {
-        AccessibilityNodeInfo accessibilityNodeInfo = super.createAccessibilityNodeInfo();
-        // Indicate this as an editable view so the rotary service does not remove the focus when
-        // IME is presented.
-        accessibilityNodeInfo.setEditable(mIsInInputMode);
-        return accessibilityNodeInfo;
-    }
-
-    @Override
     protected void onFocusChanged(boolean gainFocus, int direction,
             @Nullable Rect previouslyFocusedRect) {
         super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
@@ -177,7 +122,6 @@
         } catch (RemoteException e) {
             Log.e(TAG, "Remote connection lost", e);
         }
-        enableDirectManipulationMode(this, gainFocus);
     }
 
     @Override
@@ -211,34 +155,6 @@
         return null;
     }
 
-    /**
-     * Enables or disables direct manipulation mode. This method sends an {@link AccessibilityEvent}
-     * to tell the Rotary service to enter or exit direct manipulation mode. Typically pressing
-     * the center button of the rotary controller with a direct manipulation view focused will
-     * enter direct manipulation mode, while pressing the Back button will exit direct
-     * manipulation mode.
-     *
-     * @param view   the direct manipulation view
-     * @param enable true to enter direct manipulation mode, false to exit direct manipulation mode
-     * @return whether the AccessibilityEvent was sent
-     */
-    private boolean enableDirectManipulationMode(@NonNull View view, boolean enable) {
-        requireNonNull(view);
-        AccessibilityManager accessibilityManager = (AccessibilityManager)
-                view.getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
-        if (accessibilityManager == null || !accessibilityManager.isEnabled()) {
-            return false;
-        }
-        AccessibilityEvent event = AccessibilityEvent.obtain();
-        event.setClassName(DIRECT_MANIPULATION);
-        event.setSource(view);
-        event.setEventType(enable
-                ? AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED
-                : AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);
-        accessibilityManager.sendAccessibilityEvent(event);
-        return true;
-    }
-
     private void copyEditorInfo(@NonNull EditorInfo from, @NonNull EditorInfo to) {
         requireNonNull(from);
         requireNonNull(to);
@@ -285,6 +201,12 @@
     }
 
     @Override
+    @NonNull
+    public CharSequence getAccessibilityClassName() {
+        return SurfaceView.class.getName();
+    }
+
+    @Override
     public boolean checkInputConnectionProxy(@Nullable View view) {
         return mIsInInputMode;
     }
@@ -330,8 +252,6 @@
         }
         mSurfaceControl = surfaceControl;
         setOnTouchListener((view, event) -> handleTouchEvent(event));
-        setOnKeyListener((view, keyCode, event) -> handleKeyEvent(event));
-        setOnGenericMotionListener((view, event) -> handleGenericMotionEvent(event));
     }
 
     @Override
@@ -362,59 +282,6 @@
         return false;
     }
 
-    /** Passes the generic motion events to the host. */
-    boolean handleGenericMotionEvent(@NonNull MotionEvent event) {
-        if (requireNonNull(event).getActionMasked() == MotionEvent.ACTION_SCROLL) {
-            int steps = (int) event.getAxisValue(MotionEvent.AXIS_SCROLL);
-            boolean isClockwise = steps > 0;
-            if (mRotaryEventCallback != null) {
-                mRotaryEventCallback.onRotate(steps, isClockwise);
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /** Passes the appropriate key events to the host for rotary support. */
-    boolean handleKeyEvent(KeyEvent event) {
-        if (event.getAction() == ACTION_DOWN) {
-            return false;
-        }
-
-        switch (event.getKeyCode()) {
-            case KEYCODE_BACK:
-                if (mOnBackPressedListener != null) {
-                    mOnBackPressedListener.onBackPressed();
-                    return true;
-                }
-                break;
-            case KEYCODE_DPAD_CENTER:
-                if (mRotaryEventCallback != null) {
-                    mRotaryEventCallback.onSelect();
-                    return true;
-                }
-                break;
-            case KEYCODE_DPAD_RIGHT:
-            case KEYCODE_DPAD_LEFT:
-            case KEYCODE_DPAD_UP:
-            case KEYCODE_DPAD_DOWN:
-                if (mRotaryEventCallback != null) {
-                    boolean success = mRotaryEventCallback.onNudge(event.getKeyCode());
-                    if (!success) {
-                        // Quit direct manipulation mode if the nudge event cannot be handled.
-                        enableDirectManipulationMode(this, false);
-                        return false;
-                    }
-                    return true;
-                }
-                break;
-            default:
-                return false;
-        }
-
-        return false;
-    }
-
     @RequiresApi(Build.VERSION_CODES.R)
     private static class Api30Impl {
         private Api30Impl() {

car/app/app-activity/src/main/res/layout/activity_template.xml

diff --git a/car/app/app-activity/src/main/res/layout/activity_template.xml b/car/app/app-activity/src/main/res/layout/activity_template.xml
index 14765a1..d461c2e 100644
--- a/car/app/app-activity/src/main/res/layout/activity_template.xml
+++ b/car/app/app-activity/src/main/res/layout/activity_template.xml
@@ -2,32 +2,10 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/fragment_container">
-  <androidx.car.app.activity.renderer.rotary.FocusParkingView
-      android:id="@+id/template_focus_parking"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
-    <!-- Since RotaryService can turn off the direct manipulation mode without
-        notifying the surface view, the focus dispatcher view is added to ensure
-        surface view can clear and regain focus when rotary rotation happens
-        while direct manipulation mode is turned off. This is necessary to
-        ensure SurfaceView does not stuck without having direction
-        manipulation while having focus.
-        Please note that SurfaceView should be surrounded by FocusDispatcherView
-        so the focus goes back to the SurfaceView as soon as it loses the focus.
-        This view must have a non-zero size to gain focus by the rotary
-        service. -->
-    <androidx.car.app.activity.renderer.rotary.FocusDispatcherView
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        app:focusTarget="@id/template_view_surface"/>
     <androidx.car.app.activity.renderer.surface.TemplateSurfaceView
         android:id="@+id/template_view_surface"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:focusable="true"
         android:focusableInTouchMode="true"/>
-    <androidx.car.app.activity.renderer.rotary.FocusDispatcherView
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        app:focusTarget="@id/template_view_surface"/>
 </merge>
\ No newline at end of file

car/app/app-activity/src/main/res/values/attrs.xml

diff --git a/car/app/app-activity/src/main/res/values/attrs.xml b/car/app/app-activity/src/main/res/values/attrs.xml
deleted file mode 100644
index 175b076..0000000
--- a/car/app/app-activity/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <declare-styleable name="FocusDispatcherView">
-    <!-- Points to the view that should gain the focus when FocusDispatcherView is focused. -->
-    <attr name="focusTarget" format="reference"/>
-  </declare-styleable>
-</resources>
\ No newline at end of file

car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppActivityTest.java

diff --git a/car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppActivityTest.java b/car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppActivityTest.java
index 254c005..f12729a 100644
--- a/car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppActivityTest.java
+++ b/car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppActivityTest.java
@@ -17,10 +17,6 @@
 package androidx.car.app.activity;
 
 import static android.view.KeyEvent.ACTION_UP;
-import static android.view.KeyEvent.KEYCODE_BACK;
-import static android.view.KeyEvent.KEYCODE_DPAD_CENTER;
-import static android.view.KeyEvent.KEYCODE_DPAD_DOWN;
-import static android.view.KeyEvent.KEYCODE_DPAD_RIGHT;
 import static android.view.KeyEvent.KEYCODE_R;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -28,7 +24,6 @@
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -278,26 +273,16 @@
                             Bundleable.create(new LegacySurfacePackage(callback)));
                     carAppActivity.registerRendererCallback(rendererCallback);
 
-                    // Verify back events on surfaceView are sent to host.
-                    activity.mSurfaceView.dispatchKeyEvent(new KeyEvent(ACTION_UP, KEYCODE_BACK));
+                    // Verify back events on the activity are sent to host.
+                    activity.onBackPressed();
                     verify(rendererCallback, times(1)).onBackPressed();
 
                     // Verify focus request sent to host.
-                    activity.mSurfaceView.requestFocus();
-                    verify(callback, times(1)).onWindowFocusChanged(true, false);
+                    assertThat(activity.mSurfaceView.isFocused()).isTrue();
                     activity.mSurfaceView.clearFocus();
                     verify(callback, times(1)).onWindowFocusChanged(false, false);
-
-                    // Verify rotary events on surfaceView are sent to host.
-                    activity.mSurfaceView.dispatchKeyEvent(
-                            new KeyEvent(ACTION_UP, KEYCODE_DPAD_RIGHT));
-                    verify(rendererCallback, times(1)).onNudge(KEYCODE_DPAD_RIGHT);
-                    activity.mSurfaceView.dispatchKeyEvent(
-                            new KeyEvent(ACTION_UP, KEYCODE_DPAD_DOWN));
-                    verify(rendererCallback, times(1)).onNudge(KEYCODE_DPAD_DOWN);
-                    activity.mSurfaceView.dispatchKeyEvent(
-                            new KeyEvent(ACTION_UP, KEYCODE_DPAD_CENTER));
-                    verify(rendererCallback, times(1)).onSelect();
+                    activity.mSurfaceView.requestFocus();
+                    verify(callback, times(1)).onWindowFocusChanged(true, false);
 
                     long downTime = SystemClock.uptimeMillis();
                     long eventTime = SystemClock.uptimeMillis();
@@ -314,12 +299,6 @@
                     // Compare string representations as equals in MotionEvent checks for same
                     // object.
                     assertThat(argument.getValue().toString()).isEqualTo(event.toString());
-
-                    // Test a action scroll event.
-                    event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_SCROLL, x,
-                            y, metaState);
-                    activity.mSurfaceView.dispatchGenericMotionEvent(event);
-                    verify(rendererCallback, times(1)).onRotate(anyInt(), eq(false));
                 } catch (RemoteException | BundlerException e) {
                     fail(Log.getStackTraceString(e));
                 }

car/app/app-testing/build.gradle

diff --git a/car/app/app-testing/build.gradle b/car/app/app-testing/build.gradle
index ddde19f7..ead574e 100644
--- a/car/app/app-testing/build.gradle
+++ b/car/app/app-testing/build.gradle
@@ -59,8 +59,6 @@
     name = "androidx.car.app:app-testing"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenGroup = LibraryGroups.CAR_APP
-    // Special pre-release version to exclude the app-aaos module from the 1.0.0 release.
-    mavenVersion = LibraryVersions.CAR_APP_PRE_RELEASE
     inceptionYear = "2021"
     description = "androidx.car.app:app-testing"
 }

car/app/app/api/public_plus_experimental_current.txt

diff --git a/car/app/app/api/public_plus_experimental_current.txt b/car/app/app/api/public_plus_experimental_current.txt
index 228fc69..c340f85 100644
--- a/car/app/app/api/public_plus_experimental_current.txt
+++ b/car/app/app/api/public_plus_experimental_current.txt
@@ -418,6 +418,23 @@
     method public androidx.car.app.model.ListTemplate.Builder setTitle(CharSequence);
   }
 
+  @androidx.car.app.annotations.ExperimentalCarApi @androidx.car.app.annotations.RequiresCarApi(2) public final class LongMessageTemplate implements androidx.car.app.model.Template {
+    method public androidx.car.app.model.ActionStrip? getActionStrip();
+    method public java.util.List<androidx.car.app.model.Action!> getActions();
+    method public androidx.car.app.model.Action? getHeaderAction();
+    method public androidx.car.app.model.CarText getMessage();
+    method public androidx.car.app.model.CarText? getTitle();
+  }
+
+  public static final class LongMessageTemplate.Builder {
+    ctor public LongMessageTemplate.Builder(CharSequence);
+    method public androidx.car.app.model.LongMessageTemplate.Builder addAction(androidx.car.app.model.Action);
+    method public androidx.car.app.model.LongMessageTemplate build();
+    method public androidx.car.app.model.LongMessageTemplate.Builder setActionStrip(androidx.car.app.model.ActionStrip);
+    method public androidx.car.app.model.LongMessageTemplate.Builder setHeaderAction(androidx.car.app.model.Action);
+    method public androidx.car.app.model.LongMessageTemplate.Builder setTitle(CharSequence);
+  }
+
   public final class MessageTemplate implements androidx.car.app.model.Template {
     method public java.util.List<androidx.car.app.model.Action!> getActions();
     method public androidx.car.app.model.CarText? getDebugMessage();
@@ -464,6 +481,14 @@
     method public void onClick();
   }
 
+  @androidx.car.app.annotations.ExperimentalCarApi @androidx.car.app.annotations.RequiresCarApi(2) public interface OnInputCompletedDelegate {
+    method public void sendInputCompleted(String, androidx.car.app.OnDoneCallback);
+  }
+
+  @androidx.car.app.annotations.ExperimentalCarApi @androidx.car.app.annotations.RequiresCarApi(2) public interface OnInputCompletedListener {
+    method public void onInputCompleted(String);
+  }
+
   public interface OnItemVisibilityChangedDelegate {
     method public void sendItemVisibilityChanged(int, int, androidx.car.app.OnDoneCallback);
   }
@@ -538,6 +563,7 @@
     method public androidx.car.app.model.PlaceListMapTemplate.Builder setItemList(androidx.car.app.model.ItemList);
     method public androidx.car.app.model.PlaceListMapTemplate.Builder setLoading(boolean);
     method public androidx.car.app.model.PlaceListMapTemplate.Builder setTitle(CharSequence);
+    method @androidx.car.app.annotations.ExperimentalCarApi public androidx.car.app.model.PlaceListMapTemplate.Builder setTitle(androidx.car.app.model.CarText);
   }
 
   public final class PlaceMarker {
@@ -672,11 +698,11 @@
 
   @androidx.car.app.annotations.ExperimentalCarApi @androidx.car.app.annotations.RequiresCarApi(2) public final class InputSignInMethod implements androidx.car.app.model.signin.SignInTemplate.SignInMethod {
     method public androidx.car.app.model.CarText? getDefaultValue();
+    method public androidx.car.app.model.CarText? getErrorMessage();
+    method public androidx.car.app.model.CarText? getHint();
     method public int getInputType();
     method public int getKeyboardType();
-    method public androidx.car.app.model.CarText? getMessage();
-    method public androidx.car.app.model.signin.OnInputCompletedDelegate getOnInputCompletedDelegate();
-    method public androidx.car.app.model.CarText? getPrompt();
+    method public androidx.car.app.model.OnInputCompletedDelegate getOnInputCompletedDelegate();
     method public boolean isShowKeyboardByDefault();
     field public static final int INPUT_TYPE_DEFAULT = 1; // 0x1
     field public static final int INPUT_TYPE_PASSWORD = 2; // 0x2
@@ -687,24 +713,16 @@
   }
 
   public static final class InputSignInMethod.Builder {
-    ctor public InputSignInMethod.Builder(androidx.car.app.model.signin.InputSignInMethod.OnInputCompletedListener);
+    ctor public InputSignInMethod.Builder(androidx.car.app.model.OnInputCompletedListener);
     method public androidx.car.app.model.signin.InputSignInMethod build();
     method public androidx.car.app.model.signin.InputSignInMethod.Builder setDefaultValue(String);
+    method public androidx.car.app.model.signin.InputSignInMethod.Builder setErrorMessage(CharSequence);
+    method public androidx.car.app.model.signin.InputSignInMethod.Builder setHint(CharSequence);
     method public androidx.car.app.model.signin.InputSignInMethod.Builder setInputType(int);
     method public androidx.car.app.model.signin.InputSignInMethod.Builder setKeyboardType(int);
-    method public androidx.car.app.model.signin.InputSignInMethod.Builder setMessage(CharSequence);
-    method public androidx.car.app.model.signin.InputSignInMethod.Builder setPrompt(CharSequence);
     method public androidx.car.app.model.signin.InputSignInMethod.Builder setShowKeyboardByDefault(boolean);
   }
 
-  public static interface InputSignInMethod.OnInputCompletedListener {
-    method public void onInputCompleted(String);
-  }
-
-  @androidx.car.app.annotations.ExperimentalCarApi @androidx.car.app.annotations.RequiresCarApi(2) public interface OnInputCompletedDelegate {
-    method public void sendInputCompleted(String, androidx.car.app.OnDoneCallback);
-  }
-
   @androidx.car.app.annotations.ExperimentalCarApi @androidx.car.app.annotations.RequiresCarApi(2) public final class PinSignInMethod implements androidx.car.app.model.signin.SignInTemplate.SignInMethod {
     method public String getPin();
   }
@@ -731,6 +749,7 @@
     method public androidx.car.app.model.CarText? getInstructions();
     method public androidx.car.app.model.signin.SignInTemplate.SignInMethod getSignInMethod();
     method public androidx.car.app.model.CarText? getTitle();
+    method public boolean isLoading();
   }
 
   public static final class SignInTemplate.Builder {
@@ -741,6 +760,7 @@
     method public androidx.car.app.model.signin.SignInTemplate.Builder setAdditionalText(CharSequence);
     method public androidx.car.app.model.signin.SignInTemplate.Builder setHeaderAction(androidx.car.app.model.Action);
     method public androidx.car.app.model.signin.SignInTemplate.Builder setInstructions(CharSequence);
+    method public androidx.car.app.model.signin.SignInTemplate.Builder setLoading(boolean);
     method public androidx.car.app.model.signin.SignInTemplate.Builder setTitle(CharSequence);
   }
 
@@ -924,6 +944,7 @@
     method public androidx.car.app.navigation.model.PlaceListNavigationTemplate.Builder setItemList(androidx.car.app.model.ItemList);
     method public androidx.car.app.navigation.model.PlaceListNavigationTemplate.Builder setLoading(boolean);
     method public androidx.car.app.navigation.model.PlaceListNavigationTemplate.Builder setTitle(CharSequence);
+    method @androidx.car.app.annotations.ExperimentalCarApi public androidx.car.app.navigation.model.PlaceListNavigationTemplate.Builder setTitle(androidx.car.app.model.CarText);
   }
 
   public final class RoutePreviewNavigationTemplate implements androidx.car.app.model.Template {
@@ -944,6 +965,7 @@
     method public androidx.car.app.navigation.model.RoutePreviewNavigationTemplate.Builder setLoading(boolean);
     method public androidx.car.app.navigation.model.RoutePreviewNavigationTemplate.Builder setNavigateAction(androidx.car.app.model.Action);
     method public androidx.car.app.navigation.model.RoutePreviewNavigationTemplate.Builder setTitle(CharSequence);
+    method @androidx.car.app.annotations.ExperimentalCarApi public androidx.car.app.navigation.model.RoutePreviewNavigationTemplate.Builder setTitle(androidx.car.app.model.CarText);
   }
 
   public final class RoutingInfo implements androidx.car.app.navigation.model.NavigationTemplate.NavigationInfo {

car/app/app/src/main/aidl/androidx/car/app/model/IOnInputCompletedListener.aidl

diff --git a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl b/car/app/app/src/main/aidl/androidx/car/app/model/IOnInputCompletedListener.aidl
similarity index 95%
rename from car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
rename to car/app/app/src/main/aidl/androidx/car/app/model/IOnInputCompletedListener.aidl
index e022dc3..632f921 100644
--- a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
+++ b/car/app/app/src/main/aidl/androidx/car/app/model/IOnInputCompletedListener.aidl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.car.app.model.signin;
+package androidx.car.app.model;
 
 import androidx.car.app.IOnDoneCallback;
 

car/app/app/src/main/java/androidx/car/app/AppInfo.java

diff --git a/car/app/app/src/main/java/androidx/car/app/AppInfo.java b/car/app/app/src/main/java/androidx/car/app/AppInfo.java
index 59d2609..44e9f96 100644
--- a/car/app/app/src/main/java/androidx/car/app/AppInfo.java
+++ b/car/app/app/src/main/java/androidx/car/app/AppInfo.java
@@ -58,7 +58,7 @@
  */
 public final class AppInfo {
     // TODO(b/174803562): Automatically update the this version using Gradle
-    private static final String LIBRARY_VERSION = "1.0.0-beta02";
+    private static final String LIBRARY_VERSION = "1.1.0-alpha01";
 
     /** @hide */
     @RestrictTo(Scope.LIBRARY)

car/app/app/src/main/java/androidx/car/app/model/Action.java

diff --git a/car/app/app/src/main/java/androidx/car/app/model/Action.java b/car/app/app/src/main/java/androidx/car/app/model/Action.java
index 84347e7..44866f6 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/Action.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/Action.java
@@ -18,7 +18,7 @@
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY;
 import static androidx.car.app.model.CarColor.DEFAULT;
-import static androidx.car.app.model.constraints.CarColorConstraints.STANDARD_ONLY;
+import static androidx.car.app.model.constraints.CarColorConstraints.UNCONSTRAINED;
 
 import static java.util.Objects.requireNonNull;
 
@@ -282,7 +282,9 @@
         /**
          * Sets the title to display in the action.
          *
-         * <p>Spans are not supported in the input string.
+         * <p>{@link ForegroundCarColorSpan}s are supported in the input string. See the
+         * documentation on where the {@link Action} is added for more details on any
+         * other restriction(s) that might apply.
          *
          * @throws NullPointerException if {@code title} is {@code null}
          * @see CarText
@@ -296,7 +298,9 @@
         /**
          * Sets the title to display in the action.
          *
-         * <p>Spans are not supported in the input string.
+         * <p>{@link ForegroundCarColorSpan}s are supported in the input string. See the
+         * documentation on where the {@link Action} is added for more details on any
+         * other restriction(s) that might apply.
          *
          * @throws NullPointerException if {@code title} is {@code null}
          * @see CarText
@@ -354,19 +358,16 @@
          * <h4>Requirements</h4>
          *
          * <p>The host may ignore this color and use the default instead if the color does not
-         * pass the contrast requirements.
-         *
-         * <p>Note the color of the text cannot be specified. Host implementations may pick the
-         * dark or light versions of the given background color as needed.
+         * pass the contrast requirements. See the documentation on where the {@link Action} is
+         * added for more details on any other restriction(s) that might apply.
          *
          * @param backgroundColor the {@link CarColor} to set as background. Use {@link
          *                        CarColor#DEFAULT} to let the host pick a default
-         * @throws IllegalArgumentException if {@code backgroundColor} is not a standard color
          * @throws NullPointerException     if {@code backgroundColor} is {@code null}
          */
         @NonNull
         public Builder setBackgroundColor(@NonNull CarColor backgroundColor) {
-            STANDARD_ONLY.validateOrThrow(requireNonNull(backgroundColor));
+            UNCONSTRAINED.validateOrThrow(requireNonNull(backgroundColor));
             mBackgroundColor = backgroundColor;
             return this;
         }

car/app/app/src/main/java/androidx/car/app/model/ActionStrip.java

diff --git a/car/app/app/src/main/java/androidx/car/app/model/ActionStrip.java b/car/app/app/src/main/java/androidx/car/app/model/ActionStrip.java
index b28bc58..fc50fbf 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/ActionStrip.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/ActionStrip.java
@@ -114,6 +114,9 @@
         /**
          * Adds an {@link Action} to the list.
          *
+         * <p>Background colors are not supported on an action inside an {@link ActionStrip}, and
+         * any spans set in the action's title will be ignored.
+         *
          * @throws IllegalArgumentException if the background color of the action is specified,
          *                                  or if {@code action} is a standard action and an
          *                                  action of the same type has already been added

car/app/app/src/main/java/androidx/car/app/model/LongMessageTemplate.java

diff --git a/car/app/app/src/main/java/androidx/car/app/model/LongMessageTemplate.java b/car/app/app/src/main/java/androidx/car/app/model/LongMessageTemplate.java
new file mode 100644
index 0000000..750a119
--- /dev/null
+++ b/car/app/app/src/main/java/androidx/car/app/model/LongMessageTemplate.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.car.app.model;
+
+import static androidx.car.app.model.constraints.ActionsConstraints.ACTIONS_CONSTRAINTS_HEADER;
+import static androidx.car.app.model.constraints.ActionsConstraints.ACTIONS_CONSTRAINTS_SIMPLE;
+
+import static java.util.Objects.requireNonNull;
+
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.car.app.annotations.ExperimentalCarApi;
+import androidx.car.app.annotations.RequiresCarApi;
+import androidx.car.app.utils.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A template for displaying a long text, which could be several paragraphs long, with associated
+ * actions.
+ *
+ * <h4>Template Restrictions</h4>
+ *
+ * This template's body is only available while the car is parked. While driving the text and the
+ * actions will be disabled.
+ */
+@ExperimentalCarApi
+@RequiresCarApi(2)
+public final class LongMessageTemplate implements Template {
+
+    @Keep
+    @Nullable
+    private final CarText mTitle;
+    @Keep
+    @Nullable
+    private final CarText mMessage;
+    @Keep
+    @Nullable
+    private final Action mHeaderAction;
+    @Keep
+    private final List<Action> mActionList;
+    @Keep
+    @Nullable
+    private final ActionStrip mActionStrip;
+
+    /**
+     * Returns the title of the template or {@code null} if not set.
+     *
+     * @see Builder#setTitle(CharSequence)
+     */
+    @Nullable
+    public CarText getTitle() {
+        return mTitle;
+    }
+
+    /**
+     * Returns the {@link Action} that is set to be displayed in the header of the template, or
+     * {@code null} if not set.
+     *
+     * @see Builder#setHeaderAction(Action)
+     */
+    @Nullable
+    public Action getHeaderAction() {
+        return mHeaderAction;
+    }
+
+    /**
+     * Returns the {@link ActionStrip} for this template or {@code null} if not set.
+     *
+     * @see Builder#setActionStrip(ActionStrip)
+     */
+    @Nullable
+    public ActionStrip getActionStrip() {
+        return mActionStrip;
+    }
+
+    /**
+     * Returns the message to display in the template, which could be several paragraphs long.
+     *
+     * @see Builder#Builder(CharSequence)
+     */
+    @NonNull
+    public CarText getMessage() {
+        return requireNonNull(mMessage);
+    }
+
+    /**
+     * Returns the list of actions to display in the template.
+     *
+     * @see Builder#addAction(Action)
+     */
+    @NonNull
+    public List<Action> getActions() {
+        return CollectionUtils.emptyIfNull(mActionList);
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "LongMessageTemplate";
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(mTitle, mMessage, mHeaderAction, mActionList, mActionStrip);
+    }
+
+    @Override
+    public boolean equals(@Nullable Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (!(other instanceof LongMessageTemplate)) {
+            return false;
+        }
+        LongMessageTemplate otherTemplate = (LongMessageTemplate) other;
+
+        return Objects.equals(mTitle, otherTemplate.mTitle)
+                && Objects.equals(mMessage, otherTemplate.mMessage)
+                && Objects.equals(mHeaderAction, otherTemplate.mHeaderAction)
+                && Objects.equals(mActionList, otherTemplate.mActionList)
+                && Objects.equals(mActionStrip, otherTemplate.mActionStrip);
+    }
+
+    LongMessageTemplate(Builder builder) {
+        mTitle = builder.mTitle;
+        mMessage = builder.mMessage;
+        mActionStrip = builder.mActionStrip;
+        mHeaderAction = builder.mHeaderAction;
+        mActionList = CollectionUtils.unmodifiableCopy(builder.mActionList);
+    }
+
+    /** Constructs an empty instance, used by serialization code. */
+    private LongMessageTemplate() {
+        mTitle = null;
+        mMessage = null;
+        mActionStrip = null;
+        mHeaderAction = null;
+        mActionList = Collections.emptyList();
+    }
+
+    /** A builder of {@link LongMessageTemplate}. */
+    public static final class Builder {
+        @Nullable
+        CarText mTitle;
+        final CarText mMessage;
+        @Nullable
+        ActionStrip mActionStrip;
+        @Nullable
+        Action mHeaderAction;
+        List<Action> mActionList = new ArrayList<>();
+
+        /**
+         * Sets the title of the template.
+         *
+         * <p>Unless set with this method, the template will not have a title.
+         *
+         * <p>Spans are not supported in the input string.
+         *
+         * @throws NullPointerException if {@code title} is {@code null}
+         * @see CarText
+         */
+        @NonNull
+        public Builder setTitle(@NonNull CharSequence title) {
+            mTitle = CarText.create(requireNonNull(title));
+            return this;
+        }
+
+        /**
+         * Sets the {@link Action} that will be displayed in the header of the template.
+         *
+         * <p>Unless set with this method, the template will not have a header action.
+         *
+         * <h4>Requirements</h4>
+         *
+         * This template only supports either one of {@link Action#APP_ICON} and
+         * {@link Action#BACK} as a header {@link Action}.
+         *
+         * @throws IllegalArgumentException if {@code headerAction} does not meet the template's
+         *                                  requirements
+         * @throws NullPointerException     if {@code headerAction} is {@code null}
+         */
+        @NonNull
+        public Builder setHeaderAction(@NonNull Action headerAction) {
+            ACTIONS_CONSTRAINTS_HEADER.validateOrThrow(
+                    Collections.singletonList(requireNonNull(headerAction)));
+            mHeaderAction = headerAction;
+            return this;
+        }
+
+        /**
+         * Sets the {@link ActionStrip} for this template or {@code null} to not display an {@link
+         * ActionStrip}.
+         *
+         * <p>Unless set with this method, the template will not have an action strip.
+         *
+         * <h4>Requirements</h4>
+         *
+         * This template allows up to 2 {@link Action}s in its {@link ActionStrip}. Of the 2 allowed
+         * {@link Action}s, one of them can contain a title as set via
+         * {@link Action.Builder#setTitle}. Otherwise, only {@link Action}s with icons are allowed.
+         *
+         * @throws IllegalArgumentException if {@code actionStrip} does not meet the requirements
+         * @throws NullPointerException     if {@code actionStrip} is {@code null}
+         */
+        @NonNull
+        public Builder setActionStrip(@NonNull ActionStrip actionStrip) {
+            ACTIONS_CONSTRAINTS_SIMPLE.validateOrThrow(requireNonNull(actionStrip).getActions());
+            mActionStrip = actionStrip;
+            return this;
+        }
+
+        /**
+         * Adds an {@link Action} to display along with the message.
+         *
+         * <h4>Requirements</h4>
+         *
+         * Any actions above the maximum limit of 2 will be ignored. These {@link Action}s will
+         * only be available while the car is parked.
+         *
+         * @throws NullPointerException if {@code action} is {@code null}
+         */
+        @NonNull
+        public Builder addAction(@NonNull Action action) {
+            requireNonNull(action);
+            mActionList.add(action);
+            return this;
+        }
+
+        /**
+         * Constructs the {@link LongMessageTemplate} defined by this builder.
+         *
+         * <h4>Requirements</h4>
+         *
+         * A non-empty message must be set on the template.
+         *
+         * <p>Either a header {@link Action} or title must be set on the template.
+         *
+         * @throws IllegalStateException if the message is empty, or if the template does not have
+         *                               either a title or header {@link Action} set
+         */
+        @NonNull
+        public LongMessageTemplate build() {
+            if (mMessage.isEmpty()) {
+                throw new IllegalStateException("Message cannot be empty");
+            }
+
+            if (CarText.isNullOrEmpty(mTitle) && mHeaderAction == null) {
+                throw new IllegalStateException("Either the title or header action must be set");
+            }
+
+            return new LongMessageTemplate(this);
+        }
+
+        /**
+         * Returns a {@link Builder} instance.
+         *
+         * @param message the text message to display in the template. This message will only be
+         *                displayed when the car is parked.
+         *
+         * @throws NullPointerException if the {@code message} is {@code null}
+         */
+        public Builder(@NonNull CharSequence message) {
+            mMessage = CarText.create(requireNonNull(message));
+        }
+    }
+}

car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedDelegate.java

diff --git a/car/app/app/src/main/java/androidx/car/app/model/signin/OnInputCompletedDelegate.java b/car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedDelegate.java
similarity index 97%
rename from car/app/app/src/main/java/androidx/car/app/model/signin/OnInputCompletedDelegate.java
rename to car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedDelegate.java
index 73bf42a..4fcb34d 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/signin/OnInputCompletedDelegate.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.car.app.model.signin;
+package androidx.car.app.model;
 
 import android.annotation.SuppressLint;
 

car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedDelegateImpl.java

diff --git a/car/app/app/src/main/java/androidx/car/app/model/signin/OnInputCompletedDelegateImpl.java b/car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedDelegateImpl.java
similarity index 93%
rename from car/app/app/src/main/java/androidx/car/app/model/signin/OnInputCompletedDelegateImpl.java
rename to car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedDelegateImpl.java
index d9d5141..50b85ad 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/signin/OnInputCompletedDelegateImpl.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedDelegateImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.car.app.model.signin;
+package androidx.car.app.model;
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY;
 
@@ -30,7 +30,6 @@
 import androidx.car.app.IOnDoneCallback;
 import androidx.car.app.OnDoneCallback;
 import androidx.car.app.annotations.ExperimentalCarApi;
-import androidx.car.app.model.signin.InputSignInMethod.OnInputCompletedListener;
 import androidx.car.app.utils.RemoteUtils;
 
 /**
@@ -57,10 +56,11 @@
         }
     }
 
+    /** Creates an instance of {@link OnInputCompletedDelegateImpl}. */
     // This mirrors the AIDL class and is not supposed to support an executor as an input.
     @SuppressLint("ExecutorRegistration")
     @NonNull
-    static OnInputCompletedDelegate create(@NonNull OnInputCompletedListener listener) {
+    public static OnInputCompletedDelegate create(@NonNull OnInputCompletedListener listener) {
         return new OnInputCompletedDelegateImpl(requireNonNull(listener));
     }
 

car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedListener.java

diff --git a/car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedListener.java b/car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedListener.java
new file mode 100644
index 0000000..7435ac9
--- /dev/null
+++ b/car/app/app/src/main/java/androidx/car/app/model/OnInputCompletedListener.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.car.app.model;
+
+import androidx.annotation.NonNull;
+import androidx.car.app.annotations.ExperimentalCarApi;
+import androidx.car.app.annotations.RequiresCarApi;
+
+/** A listener for handling text input completion event. */
+@ExperimentalCarApi
+@RequiresCarApi(2)
+public interface OnInputCompletedListener {
+    /**
+     * Notifies when the user finished entering text in an input box.
+     *
+     * <p>This event is sent when the user finishes typing in the keyboard and pressed enter.
+     * If the user simply stops typing and closes the keyboard, this event will not be sent.
+     *
+     * @param text the text that was entered, or an empty string if no text was typed.
+     */
+    void onInputCompleted(@NonNull String text);
+}

car/app/app/src/main/java/androidx/car/app/model/PlaceListMapTemplate.java

diff --git a/car/app/app/src/main/java/androidx/car/app/model/PlaceListMapTemplate.java b/car/app/app/src/main/java/androidx/car/app/model/PlaceListMapTemplate.java
index 8737c88..3cab875 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/PlaceListMapTemplate.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/PlaceListMapTemplate.java
@@ -25,6 +25,7 @@
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.car.app.annotations.ExperimentalCarApi;
 
 import java.util.Collections;
 import java.util.List;
@@ -258,8 +259,6 @@
         /**
          * Sets the title of the template.
          *
-         * <p>Unless set with this method, the template will not have a title.
-         *
          * <p>Spans are not supported in the input string.
          *
          * @throws NullPointerException if {@code title} is {@code null}
@@ -272,6 +271,21 @@
         }
 
         /**
+         * Sets the title of the template.
+         *
+         * <p>Spans are not supported in the input string.
+         *
+         * @throws NullPointerException if {@code title} is {@code null}
+         * @see CarText
+         */
+        @ExperimentalCarApi
+        @NonNull
+        public Builder setTitle(@NonNull CarText title) {
+            mTitle = requireNonNull(title);
+            return this;
+        }
+
+        /**
          * Sets an {@link ItemList} to show in a list view along with the map.
          *
          * <p>Unless set with this method, the template will not show an item list.

car/app/app/src/main/java/androidx/car/app/model/signin/InputSignInMethod.java

diff --git a/car/app/app/src/main/java/androidx/car/app/model/signin/InputSignInMethod.java b/car/app/app/src/main/java/androidx/car/app/model/signin/InputSignInMethod.java
index bb20597..aea8f80 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/signin/InputSignInMethod.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/signin/InputSignInMethod.java
@@ -31,6 +31,9 @@
 import androidx.car.app.annotations.ExperimentalCarApi;
 import androidx.car.app.annotations.RequiresCarApi;
 import androidx.car.app.model.CarText;
+import androidx.car.app.model.OnInputCompletedDelegate;
+import androidx.car.app.model.OnInputCompletedDelegateImpl;
+import androidx.car.app.model.OnInputCompletedListener;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -45,19 +48,6 @@
 @ExperimentalCarApi
 @RequiresCarApi(2)
 public final class InputSignInMethod implements SignInTemplate.SignInMethod {
-    /** A listener for handling text input completion event. */
-    public interface OnInputCompletedListener {
-        /**
-         * Notifies when the user finished entering text in an input box.
-         *
-         * <p>This event is sent when the user finishes typing in the keyboard and pressed enter.
-         * If the user simply stops typing and closes the keyboard, this event will not be sent.
-         *
-         * @param text the text that was entered, or an empty string if no text was typed.
-         */
-        void onInputCompleted(@NonNull String text);
-    }
-
     /**
      * The type of input represented by the {@link InputSignInMethod} instance.
      *
@@ -122,7 +112,7 @@
 
     @Keep
     @Nullable
-    private final CarText mPrompt;
+    private final CarText mHint;
     @Keep
     @Nullable
     private final CarText mDefaultValue;
@@ -131,7 +121,7 @@
     private final int mInputType;
     @Keep
     @Nullable
-    private final CarText mMessage;
+    private final CarText mErrorMessage;
     @Keep
     @KeyboardType
     private final int mKeyboardType;
@@ -143,13 +133,13 @@
 
     /**
      * Returns the text explaining to the user what should be entered in this input box or
-     * {@code null} if no prompt is provided.
+     * {@code null} if no hint is provided.
      *
-     * @see Builder#setPrompt(CharSequence)
+     * @see Builder#setHint(CharSequence)
      */
     @Nullable
-    public CarText getPrompt() {
-        return mPrompt;
+    public CarText getHint() {
+        return mHint;
     }
 
     /**
@@ -174,16 +164,16 @@
     }
 
     /**
-     * Returns a message associated with the user input.
+     * Returns an error message associated with the user input.
      *
      * <p>For example, this can be used to indicate formatting errors, wrong username or
-     * password, or any other situation related to the user input.
+     * password, or any other problem related to the user input.
      *
-     * @see Builder#setMessage(CharSequence)
+     * @see Builder#setErrorMessage(CharSequence)
      */
     @Nullable
-    public CarText getMessage() {
-        return mMessage;
+    public CarText getErrorMessage() {
+        return mErrorMessage;
     }
 
     /**
@@ -234,22 +224,22 @@
         return mInputType == that.mInputType
                 && mKeyboardType == that.mKeyboardType
                 && mShowKeyboardByDefault == that.mShowKeyboardByDefault
-                && Objects.equals(mPrompt, that.mPrompt)
+                && Objects.equals(mHint, that.mHint)
                 && Objects.equals(mDefaultValue, that.mDefaultValue)
-                && Objects.equals(mMessage, that.mMessage);
+                && Objects.equals(mErrorMessage, that.mErrorMessage);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(mPrompt, mDefaultValue, mInputType, mMessage, mKeyboardType,
+        return Objects.hash(mHint, mDefaultValue, mInputType, mErrorMessage, mKeyboardType,
                 mShowKeyboardByDefault);
     }
 
     InputSignInMethod(Builder builder) {
-        mPrompt = builder.mPrompt;
+        mHint = builder.mHint;
         mDefaultValue = builder.mDefaultValue;
         mInputType = builder.mInputType;
-        mMessage = builder.mMessage;
+        mErrorMessage = builder.mErrorMessage;
         mKeyboardType = builder.mKeyboardType;
         mOnInputCompletedDelegate = builder.mOnInputCompletedDelegate;
         mShowKeyboardByDefault = builder.mShowKeyboardByDefault;
@@ -257,10 +247,10 @@
 
     /** Constructs an empty instance, used by serialization code. */
     private InputSignInMethod() {
-        mPrompt = null;
+        mHint = null;
         mDefaultValue = null;
         mInputType = INPUT_TYPE_DEFAULT;
-        mMessage = null;
+        mErrorMessage = null;
         mKeyboardType = KEYBOARD_DEFAULT;
         mOnInputCompletedDelegate = null;
         mShowKeyboardByDefault = false;
@@ -270,28 +260,28 @@
     public static final class Builder {
         final OnInputCompletedDelegate mOnInputCompletedDelegate;
         @Nullable
-        CarText mPrompt;
+        CarText mHint;
         @Nullable
         CarText mDefaultValue;
         int mInputType = INPUT_TYPE_DEFAULT;
         @Nullable
-        CarText mMessage;
+        CarText mErrorMessage;
         int mKeyboardType = KEYBOARD_DEFAULT;
         boolean mShowKeyboardByDefault;
 
         /**
          * Sets the text explaining to the user what should be entered in this input box.
          *
-         * <p>Unless set with this method, the sign-in method will not show any prompt.
+         * <p>Unless set with this method, the sign-in method will not show any hint.
          *
          * <p>Spans are supported in the input string.
          *
-         * @throws NullPointerException if {@code prompt} is {@code null}
+         * @throws NullPointerException if {@code hint} is {@code null}
          */
         // TODO(b/181569051): document supported span types.
         @NonNull
-        public Builder setPrompt(@NonNull CharSequence instructions) {
-            mPrompt = CarText.create(requireNonNull(instructions));
+        public Builder setHint(@NonNull CharSequence hint) {
+            mHint = CarText.create(requireNonNull(hint));
             return this;
         }
 
@@ -330,24 +320,23 @@
         }
 
         /**
-         * Sets the message associated with this input box.
+         * Sets the error message associated with this input box.
          *
          * <p>For example, this can be used to indicate formatting errors, wrong username or
-         * password or any other situation related to the user input.
+         * password or any other problem related to the user input.
          *
          * <h4>Requirements</h4>
          *
-         * Messages can have only up to 2 lines of text, amd additional texts beyond the
+         * Error messages can have only up to 2 lines of text, amd additional texts beyond the
          * second line may be truncated.
          *
-         * <p>Spans are supported in the input string.
+         * <p>Spans are not supported in the input string.
          *
          * @throws NullPointerException if {@code message} is {@code null}
          */
-        // TODO(b/181569051): document supported span types.
         @NonNull
-        public Builder setMessage(@NonNull CharSequence message) {
-            mMessage = CarText.create(requireNonNull(message));
+        public Builder setErrorMessage(@NonNull CharSequence message) {
+            mErrorMessage = CarText.create(requireNonNull(message));
             return this;
         }
 

car/app/app/src/main/java/androidx/car/app/model/signin/SignInTemplate.java

diff --git a/car/app/app/src/main/java/androidx/car/app/model/signin/SignInTemplate.java b/car/app/app/src/main/java/androidx/car/app/model/signin/SignInTemplate.java
index 1af381d..fb9e367 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/signin/SignInTemplate.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/signin/SignInTemplate.java
@@ -52,7 +52,7 @@
  * This template is considered a refresh of a previous one if:
  *
  * <ul>
- *   <li>The template title and the sign-in method have not changed.
+ *   <li>The template's header, sign-in method, instructions and additional text have not changed.
  * </ul>
  *
  * @see Screen#onGetTemplate()
@@ -69,6 +69,8 @@
     private static final int MAX_ACTIONS_ALLOWED = 2;
 
     @Keep
+    private final boolean mIsLoading;
+    @Keep
     @Nullable
     private final Action mHeaderAction;
     @Keep
@@ -90,6 +92,15 @@
     private final SignInMethod mSignInMethod;
 
     /**
+     * Returns whether the template is loading.
+     *
+     * @see Builder#setLoading(boolean)
+     */
+    public boolean isLoading() {
+        return mIsLoading;
+    }
+
+    /**
      * Returns the title of the template or {@code null} if not set.
      *
      * @see Builder#setTitle(CharSequence)
@@ -173,7 +184,8 @@
         }
 
         SignInTemplate that = (SignInTemplate) other;
-        return Objects.equals(mHeaderAction, that.mHeaderAction)
+        return mIsLoading == that.mIsLoading
+                && Objects.equals(mHeaderAction, that.mHeaderAction)
                 && Objects.equals(mTitle, that.mTitle)
                 && Objects.equals(mInstructions, that.mInstructions)
                 && Objects.equals(mAdditionalText, that.mAdditionalText)
@@ -185,6 +197,7 @@
     @Override
     public int hashCode() {
         return Objects.hash(
+                mIsLoading,
                 mHeaderAction,
                 mTitle,
                 mInstructions,
@@ -201,6 +214,7 @@
     }
 
     SignInTemplate(Builder builder) {
+        mIsLoading = builder.mIsLoading;
         mHeaderAction = builder.mHeaderAction;
         mTitle = builder.mTitle;
         mInstructions = builder.mInstructions;
@@ -212,6 +226,7 @@
 
     /** Constructs an empty instance, used by serialization code. */
     private SignInTemplate() {
+        mIsLoading = false;
         mHeaderAction = null;
         mTitle = null;
         mInstructions = null;
@@ -223,6 +238,7 @@
 
     /** A builder of {@link SignInTemplate}. */
     public static final class Builder {
+        boolean mIsLoading;
         final SignInMethod mSignInMethod;
         @Nullable
         Action mHeaderAction;
@@ -237,6 +253,19 @@
         List<Action> mActionList = new ArrayList<>();
 
         /**
+         * Sets whether the template is in a loading state.
+         *
+         * <p>If set to {@code true}, the UI will display a loading indicator instead of the
+         * {@link SignInMethod}. The caller is expected to call
+         * {@link androidx.car.app.Screen#invalidate()} once loading is complete.
+         */
+        @NonNull
+        public SignInTemplate.Builder setLoading(boolean isLoading) {
+            mIsLoading = isLoading;
+            return this;
+        }
+
+        /**
          * Sets the {@link Action} that will be displayed in the header of the template.
          *
          * <p>Unless set with this method, the template will not have a header action.

car/app/app/src/main/java/androidx/car/app/navigation/model/PlaceListNavigationTemplate.java

diff --git a/car/app/app/src/main/java/androidx/car/app/navigation/model/PlaceListNavigationTemplate.java b/car/app/app/src/main/java/androidx/car/app/navigation/model/PlaceListNavigationTemplate.java
index f55367b..4af1051 100644
--- a/car/app/app/src/main/java/androidx/car/app/navigation/model/PlaceListNavigationTemplate.java
+++ b/car/app/app/src/main/java/androidx/car/app/navigation/model/PlaceListNavigationTemplate.java
@@ -27,6 +27,7 @@
 import androidx.annotation.Nullable;
 import androidx.car.app.Screen;
 import androidx.car.app.SurfaceCallback;
+import androidx.car.app.annotations.ExperimentalCarApi;
 import androidx.car.app.model.Action;
 import androidx.car.app.model.ActionStrip;
 import androidx.car.app.model.CarText;
@@ -192,8 +193,6 @@
         /**
          * Sets the title of the template.
          *
-         * <p>Unless set with this method, the template will not have a title.
-         *
          * <p>Spans are not supported in the input string.
          *
          * @throws NullPointerException if {@code title} is null
@@ -206,6 +205,21 @@
         }
 
         /**
+         * Sets the title of the template.
+         *
+         * <p>Spans are not supported in the input string.
+         *
+         * @throws NullPointerException if {@code title} is null
+         * @see CarText
+         */
+        @ExperimentalCarApi
+        @NonNull
+        public Builder setTitle(@NonNull CarText title) {
+            mTitle = requireNonNull(title);
+            return this;
+        }
+
+        /**
          * Sets whether the template is in a loading state.
          *
          * <p>If set to {@code true}, the UI will show a loading indicator where the list content

car/app/app/src/main/java/androidx/car/app/navigation/model/RoutePreviewNavigationTemplate.java

diff --git a/car/app/app/src/main/java/androidx/car/app/navigation/model/RoutePreviewNavigationTemplate.java b/car/app/app/src/main/java/androidx/car/app/navigation/model/RoutePreviewNavigationTemplate.java
index a9da552..7228775 100644
--- a/car/app/app/src/main/java/androidx/car/app/navigation/model/RoutePreviewNavigationTemplate.java
+++ b/car/app/app/src/main/java/androidx/car/app/navigation/model/RoutePreviewNavigationTemplate.java
@@ -27,6 +27,7 @@
 import androidx.annotation.Nullable;
 import androidx.car.app.Screen;
 import androidx.car.app.SurfaceCallback;
+import androidx.car.app.annotations.ExperimentalCarApi;
 import androidx.car.app.model.Action;
 import androidx.car.app.model.ActionStrip;
 import androidx.car.app.model.CarText;
@@ -222,8 +223,6 @@
         /**
          * Sets the title of the template.
          *
-         * <p>Unless set with this method, the template will not have a title.
-         *
          * <p>Spans are not supported in the input string.
          *
          * @throws NullPointerException if {@code title} is null
@@ -236,6 +235,21 @@
         }
 
         /**
+         * Sets the title of the template.
+         *
+         * <p>Spans are not supported in the input string.
+         *
+         * @throws NullPointerException if {@code title} is null
+         * @see CarText
+         */
+        @ExperimentalCarApi
+        @NonNull
+        public Builder setTitle(@NonNull CarText title) {
+            mTitle = requireNonNull(title);
+            return this;
+        }
+
+        /**
          * Sets whether the template is in a loading state.
          *
          * <p>If set to {@code true}, the UI will show a loading indicator where the list content
@@ -279,6 +293,8 @@
          * <p>This should not be {@code null} if the template is not in a loading state (see
          * #setIsLoading}), and the {@link Action}'s title must be set.
          *
+         * <p>Any background colors or spans set on the action will be ignored.
+         *
          * @throws NullPointerException     if {@code navigateAction} is {@code null}
          * @throws IllegalArgumentException if {@code navigateAction}'s title is {@code null} or
          *                                  empty

car/app/app/src/test/java/androidx/car/app/model/ActionTest.java

diff --git a/car/app/app/src/test/java/androidx/car/app/model/ActionTest.java b/car/app/app/src/test/java/androidx/car/app/model/ActionTest.java
index 9b2303b..2cfed3d 100644
--- a/car/app/app/src/test/java/androidx/car/app/model/ActionTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/model/ActionTest.java
@@ -74,18 +74,6 @@
     }
 
     @Test
-    public void create_throws_customBackgroundColor() {
-        OnClickListener onClickListener = mock(OnClickListener.class);
-        assertThrows(
-                IllegalArgumentException.class,
-                () -> new Action.Builder()
-                        .setTitle("foo")
-                        .setOnClickListener(onClickListener)
-                        .setBackgroundColor(CarColor.createCustom(0xdead, 0xbeef))
-                        .build());
-    }
-
-    @Test
     public void create_noTitleDefault() {
         OnClickListener onClickListener = mock(OnClickListener.class);
         Action action = new Action.Builder()

car/app/app/src/test/java/androidx/car/app/model/LongMessageTemplateTest.java

diff --git a/car/app/app/src/test/java/androidx/car/app/model/LongMessageTemplateTest.java b/car/app/app/src/test/java/androidx/car/app/model/LongMessageTemplateTest.java
new file mode 100644
index 0000000..9bcaa38
--- /dev/null
+++ b/car/app/app/src/test/java/androidx/car/app/model/LongMessageTemplateTest.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.car.app.model;
+
+import static androidx.car.app.model.CarIcon.BACK;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+/** Tests for {@link MessageTemplate}. */
+@RunWith(RobolectricTestRunner.class)
+@DoNotInstrument
+public class LongMessageTemplateTest {
+
+    private final String mTitle = "header";
+    private final String mMessage = "foo";
+    private final Action mAction = Action.BACK;
+    private final ActionStrip mActionStrip = new ActionStrip.Builder().addAction(mAction).build();
+
+    @Test
+    public void emptyMessage_throws() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> new LongMessageTemplate.Builder("").setTitle(mTitle).build());
+    }
+
+    @Test
+    public void noHeaderTitleOrAction_throws() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> new LongMessageTemplate.Builder(mMessage).build());
+
+        // Positive cases.
+        new LongMessageTemplate.Builder(mMessage).setTitle(mTitle).build();
+        new LongMessageTemplate.Builder(mMessage).setHeaderAction(mAction).build();
+    }
+
+    @Test
+    public void createDefault_valuesAreNull() {
+        LongMessageTemplate template = new LongMessageTemplate.Builder(mMessage)
+                .setTitle(mTitle)
+                .build();
+
+        assertThat(template.getMessage().toString()).isEqualTo(mMessage);
+        assertThat(template.getTitle().toString()).isEqualTo("header");
+        assertThat(template.getHeaderAction()).isNull();
+        assertThat(template.getActions()).isEmpty();
+        assertThat(template.getActionStrip()).isNull();
+    }
+
+    @Test
+    public void createInstance_setHeaderAction_invalidActionThrows() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> new LongMessageTemplate.Builder(mMessage)
+                        .setHeaderAction(
+                                new Action.Builder()
+                                        .setTitle("Action")
+                                        .setOnClickListener(() -> { })
+                                        .build())
+                        .build());
+    }
+
+    @Test
+    public void createWithContents_hasProperValuesSet() {
+        Throwable exception = new IllegalStateException();
+        CarIcon icon = BACK;
+        Action action = new Action.Builder().setOnClickListener(() -> { }).setTitle("foo").build();
+        ActionStrip actionStrip = new ActionStrip.Builder().addAction(Action.BACK).build();
+
+        LongMessageTemplate template = new LongMessageTemplate.Builder(mMessage)
+                .setTitle(mTitle)
+                .setHeaderAction(Action.BACK)
+                .addAction(action)
+                .setActionStrip(actionStrip)
+                .build();
+
+        assertThat(template.getMessage().toString()).isEqualTo(mMessage);
+        assertThat(template.getTitle().toString()).isEqualTo(mTitle);
+        assertThat(template.getHeaderAction()).isEqualTo(Action.BACK);
+        assertThat(template.getActions()).containsExactly(action);
+        assertThat(template.getActionStrip()).isEqualTo(actionStrip);
+    }
+
+
+    @Test
+    public void equals() {
+        LongMessageTemplate template1 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+        LongMessageTemplate template2 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+
+        assertThat(template1).isEqualTo(template2);
+    }
+
+    @Test
+    public void notEquals_differentMessage() {
+        LongMessageTemplate template1 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+        LongMessageTemplate template2 =
+                new LongMessageTemplate.Builder("bar")
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+
+        assertThat(template1).isNotEqualTo(template2);
+    }
+
+    @Test
+    public void notEquals_differentHeaderAction() {
+        LongMessageTemplate template1 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+        LongMessageTemplate template2 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.APP_ICON)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+
+        assertThat(template1).isNotEqualTo(template2);
+    }
+
+    @Test
+    public void notEquals_differentActions() {
+        LongMessageTemplate template1 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+        LongMessageTemplate template2 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+
+        assertThat(template1).isNotEqualTo(template2);
+    }
+
+    @Test
+    public void notEquals_differentActionStrip() {
+        LongMessageTemplate template1 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+        LongMessageTemplate template2 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .setActionStrip(new ActionStrip.Builder()
+                                .addAction(Action.BACK)
+                                .addAction(Action.APP_ICON)
+                                .build())
+                        .build();
+
+        assertThat(template1).isNotEqualTo(template2);
+    }
+
+    @Test
+    public void notEquals_differentTitle() {
+        LongMessageTemplate template1 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle(mTitle)
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+        LongMessageTemplate template2 =
+                new LongMessageTemplate.Builder(mMessage)
+                        .setTitle("yo")
+                        .setHeaderAction(Action.BACK)
+                        .addAction(mAction)
+                        .setActionStrip(mActionStrip)
+                        .build();
+
+        assertThat(template1).isNotEqualTo(template2);
+    }
+}

car/app/app/src/test/java/androidx/car/app/model/PlaceListMapTemplateTest.java

diff --git a/car/app/app/src/test/java/androidx/car/app/model/PlaceListMapTemplateTest.java b/car/app/app/src/test/java/androidx/car/app/model/PlaceListMapTemplateTest.java
index 0272b02..b137b1a 100644
--- a/car/app/app/src/test/java/androidx/car/app/model/PlaceListMapTemplateTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/model/PlaceListMapTemplateTest.java
@@ -268,6 +268,22 @@
     }
 
     @Test
+    public void createInstance_title_variants() {
+        CarText title = new CarText.Builder("Very Long Title").addVariant("Short Title").build();
+        ItemList itemList = TestUtils.createItemListWithDistanceSpan(6, false, mDistanceSpan);
+
+        PlaceListMapTemplate template =
+                new PlaceListMapTemplate.Builder()
+                        .setItemList(itemList)
+                        .setTitle(title)
+                        .setCurrentLocationEnabled(true)
+                        .build();
+        assertThat(template.getTitle()).isNotNull();
+        assertThat(template.getTitle().toString()).isEqualTo("Very Long Title");
+        assertThat(template.getTitle().getVariants().get(0).toString()).isEqualTo("Short Title");
+    }
+
+    @Test
     public void createInstance_noHeaderTitleOrAction_throws() {
         ItemList itemList = TestUtils.createItemListWithDistanceSpan(6, false, mDistanceSpan);
 

car/app/app/src/test/java/androidx/car/app/model/signin/InputSignInMethodTest.java

diff --git a/car/app/app/src/test/java/androidx/car/app/model/signin/InputSignInMethodTest.java b/car/app/app/src/test/java/androidx/car/app/model/signin/InputSignInMethodTest.java
index 142424b..eeeaa4e 100644
--- a/car/app/app/src/test/java/androidx/car/app/model/signin/InputSignInMethodTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/model/signin/InputSignInMethodTest.java
@@ -27,6 +27,8 @@
 import static org.mockito.Mockito.verify;
 
 import androidx.car.app.OnDoneCallback;
+import androidx.car.app.model.OnInputCompletedDelegate;
+import androidx.car.app.model.OnInputCompletedListener;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -45,7 +47,7 @@
     public final MockitoRule mockito = MockitoJUnit.rule();
 
     @Mock
-    InputSignInMethod.OnInputCompletedListener mListener;
+    OnInputCompletedListener mListener;
 
     @Test
     public void create_defaultValues() {
@@ -53,8 +55,8 @@
 
         assertThat(signIn.getInputType()).isEqualTo(INPUT_TYPE_DEFAULT);
         assertThat(signIn.getKeyboardType()).isEqualTo(KEYBOARD_DEFAULT);
-        assertThat(signIn.getPrompt()).isNull();
-        assertThat(signIn.getMessage()).isNull();
+        assertThat(signIn.getHint()).isNull();
+        assertThat(signIn.getErrorMessage()).isNull();
         assertThat(signIn.isShowKeyboardByDefault()).isFalse();
 
         OnInputCompletedDelegate delegate = signIn.getOnInputCompletedDelegate();
@@ -86,19 +88,19 @@
     @Test
     public void create_wtihPrompt() {
         InputSignInMethod signIn = new InputSignInMethod.Builder(mListener)
-                .setPrompt("Signin")
+                .setHint("Signin")
                 .build();
 
-        assertThat(signIn.getPrompt().toString()).isEqualTo("Signin");
+        assertThat(signIn.getHint().toString()).isEqualTo("Signin");
     }
 
     @Test
     public void create_withMessage() {
         InputSignInMethod signIn = new InputSignInMethod.Builder(mListener)
-                .setMessage("error")
+                .setErrorMessage("error")
                 .build();
 
-        assertThat(signIn.getMessage().toString()).isEqualTo("error");
+        assertThat(signIn.getErrorMessage().toString()).isEqualTo("error");
     }
 
     @Test
@@ -120,8 +122,8 @@
         InputSignInMethod signIn = new InputSignInMethod.Builder(mListener)
                 .setInputType(inputType)
                 .setKeyboardType(keyboardType)
-                .setPrompt(instructions)
-                .setMessage(message)
+                .setHint(instructions)
+                .setErrorMessage(message)
                 .setShowKeyboardByDefault(true)
                 .build();
 
@@ -129,8 +131,8 @@
                 .isEqualTo(new InputSignInMethod.Builder(mListener)
                         .setInputType(inputType)
                         .setKeyboardType(keyboardType)
-                        .setPrompt(instructions)
-                        .setMessage(message)
+                        .setHint(instructions)
+                        .setErrorMessage(message)
                         .setShowKeyboardByDefault(true)
                         .build());
     }
@@ -144,8 +146,8 @@
         InputSignInMethod signIn = new InputSignInMethod.Builder(mListener)
                 .setInputType(INPUT_TYPE_PASSWORD)
                 .setKeyboardType(keyboardType)
-                .setPrompt(instructions)
-                .setMessage(message)
+                .setHint(instructions)
+                .setErrorMessage(message)
                 .setShowKeyboardByDefault(true)
                 .build();
 
@@ -153,8 +155,8 @@
                 .isNotEqualTo(new InputSignInMethod.Builder(mListener)
                         .setInputType(INPUT_TYPE_DEFAULT)
                         .setKeyboardType(keyboardType)
-                        .setPrompt(instructions)
-                        .setMessage(message)
+                        .setHint(instructions)
+                        .setErrorMessage(message)
                         .setShowKeyboardByDefault(true)
                         .build());
     }
@@ -168,8 +170,8 @@
         InputSignInMethod signIn = new InputSignInMethod.Builder(mListener)
                 .setInputType(inputType)
                 .setKeyboardType(KEYBOARD_EMAIL)
-                .setPrompt(instructions)
-                .setMessage(message)
+                .setHint(instructions)
+                .setErrorMessage(message)
                 .setShowKeyboardByDefault(true)
                 .build();
 
@@ -177,8 +179,8 @@
                 .isNotEqualTo(new InputSignInMethod.Builder(mListener)
                         .setInputType(inputType)
                         .setKeyboardType(KEYBOARD_DEFAULT)
-                        .setPrompt(instructions)
-                        .setMessage(message)
+                        .setHint(instructions)
+                        .setErrorMessage(message)
                         .setShowKeyboardByDefault(true)
                         .build());
     }
@@ -192,8 +194,8 @@
         InputSignInMethod signIn = new InputSignInMethod.Builder(mListener)
                 .setInputType(inputType)
                 .setKeyboardType(keyboardType)
-                .setPrompt("signin")
-                .setMessage(message)
+                .setHint("signin")
+                .setErrorMessage(message)
                 .setShowKeyboardByDefault(true)
                 .build();
 
@@ -201,8 +203,8 @@
                 .isNotEqualTo(new InputSignInMethod.Builder(mListener)
                         .setInputType(inputType)
                         .setKeyboardType(keyboardType)
-                        .setPrompt("sign2")
-                        .setMessage(message)
+                        .setHint("sign2")
+                        .setErrorMessage(message)
                         .setShowKeyboardByDefault(true)
                         .build());
     }
@@ -216,8 +218,8 @@
         InputSignInMethod signIn = new InputSignInMethod.Builder(mListener)
                 .setInputType(inputType)
                 .setKeyboardType(keyboardType)
-                .setPrompt(instructions)
-                .setMessage("error")
+                .setHint(instructions)
+                .setErrorMessage("error")
                 .setShowKeyboardByDefault(true)
                 .build();
 
@@ -225,8 +227,8 @@
                 .isNotEqualTo(new InputSignInMethod.Builder(mListener)
                         .setInputType(inputType)
                         .setKeyboardType(keyboardType)
-                        .setPrompt(instructions)
-                        .setMessage("error2")
+                        .setHint(instructions)
+                        .setErrorMessage("error2")
                         .setShowKeyboardByDefault(true)
                         .build());
     }
@@ -241,8 +243,8 @@
         InputSignInMethod signIn = new InputSignInMethod.Builder(mListener)
                 .setInputType(inputType)
                 .setKeyboardType(keyboardType)
-                .setPrompt(instructions)
-                .setMessage(message)
+                .setHint(instructions)
+                .setErrorMessage(message)
                 .setShowKeyboardByDefault(true)
                 .build();
 
@@ -250,8 +252,8 @@
                 .isNotEqualTo(new InputSignInMethod.Builder(mListener)
                         .setInputType(inputType)
                         .setKeyboardType(keyboardType)
-                        .setPrompt(instructions)
-                        .setMessage(message)
+                        .setHint(instructions)
+                        .setErrorMessage(message)
                         .setShowKeyboardByDefault(false)
                         .build());
     }

car/app/app/src/test/java/androidx/car/app/model/signin/SignInTemplateTest.java

diff --git a/car/app/app/src/test/java/androidx/car/app/model/signin/SignInTemplateTest.java b/car/app/app/src/test/java/androidx/car/app/model/signin/SignInTemplateTest.java
index b3aacd6..bab84ba 100644
--- a/car/app/app/src/test/java/androidx/car/app/model/signin/SignInTemplateTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/model/signin/SignInTemplateTest.java
@@ -51,6 +51,7 @@
                 .build();
 
         assertThat(template.getTitle().toString()).isEqualTo("Title");
+        assertThat(template.isLoading()).isFalse();
         assertThat(template.getHeaderAction()).isNull();
         assertThat(template.getSignInMethod()).isEqualTo(signInMethod);
         assertThat(template.getActions()).isEmpty();
@@ -73,6 +74,16 @@
     }
 
     @Test
+    public void createInstance_setLoading() {
+        PinSignInMethod signInMethod = new PinSignInMethod.Builder("ABC").build();
+        SignInTemplate template = new SignInTemplate.Builder(signInMethod)
+                .setHeaderAction(Action.BACK)
+                .setLoading(true)
+                .build();
+        assertThat(template.isLoading()).isTrue();
+    }
+
+    @Test
     public void createInstance_setHeaderAction() {
         PinSignInMethod signInMethod = new PinSignInMethod.Builder("ABC").build();
         SignInTemplate template = new SignInTemplate.Builder(signInMethod)
@@ -152,6 +163,7 @@
 
         SignInTemplate template = new SignInTemplate.Builder(signInMethod)
                 .setTitle(title)
+                .setLoading(true)
                 .setInstructions(instructions)
                 .setAdditionalText(additionalText)
                 .addAction(action)
@@ -161,6 +173,37 @@
         assertThat(template)
                 .isEqualTo(
                         new SignInTemplate.Builder(signInMethod)
+                                .setLoading(true)
+                                .setTitle(title)
+                                .setInstructions(instructions)
+                                .setAdditionalText(additionalText)
+                                .addAction(action)
+                                .setActionStrip(actionStrip)
+                                .build());
+    }
+
+    @Test
+    public void notEquals_differentLoadingState() {
+        PinSignInMethod signInMethod = new PinSignInMethod.Builder("ABC").build();
+        String title = "Title";
+        String instructions = "instructions";
+        String additionalText = "Text";
+        Action action = Action.BACK;
+        ActionStrip actionStrip = new ActionStrip.Builder().addAction(action).build();
+
+        SignInTemplate template = new SignInTemplate.Builder(signInMethod)
+                .setTitle(title)
+                .setLoading(true)
+                .setInstructions(instructions)
+                .setAdditionalText(additionalText)
+                .addAction(action)
+                .setActionStrip(actionStrip)
+                .build();
+
+        assertThat(template)
+                .isNotEqualTo(
+                        new SignInTemplate.Builder(signInMethod)
+                                .setLoading(false)
                                 .setTitle(title)
                                 .setInstructions(instructions)
                                 .setAdditionalText(additionalText)

car/app/app/src/test/java/androidx/car/app/navigation/model/PlaceListNavigationTemplateTest.java

diff --git a/car/app/app/src/test/java/androidx/car/app/navigation/model/PlaceListNavigationTemplateTest.java b/car/app/app/src/test/java/androidx/car/app/navigation/model/PlaceListNavigationTemplateTest.java
index 79fd12f..1126c91 100644
--- a/car/app/app/src/test/java/androidx/car/app/navigation/model/PlaceListNavigationTemplateTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/navigation/model/PlaceListNavigationTemplateTest.java
@@ -28,6 +28,7 @@
 import androidx.car.app.model.ActionStrip;
 import androidx.car.app.model.CarIcon;
 import androidx.car.app.model.CarLocation;
+import androidx.car.app.model.CarText;
 import androidx.car.app.model.Distance;
 import androidx.car.app.model.DistanceSpan;
 import androidx.car.app.model.ItemList;
@@ -280,6 +281,20 @@
     }
 
     @Test
+    public void createInstance_title_variants() {
+        CarText title = new CarText.Builder("Very Long Title").addVariant("Short Title").build();
+
+        PlaceListNavigationTemplate template =
+                new PlaceListNavigationTemplate.Builder()
+                        .setTitle(title)
+                        .setItemList(new ItemList.Builder().build())
+                        .build();
+        assertThat(template.getTitle()).isNotNull();
+        assertThat(template.getTitle().toString()).isEqualTo("Very Long Title");
+        assertThat(template.getTitle().getVariants().get(0).toString()).isEqualTo("Short Title");
+    }
+
+    @Test
     public void equals() {
         PlaceListNavigationTemplate template =
                 new PlaceListNavigationTemplate.Builder()

car/app/app/src/test/java/androidx/car/app/navigation/model/RoutePreviewNavigationTemplateTest.java

diff --git a/car/app/app/src/test/java/androidx/car/app/navigation/model/RoutePreviewNavigationTemplateTest.java b/car/app/app/src/test/java/androidx/car/app/navigation/model/RoutePreviewNavigationTemplateTest.java
index 775ca42..e6eb66f 100644
--- a/car/app/app/src/test/java/androidx/car/app/navigation/model/RoutePreviewNavigationTemplateTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/navigation/model/RoutePreviewNavigationTemplateTest.java
@@ -30,6 +30,7 @@
 import androidx.car.app.model.Action;
 import androidx.car.app.model.ActionStrip;
 import androidx.car.app.model.CarIcon;
+import androidx.car.app.model.CarText;
 import androidx.car.app.model.Distance;
 import androidx.car.app.model.DistanceSpan;
 import androidx.car.app.model.ItemList;
@@ -150,6 +151,24 @@
     }
 
     @Test
+    public void createInstance_title_variants() {
+        CarText title = new CarText.Builder("Very Long Title").addVariant("Short Title").build();
+        ItemList itemList = TestUtils.createItemListWithDistanceSpan(2, true, DISTANCE);
+
+        RoutePreviewNavigationTemplate template =
+                new RoutePreviewNavigationTemplate.Builder()
+                        .setItemList(itemList)
+                        .setTitle(title)
+                        .setNavigateAction(
+                                new Action.Builder().setTitle("Navigate").setOnClickListener(() -> {
+                                }).build())
+                        .build();
+        assertThat(template.getTitle()).isNotNull();
+        assertThat(template.getTitle().toString()).isEqualTo("Very Long Title");
+        assertThat(template.getTitle().getVariants().get(0).toString()).isEqualTo("Short Title");
+    }
+
+    @Test
     public void createInstance_setHeaderAction_invalidActionThrows() {
         assertThrows(
                 IllegalArgumentException.class,

compose/animation/animation-core-lint/build.gradle

diff --git a/compose/animation/animation-core-lint/build.gradle b/compose/animation/animation-core-lint/build.gradle
new file mode 100644
index 0000000..cfc93e3
--- /dev/null
+++ b/compose/animation/animation-core-lint/build.gradle
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import androidx.build.BundleInsideHelper
+import androidx.build.LibraryGroups
+import androidx.build.LibraryType
+
+import static androidx.build.dependencies.DependenciesKt.*
+
+plugins {
+    id("AndroidXPlugin")
+    id("kotlin")
+}
+
+BundleInsideHelper.forInsideLintJar(project)
+
+dependencies {
+    // compileOnly because we use lintChecks and it doesn't allow other types of deps
+    // this ugly hack exists because of b/63873667
+    if (rootProject.hasProperty("android.injected.invoked.from.ide")) {
+        compileOnly LINT_API_LATEST
+    } else {
+        compileOnly LINT_API_MIN
+    }
+    compileOnly KOTLIN_STDLIB
+    bundleInside(project(":compose:lint:common"))
+
+    testImplementation KOTLIN_STDLIB
+    testImplementation LINT_CORE
+    testImplementation LINT_TESTS
+}
+
+androidx {
+    name = "Compose Animation Core Lint Checks"
+    type = LibraryType.LINT
+    mavenGroup = LibraryGroups.Compose.ANIMATION
+    inceptionYear = "2021"
+    description = "Compose Animation Core Lint Checks"
+}

compose/animation/animation-core-lint/src/main/java/androidx/compose/animation/core/lint/AnimationCoreIssueRegistry.kt

diff --git a/compose/animation/animation-core-lint/src/main/java/androidx/compose/animation/core/lint/AnimationCoreIssueRegistry.kt b/compose/animation/animation-core-lint/src/main/java/androidx/compose/animation/core/lint/AnimationCoreIssueRegistry.kt
new file mode 100644
index 0000000..9accf4f
--- /dev/null
+++ b/compose/animation/animation-core-lint/src/main/java/androidx/compose/animation/core/lint/AnimationCoreIssueRegistry.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.animation.core.lint
+
+import com.android.tools.lint.client.api.IssueRegistry
+import com.android.tools.lint.detector.api.CURRENT_API
+
+/**
+ * [IssueRegistry] containing runtime specific lint issues.
+ */
+class AnimationCoreIssueRegistry : IssueRegistry() {
+    // Tests are run with this version. We ensure that with ApiLintVersionsTest
+    override val api = 8
+    override val minApi = CURRENT_API
+    override val issues get() = listOf(
+        TransitionDetector.UnusedTransitionTargetStateParameter
+    )
+}

compose/animation/animation-core-lint/src/main/java/androidx/compose/animation/core/lint/TransitionDetector.kt

diff --git a/compose/animation/animation-core-lint/src/main/java/androidx/compose/animation/core/lint/TransitionDetector.kt b/compose/animation/animation-core-lint/src/main/java/androidx/compose/animation/core/lint/TransitionDetector.kt
new file mode 100644
index 0000000..d15d058
--- /dev/null
+++ b/compose/animation/animation-core-lint/src/main/java/androidx/compose/animation/core/lint/TransitionDetector.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("UnstableApiUsage")
+
+package androidx.compose.animation.core.lint
+
+import androidx.compose.lint.Name
+import androidx.compose.lint.Names
+import androidx.compose.lint.findUnreferencedParameters
+import com.android.tools.lint.client.api.UElementHandler
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.Severity
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.intellij.psi.PsiPrimitiveType
+import com.intellij.psi.impl.source.PsiClassReferenceType
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.ULambdaExpression
+import java.util.EnumSet
+
+/**
+ * [Detector] that checks `Transition` usages for correctness.
+ *
+ * - Transition animate functions (such as animateFloat) provide a `targetValueByState` lambda
+ * that contains a `state` parameter containing the state to get the value for. It is always an
+ * error to not use this parameter, so this detector ensures that the parameter is always at
+ * least referenced, preventing common errors such as:
+ * `transition.animateFloat { if (someOtherState) 0f else 1f }`
+ */
+class TransitionDetector : Detector(), SourceCodeScanner {
+    override fun getApplicableUastTypes() = listOf(UCallExpression::class.java)
+
+    override fun createUastHandler(context: JavaContext) = object : UElementHandler() {
+        override fun visitCallExpression(node: UCallExpression) {
+            val method = node.resolve() ?: return
+            // Ignore if this isn't an extension on Transition that starts with `animate`
+            val receiverType = node.receiverType as? PsiClassReferenceType ?: return
+            if (!receiverType.rawType().equalsToText(Transition.javaFqn)) return
+            if (node.methodName?.startsWith("animate") != true) return
+
+            // Our heuristic looks for lambda parameters with `(S) -> *`, this should catch all
+            // similar methods with (as of yet) no false positives.
+            val matchingLambdaArguments = node.valueArguments
+                .filterIsInstance<ULambdaExpression>()
+                .filter { argument ->
+                    val parameters = argument.valueParameters
+                    if (parameters.size != 1) return@filter false
+                    val parameter = parameters.first()
+                    // If the type is a primitive, the generic type on Transition will be the
+                    // Boxed version, but the type of the lambda argument is most likely the
+                    // primitive type
+                    val boxedType = when (val type = parameter.type) {
+                        is PsiPrimitiveType -> type.getBoxedType(method)
+                        else -> type
+                    }
+                    boxedType == receiverType.parameters[0]
+                }
+
+            // Make sure that the parameter (S) is referenced inside the lambda body.
+            matchingLambdaArguments.forEach { lambda ->
+                lambda.findUnreferencedParameters().forEach { unreferencedParameter ->
+                    val location = unreferencedParameter.parameter
+                        ?.let { context.getLocation(it) }
+                        ?: context.getLocation(lambda)
+                    val name = unreferencedParameter.name
+                    context.report(
+                        UnusedTransitionTargetStateParameter,
+                        node,
+                        location,
+                        "Target state parameter `$name` is not used"
+                    )
+                }
+            }
+        }
+    }
+
+    companion object {
+        val UnusedTransitionTargetStateParameter = Issue.create(
+            "UnusedTransitionTargetStateParameter",
+            "Transition.animate* calls should use the provided targetState when defining values",
+            "Transition.animate* functions provide a target state parameter in the lambda that " +
+                "will be used to calculate the value for a given state. This target state " +
+                "parameter in the lambda may or may not be the same as the actual state, as the" +
+                " animation system occasionally needs to look up target values for other states " +
+                "to do proper seeking/tooling preview. Relying on other state than the provided " +
+                "`targetState` could also result in unnecessary recompositions. Therefore, it is " +
+                "generally considered an error if this `targetState` parameter is not used.",
+            Category.CORRECTNESS, 3, Severity.ERROR,
+            Implementation(
+                TransitionDetector::class.java,
+                EnumSet.of(Scope.JAVA_FILE, Scope.TEST_SOURCES)
+            )
+        )
+    }
+}
+
+private val Transition = Name(Names.AnimationCore.PackageName, "Transition")

compose/animation/animation-core-lint/src/main/resources/META-INF/services/com.android.tools.lint.client.api.IssueRegistry

diff --git a/compose/animation/animation-core-lint/src/main/resources/META-INF/services/com.android.tools.lint.client.api.IssueRegistry b/compose/animation/animation-core-lint/src/main/resources/META-INF/services/com.android.tools.lint.client.api.IssueRegistry
new file mode 100644
index 0000000..f1ade4a
--- /dev/null
+++ b/compose/animation/animation-core-lint/src/main/resources/META-INF/services/com.android.tools.lint.client.api.IssueRegistry
@@ -0,0 +1 @@
+androidx.compose.animation.core.lint.AnimationCoreIssueRegistry

compose/animation/animation-core-lint/src/test/java/androidx/compose/animation/core/lint/TransitionDetectorTest.kt

diff --git a/compose/animation/animation-core-lint/src/test/java/androidx/compose/animation/core/lint/TransitionDetectorTest.kt b/compose/animation/animation-core-lint/src/test/java/androidx/compose/animation/core/lint/TransitionDetectorTest.kt
new file mode 100644
index 0000000..dee78ee
--- /dev/null
+++ b/compose/animation/animation-core-lint/src/test/java/androidx/compose/animation/core/lint/TransitionDetectorTest.kt
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("UnstableApiUsage")
+
+package androidx.compose.animation.core.lint
+
+import androidx.compose.lint.Stubs
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Issue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+/* ktlint-disable max-line-length */
+@RunWith(JUnit4::class)
+
+// TODO: add tests for methods defined in class files when we update Lint to support bytecode()
+//  test files
+
+/**
+ * Test for [TransitionDetector].
+ */
+class TransitionDetectorTest : LintDetectorTest() {
+    override fun getDetector(): Detector = TransitionDetector()
+
+    override fun getIssues(): MutableList<Issue> =
+        mutableListOf(TransitionDetector.UnusedTransitionTargetStateParameter)
+
+    // Simplified Transition.kt stubs
+    private val TransitionStub = kotlin(
+        """
+            package androidx.compose.animation.core
+
+            import androidx.compose.runtime.Composable
+
+            class Transition<S> {
+                class Segment<S>
+            }
+
+            @Composable
+            inline fun <S> Transition<S>.animateFloat(
+                noinline transitionSpec: @Composable Transition.Segment<S>.() -> Unit = {},
+                label: String = "FloatAnimation",
+                targetValueByState: @Composable (state: S) -> Float
+            ): Float = 5f
+        """
+    )
+
+    @Test
+    fun unreferencedParameters() {
+        lint().files(
+            kotlin(
+                """
+                package foo
+
+                import androidx.compose.animation.core.*
+                import androidx.compose.runtime.*
+
+                val transition = Transition<Boolean>()
+
+                var foo = false
+
+                @Composable
+                fun Test() {
+                    transition.animateFloat { if (foo) 1f else 0f }
+                    transition.animateFloat(targetValueByState = { if (foo) 1f else 0f })
+                    transition.animateFloat { param -> if (foo) 1f else 0f }
+                    transition.animateFloat(targetValueByState = { param -> if (foo) 1f else 0f })
+                    transition.animateFloat { _ -> if (foo) 1f else 0f }
+                    transition.animateFloat(targetValueByState = { _ -> if (foo) 1f else 0f })
+                }
+            """
+            ),
+            TransitionStub,
+            kotlin(Stubs.Composable)
+        )
+            .run()
+            .expect(
+                """
+src/foo/test.kt:13: Error: Target state parameter it is not used [UnusedTransitionTargetStateParameter]
+                    transition.animateFloat { if (foo) 1f else 0f }
+                                            ~~~~~~~~~~~~~~~~~~~~~~~
+src/foo/test.kt:14: Error: Target state parameter it is not used [UnusedTransitionTargetStateParameter]
+                    transition.animateFloat(targetValueByState = { if (foo) 1f else 0f })
+                                                                 ~~~~~~~~~~~~~~~~~~~~~~~
+src/foo/test.kt:15: Error: Target state parameter param is not used [UnusedTransitionTargetStateParameter]
+                    transition.animateFloat { param -> if (foo) 1f else 0f }
+                                              ~~~~~
+src/foo/test.kt:16: Error: Target state parameter param is not used [UnusedTransitionTargetStateParameter]
+                    transition.animateFloat(targetValueByState = { param -> if (foo) 1f else 0f })
+                                                                   ~~~~~
+src/foo/test.kt:17: Error: Target state parameter _ is not used [UnusedTransitionTargetStateParameter]
+                    transition.animateFloat { _ -> if (foo) 1f else 0f }
+                                              ~
+src/foo/test.kt:18: Error: Target state parameter _ is not used [UnusedTransitionTargetStateParameter]
+                    transition.animateFloat(targetValueByState = { _ -> if (foo) 1f else 0f })
+                                                                   ~
+6 errors, 0 warnings
+            """
+            )
+    }
+
+    @Test
+    fun unreferencedParameter_shadowedNames() {
+        lint().files(
+            kotlin(
+                """
+                package foo
+
+                import androidx.compose.animation.core.*
+                import androidx.compose.runtime.*
+
+                val transition = Transition<Boolean>()
+
+                var foo = false
+
+                @Composable
+                fun Test() {
+                    transition.animateFloat {
+                        foo.let {
+                            // These `it`s refer to the `let`, not the `animateFloat`, so we 
+                            // should still report an error
+                            it.let {
+                                if (it) 1f else 0f
+                            }
+                        }
+                    }
+                    transition.animateFloat { param ->
+                        foo.let { param ->
+                            // This `param` refers to the `let`, not the `animateFloat`, so we 
+                            // should still report an error
+                            if (param) 1f else 0f
+                        }
+                    }
+                }
+            """
+            ),
+            TransitionStub,
+            kotlin(Stubs.Composable)
+        )
+            .run()
+            .expect(
+                """
+src/foo/test.kt:13: Error: Target state parameter it is not used [UnusedTransitionTargetStateParameter]
+                    transition.animateFloat {
+                                            ^
+src/foo/test.kt:22: Error: Target state parameter param is not used [UnusedTransitionTargetStateParameter]
+                    transition.animateFloat { param ->
+                                              ~~~~~
+2 errors, 0 warnings
+            """
+            )
+    }
+
+    @Test
+    fun noErrors() {
+        lint().files(
+            kotlin(
+                """
+            package foo
+
+            import androidx.compose.animation.core.*
+            import androidx.compose.runtime.*
+
+            val transition = Transition<Boolean>()
+
+            var foo = false
+
+            @Composable
+            fun Test() {
+                transition.animateFloat { if (it) 1f else 0f }
+                transition.animateFloat(targetValueByState = { if (it) 1f else 0f })
+                transition.animateFloat { param -> if (param) 1f else 0f }
+                transition.animateFloat(targetValueByState = { param -> if (param) 1f else 0f })
+                transition.animateFloat { param ->
+                    foo.let {
+                        it.let {
+                            if (param && it) 1f else 0f
+                        }
+                    }
+                }
+                transition.animateFloat {
+                    foo.let { param ->
+                        param.let { param ->
+                            if (param && it) 1f else 0f
+                        }
+                    }
+                }
+
+                transition.animateFloat {
+                    foo.run {
+                        run {
+                            if (this && it) 1f else 0f
+                        }
+                    }
+                }
+
+                fun multipleParameterLambda(lambda: (Boolean, Boolean) -> Float): Float 
+                    = lambda(true, true)
+
+                transition.animateFloat {
+                    multipleParameterLambda { _, _ ->
+                        multipleParameterLambda { param1, _ ->
+                            if (param1 && it) 1f else 0f
+                        }
+                    }
+                }
+            }
+        """
+            ),
+            TransitionStub,
+            kotlin(Stubs.Composable)
+        )
+            .run()
+            .expectClean()
+    }
+}
+/* ktlint-enable max-line-length */

compose/animation/animation-core-lint/src/test/java/androidx/compose/material/lint/ApiLintVersionsTest.kt

diff --git a/compose/animation/animation-core-lint/src/test/java/androidx/compose/material/lint/ApiLintVersionsTest.kt b/compose/animation/animation-core-lint/src/test/java/androidx/compose/material/lint/ApiLintVersionsTest.kt
new file mode 100644
index 0000000..415c8c2
--- /dev/null
+++ b/compose/animation/animation-core-lint/src/test/java/androidx/compose/material/lint/ApiLintVersionsTest.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("UnstableApiUsage")
+
+package androidx.compose.material.lint
+
+import androidx.compose.animation.core.lint.AnimationCoreIssueRegistry
+import com.android.tools.lint.client.api.LintClient
+import com.android.tools.lint.detector.api.CURRENT_API
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class ApiLintVersionsTest {
+
+    @Test
+    fun versionsCheck() {
+        LintClient.clientName = LintClient.CLIENT_UNIT_TESTS
+
+        val registry = AnimationCoreIssueRegistry()
+        // we hardcode version registry.api to the version that is used to run tests
+        assertThat(registry.api).isEqualTo(CURRENT_API)
+        // Intentionally fails in IDE, because we use different API version in
+        // studio and command line
+        assertThat(registry.minApi).isEqualTo(3)
+    }
+}

compose/animation/animation-core/api/1.0.0-beta04.txt

diff --git a/compose/animation/animation-core/api/1.0.0-beta04.txt b/compose/animation/animation-core/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..6ba4265
--- /dev/null
+++ b/compose/animation/animation-core/api/1.0.0-beta04.txt
@@ -0,0 +1,662 @@
+// Signature format: 4.0
+package androidx.compose.animation.core {
+
+  public final class ActualJvmKt {
+  }
+
+  public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
+    ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
+    method public suspend Object? animateDecay(T? initialVelocity, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>> p);
+    method public suspend Object? animateTo(T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? initialVelocity, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>> p);
+    method public androidx.compose.runtime.State<T> asState();
+    method public T? getLowerBound();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T? getUpperBound();
+    method public T! getValue();
+    method public T! getVelocity();
+    method public V getVelocityVector();
+    method public boolean isRunning();
+    method public suspend Object? snapTo(T? targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? stop(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public void updateBounds(optional T? lowerBound, optional T? upperBound);
+    property public final boolean isRunning;
+    property public final T? lowerBound;
+    property public final T! targetValue;
+    property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+    property public final T? upperBound;
+    property public final T! value;
+    property public final T! velocity;
+    property public final V velocityVector;
+  }
+
+  public final class AnimatableKt {
+    method public static androidx.compose.animation.core.Animatable<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> Animatable(float initialValue, optional float visibilityThreshold);
+  }
+
+  public final class AnimateAsStateKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDpAsState-Lz7ev7o(float targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.Dp> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Dp,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloatAsState(float targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional float visibilityThreshold, optional kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Integer> animateIntAsState(int targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Integer> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffsetAsState-2AXSKHY(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntOffset,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSizeAsState-Cmzki-s(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffsetAsState-t81mtYE(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRectAsState(androidx.compose.ui.geometry.Rect targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Rect> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Rect,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSizeAsState-rlPqr8Y(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Size> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Size,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValueAsState(T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? visibilityThreshold, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? finishedListener);
+  }
+
+  public interface Animation<T, V extends androidx.compose.animation.core.AnimationVector> {
+    method public long getDurationNanos();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValueFromNanos(long playTimeNanos);
+    method public V getVelocityVectorFromNanos(long playTimeNanos);
+    method public default boolean isFinishedFromNanos(long playTimeNanos);
+    method public boolean isInfinite();
+    property public abstract long durationNanos;
+    property public abstract boolean isInfinite;
+    property public abstract T! targetValue;
+    property public abstract androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public final class AnimationConstants {
+    field public static final int DefaultDurationMillis = 300; // 0x12c
+    field public static final androidx.compose.animation.core.AnimationConstants INSTANCE;
+    field public static final long UnspecifiedTime = -9223372036854775808L; // 0x8000000000000000L
+  }
+
+  public enum AnimationEndReason {
+    enum_constant public static final androidx.compose.animation.core.AnimationEndReason BoundReached;
+    enum_constant public static final androidx.compose.animation.core.AnimationEndReason Finished;
+  }
+
+  public final class AnimationKt {
+    method public static androidx.compose.animation.core.DecayAnimation<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> DecayAnimation(androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, float initialValue, optional float initialVelocity);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TargetBasedAnimation<T,V> TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, T? initialVelocity);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! getVelocityFromNanos(androidx.compose.animation.core.Animation<T,V>, long playTimeNanos);
+  }
+
+  public final class AnimationResult<T, V extends androidx.compose.animation.core.AnimationVector> {
+    ctor public AnimationResult(androidx.compose.animation.core.AnimationState<T,V> endState, androidx.compose.animation.core.AnimationEndReason endReason);
+    method public androidx.compose.animation.core.AnimationEndReason getEndReason();
+    method public androidx.compose.animation.core.AnimationState<T,V> getEndState();
+    property public final androidx.compose.animation.core.AnimationEndReason endReason;
+    property public final androidx.compose.animation.core.AnimationState<T,V> endState;
+  }
+
+  public final class AnimationScope<T, V extends androidx.compose.animation.core.AnimationVector> {
+    method public void cancelAnimation();
+    method public long getFinishedTimeNanos();
+    method public long getLastFrameTimeNanos();
+    method public long getStartTimeNanos();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValue();
+    method public T! getVelocity();
+    method public V getVelocityVector();
+    method public boolean isRunning();
+    method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
+    property public final long finishedTimeNanos;
+    property public final boolean isRunning;
+    property public final long lastFrameTimeNanos;
+    property public final long startTimeNanos;
+    property public final T! targetValue;
+    property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+    property public final T! value;
+    property public final T! velocity;
+    property public final V velocityVector;
+  }
+
+  public interface AnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+  }
+
+  public final class AnimationSpecKt {
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.InfiniteRepeatableSpec<T> infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.KeyframesSpec<T> keyframes(kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T>,kotlin.Unit> init);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.RepeatableSpec<T> repeatable(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SnapSpec<T> snap(optional int delayMillis);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SpringSpec<T> spring(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.TweenSpec<T> tween(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+  }
+
+  public final class AnimationState<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.runtime.State<T> {
+    ctor public AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, optional V? initialVelocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public long getFinishedTimeNanos();
+    method public long getLastFrameTimeNanos();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValue();
+    method public T! getVelocity();
+    method public V getVelocityVector();
+    method public boolean isRunning();
+    property public final long finishedTimeNanos;
+    property public final boolean isRunning;
+    property public final long lastFrameTimeNanos;
+    property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+    property public T! value;
+    property public final T! velocity;
+    property public final V velocityVector;
+  }
+
+  public final class AnimationStateKt {
+    method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> AnimationState(float initialValue, optional float initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> copy(androidx.compose.animation.core.AnimationState<T,V>, optional T? value, optional V? velocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> copy(androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D>, optional float value, optional float velocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> V createZeroVectorFrom(androidx.compose.animation.core.TwoWayConverter<T,V>, T? value);
+    method public static boolean isFinished(androidx.compose.animation.core.AnimationState<?,?>);
+  }
+
+  public abstract sealed class AnimationVector {
+  }
+
+  public final class AnimationVector1D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector1D(float initVal);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getValue();
+    method public androidx.compose.animation.core.AnimationVector1D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float value;
+  }
+
+  public final class AnimationVector2D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector2D(float v1, float v2);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getV1();
+    method public float getV2();
+    method public androidx.compose.animation.core.AnimationVector2D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+  }
+
+  public final class AnimationVector3D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector3D(float v1, float v2, float v3);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public androidx.compose.animation.core.AnimationVector3D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+    property public final float v3;
+  }
+
+  public final class AnimationVector4D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector4D(float v1, float v2, float v3, float v4);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public float getV4();
+    method public androidx.compose.animation.core.AnimationVector4D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+    property public final float v3;
+    property public final float v4;
+  }
+
+  public final class AnimationVectorsKt {
+    method public static androidx.compose.animation.core.AnimationVector1D AnimationVector(float v1);
+    method public static androidx.compose.animation.core.AnimationVector2D AnimationVector(float v1, float v2);
+    method public static androidx.compose.animation.core.AnimationVector3D AnimationVector(float v1, float v2, float v3);
+    method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
+  }
+
+  public final class ComplexDoubleKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
+    ctor public CubicBezierEasing(float a, float b, float c, float d);
+    method public float transform(float fraction);
+  }
+
+  public final class DecayAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+    ctor public DecayAnimation(androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+    ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+    ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+    method public long getDurationNanos();
+    method public T! getInitialValue();
+    method public V getInitialVelocityVector();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValueFromNanos(long playTimeNanos);
+    method public V getVelocityVectorFromNanos(long playTimeNanos);
+    method public boolean isInfinite();
+    property public long durationNanos;
+    property public final T! initialValue;
+    property public final V initialVelocityVector;
+    property public boolean isInfinite;
+    property public T! targetValue;
+    property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public interface DecayAnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter);
+  }
+
+  public final class DecayAnimationSpecKt {
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<T>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+    method public static float calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float>, float initialValue, float initialVelocity);
+    method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> exponentialDecay(optional float frictionMultiplier, optional float absVelocityThreshold);
+    method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> generateDecayAnimationSpec(androidx.compose.animation.core.FloatDecayAnimationSpec);
+  }
+
+  public interface DurationBasedAnimationSpec<T> extends androidx.compose.animation.core.FiniteAnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+  }
+
+  @androidx.compose.runtime.Stable public fun interface Easing {
+    method public float transform(float fraction);
+  }
+
+  public final class EasingKt {
+    method public static androidx.compose.animation.core.Easing getFastOutLinearInEasing();
+    method public static androidx.compose.animation.core.Easing getFastOutSlowInEasing();
+    method public static androidx.compose.animation.core.Easing getLinearEasing();
+    method public static androidx.compose.animation.core.Easing getLinearOutSlowInEasing();
+  }
+
+  public interface FiniteAnimationSpec<T> extends androidx.compose.animation.core.AnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+  }
+
+  public interface FloatAnimationSpec extends androidx.compose.animation.core.AnimationSpec<java.lang.Float> {
+    method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+    method public default float getEndVelocity(float initialValue, float targetValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public default <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFloatAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<java.lang.Float,V> converter);
+  }
+
+  public interface FloatDecayAnimationSpec {
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(float initialValue, float initialVelocity);
+    method public float getTargetValue(float initialValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    property public abstract float absVelocityThreshold;
+  }
+
+  public final class FloatDecayAnimationSpecKt {
+  }
+
+  public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+    ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(float initialValue, float initialVelocity);
+    method public float getTargetValue(float initialValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    property public float absVelocityThreshold;
+  }
+
+  public final class FloatSpringSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+    ctor public FloatSpringSpec(optional float dampingRatio, optional float stiffness, optional float visibilityThreshold);
+    method public float getDampingRatio();
+    method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+    method public float getStiffness();
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    property public final float dampingRatio;
+    property public final float stiffness;
+  }
+
+  public final class FloatTweenSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+    ctor public FloatTweenSpec(optional int duration, optional int delay, optional androidx.compose.animation.core.Easing easing);
+    method public int getDelay();
+    method public int getDuration();
+    method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    property public final int delay;
+    property public final int duration;
+  }
+
+  public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
+    method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+    method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+    property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+    field public static final androidx.compose.animation.core.InfiniteAnimationPolicy.Key Key;
+  }
+
+  public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.animation.core.InfiniteAnimationPolicy> {
+  }
+
+  public final class InfiniteAnimationPolicyKt {
+    method public static suspend inline <R> Object? withInfiniteAnimationFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    method public static suspend <R> Object? withInfiniteAnimationFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  public final class InfiniteRepeatableSpec<T> implements androidx.compose.animation.core.AnimationSpec<T> {
+    ctor public InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+    method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+    property public final androidx.compose.animation.core.RepeatMode repeatMode;
+  }
+
+  public final class InfiniteTransition {
+  }
+
+  public final class InfiniteTransitionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.InfiniteTransition, float initialValue, float targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<java.lang.Float> animationSpec);
+    method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.InfiniteTransition, T? initialValue, T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, androidx.compose.animation.core.InfiniteRepeatableSpec<T> animationSpec);
+    method @androidx.compose.runtime.Composable public static androidx.compose.animation.core.InfiniteTransition rememberInfiniteTransition();
+  }
+
+  @androidx.compose.runtime.Immutable public final class KeyframesSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+    ctor public KeyframesSpec(androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config);
+    method public androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> getConfig();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedKeyframesSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config;
+  }
+
+  public static final class KeyframesSpec.KeyframeEntity<T> {
+  }
+
+  public static final class KeyframesSpec.KeyframesSpecConfig<T> {
+    ctor public KeyframesSpec.KeyframesSpecConfig();
+    method public infix androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T> at(T?, int timeStamp);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public void setDelayMillis(int p);
+    method public void setDurationMillis(int p);
+    method public infix void with(androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T>, androidx.compose.animation.core.Easing easing);
+    property public final int delayMillis;
+    property public final int durationMillis;
+  }
+
+  public final class ManualFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public ManualFrameClock(optional long initialTime);
+    method public void advanceClock(long nanos);
+    method public long getCurrentTime();
+    method public boolean getHasAwaiters();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final long currentTime;
+    property public final boolean hasAwaiters;
+  }
+
+  public final class ManualFrameClockKt {
+    method public static void advanceClockMillis(androidx.compose.animation.core.ManualFrameClock, long millis);
+  }
+
+  public final class MutableTransitionState<S> {
+    ctor public MutableTransitionState(S? initialState);
+    method public S! getCurrentState();
+    method public S! getTargetState();
+    method public void setTargetState(S! p);
+    property public final S! currentState;
+    property public final S! targetState;
+  }
+
+  public enum RepeatMode {
+    enum_constant public static final androidx.compose.animation.core.RepeatMode Restart;
+    enum_constant public static final androidx.compose.animation.core.RepeatMode Reverse;
+  }
+
+  @androidx.compose.runtime.Immutable public final class RepeatableSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+    ctor public RepeatableSpec(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+    method public int getIterations();
+    method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+    property public final int iterations;
+    property public final androidx.compose.animation.core.RepeatMode repeatMode;
+  }
+
+  @androidx.compose.runtime.Immutable public final class SnapSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+    ctor public SnapSpec(optional int delay);
+    method public int getDelay();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final int delay;
+  }
+
+  public final class Spring {
+    field public static final float DampingRatioHighBouncy = 0.2f;
+    field public static final float DampingRatioLowBouncy = 0.75f;
+    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.compose.animation.core.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;
+    field public static final float StiffnessVeryLow = 50.0f;
+  }
+
+  public final class SpringEstimationKt {
+  }
+
+  public final class SpringSimulationKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+    ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+    method public float getDampingRatio();
+    method public float getStiffness();
+    method public T? getVisibilityThreshold();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedSpringSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final float dampingRatio;
+    property public final float stiffness;
+    property public final T? visibilityThreshold;
+  }
+
+  public final class SuspendAnimationKt {
+    method public static suspend Object? animate(float initialValue, float targetValue, optional float initialVelocity, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animate(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional T? initialVelocity, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, kotlin.jvm.functions.Function2<? super T,? super T,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? animateDecay(float initialValue, float initialVelocity, androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateDecay(androidx.compose.animation.core.AnimationState<T,V>, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateTo(androidx.compose.animation.core.AnimationState<T,V>, T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public final class TargetBasedAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+    ctor public TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional V? initialVelocityVector);
+    method public long getDurationNanos();
+    method public T! getInitialValue();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValueFromNanos(long playTimeNanos);
+    method public V getVelocityVectorFromNanos(long playTimeNanos);
+    method public boolean isInfinite();
+    property public long durationNanos;
+    property public final T! initialValue;
+    property public boolean isInfinite;
+    property public T! targetValue;
+    property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public final class Transition<S> {
+    method public S! getCurrentState();
+    method public String? getLabel();
+    method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
+    method public S! getTargetState();
+    method public boolean isRunning();
+    property public final S! currentState;
+    property public final boolean isRunning;
+    property public final String? label;
+    property public final androidx.compose.animation.core.Transition.Segment<S> segment;
+    property public final S! targetState;
+  }
+
+  public static final class Transition.Segment<S> {
+    ctor public Transition.Segment(S? initialState, S? targetState);
+    method public S! getInitialState();
+    method public S! getTargetState();
+    method public infix boolean isTransitioningTo(S?, S? targetState);
+    property public final S! initialState;
+    property public final S! targetState;
+  }
+
+  public final class TransitionKt {
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDp(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.Dp>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.Dp> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Float> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Integer> animateInt(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Integer>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Integer> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntOffset> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntSize> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Offset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Offset> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRect(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Rect>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Rect> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Size>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Size> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S, T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.Transition<S>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<T>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,? extends T> targetValueByState);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(T? targetState, optional String? label);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(androidx.compose.animation.core.MutableTransitionState<T> transitionState, optional String? label);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TweenSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+    ctor public TweenSpec(optional int durationMillis, optional int delay, optional androidx.compose.animation.core.Easing easing);
+    method public int getDelay();
+    method public int getDurationMillis();
+    method public androidx.compose.animation.core.Easing getEasing();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedTweenSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final int delay;
+    property public final int durationMillis;
+    property public final androidx.compose.animation.core.Easing easing;
+  }
+
+  public interface TwoWayConverter<T, V extends androidx.compose.animation.core.AnimationVector> {
+    method public kotlin.jvm.functions.Function1<V,T> getConvertFromVector();
+    method public kotlin.jvm.functions.Function1<T,V> getConvertToVector();
+    property public abstract kotlin.jvm.functions.Function1<V,T> convertFromVector;
+    property public abstract kotlin.jvm.functions.Function1<T,V> convertToVector;
+  }
+
+  public final class VectorConvertersKt {
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TwoWayConverter<T,V> TwoWayConverter(kotlin.jvm.functions.Function1<? super T,? extends V> convertToVector, kotlin.jvm.functions.Function1<? super V,? extends T> convertFromVector);
+    method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.FloatCompanionObject);
+    method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Integer,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.IntCompanionObject);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Rect,androidx.compose.animation.core.AnimationVector4D> getVectorConverter(androidx.compose.ui.geometry.Rect.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.Dp,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(androidx.compose.ui.unit.Dp.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.DpOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.DpOffset.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Size,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Size.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Offset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Offset.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntOffset.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntSize,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntSize.Companion);
+  }
+
+  public interface VectorizedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public default V getEndVelocity(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public boolean isInfinite();
+    property public abstract boolean isInfinite;
+  }
+
+  public final class VectorizedAnimationSpecKt {
+  }
+
+  public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(V initialValue, V initialVelocity);
+    method public V getTargetValue(V initialValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+    property public abstract float absVelocityThreshold;
+  }
+
+  public interface VectorizedDurationBasedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public default long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    property public abstract int delayMillis;
+    property public abstract int durationMillis;
+  }
+
+  public interface VectorizedFiniteAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+    method public default boolean isInfinite();
+    property public default boolean isInfinite;
+  }
+
+  public final class VectorizedFloatAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    ctor public VectorizedFloatAnimationSpec(androidx.compose.animation.core.FloatAnimationSpec anim);
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+  }
+
+  public final class VectorizedInfiniteRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+    ctor public VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public boolean isInfinite();
+    property public boolean isInfinite;
+  }
+
+  public final class VectorizedKeyframesSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+    ctor public VectorizedKeyframesSpec(java.util.Map<java.lang.Integer,? extends kotlin.Pair<? extends V,? extends androidx.compose.animation.core.Easing>> keyframes, int durationMillis, optional int delayMillis);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    property public int delayMillis;
+    property public int durationMillis;
+  }
+
+  public final class VectorizedRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    ctor public VectorizedRepeatableSpec(int iterations, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+  }
+
+  public final class VectorizedSnapSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+    ctor public VectorizedSnapSpec(optional int delayMillis);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    property public int delayMillis;
+    property public int durationMillis;
+  }
+
+  public final class VectorizedSpringSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    ctor public VectorizedSpringSpec(optional float dampingRatio, optional float stiffness, optional V? visibilityThreshold);
+    method public float getDampingRatio();
+    method public float getStiffness();
+    property public final float dampingRatio;
+    property public final float stiffness;
+  }
+
+  public final class VectorizedTweenSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+    ctor public VectorizedTweenSpec(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public androidx.compose.animation.core.Easing getEasing();
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    property public int delayMillis;
+    property public int durationMillis;
+    property public final androidx.compose.animation.core.Easing easing;
+  }
+
+  public final class VisibilityThresholdsKt {
+    method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntOffset.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Offset.Companion);
+    method public static int getVisibilityThreshold(kotlin.jvm.internal.IntCompanionObject);
+    method public static float getVisibilityThreshold(androidx.compose.ui.unit.Dp.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.unit.DpOffset.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Size.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntSize.Companion);
+    method public static androidx.compose.ui.geometry.Rect getVisibilityThreshold(androidx.compose.ui.geometry.Rect.Companion);
+  }
+
+}
+

compose/animation/animation-core/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/animation/animation-core/api/public_plus_experimental_1.0.0-beta04.txt b/compose/animation/animation-core/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..67580ac
--- /dev/null
+++ b/compose/animation/animation-core/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,665 @@
+// Signature format: 4.0
+package androidx.compose.animation.core {
+
+  public final class ActualJvmKt {
+  }
+
+  public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
+    ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
+    method public suspend Object? animateDecay(T? initialVelocity, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>> p);
+    method public suspend Object? animateTo(T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? initialVelocity, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>> p);
+    method public androidx.compose.runtime.State<T> asState();
+    method public T? getLowerBound();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T? getUpperBound();
+    method public T! getValue();
+    method public T! getVelocity();
+    method public V getVelocityVector();
+    method public boolean isRunning();
+    method public suspend Object? snapTo(T? targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? stop(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public void updateBounds(optional T? lowerBound, optional T? upperBound);
+    property public final boolean isRunning;
+    property public final T? lowerBound;
+    property public final T! targetValue;
+    property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+    property public final T? upperBound;
+    property public final T! value;
+    property public final T! velocity;
+    property public final V velocityVector;
+  }
+
+  public final class AnimatableKt {
+    method public static androidx.compose.animation.core.Animatable<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> Animatable(float initialValue, optional float visibilityThreshold);
+  }
+
+  public final class AnimateAsStateKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDpAsState-Lz7ev7o(float targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.Dp> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Dp,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloatAsState(float targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional float visibilityThreshold, optional kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Integer> animateIntAsState(int targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Integer> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffsetAsState-2AXSKHY(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntOffset,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSizeAsState-Cmzki-s(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffsetAsState-t81mtYE(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRectAsState(androidx.compose.ui.geometry.Rect targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Rect> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Rect,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSizeAsState-rlPqr8Y(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Size> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Size,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValueAsState(T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? visibilityThreshold, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? finishedListener);
+  }
+
+  public interface Animation<T, V extends androidx.compose.animation.core.AnimationVector> {
+    method public long getDurationNanos();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValueFromNanos(long playTimeNanos);
+    method public V getVelocityVectorFromNanos(long playTimeNanos);
+    method public default boolean isFinishedFromNanos(long playTimeNanos);
+    method public boolean isInfinite();
+    property public abstract long durationNanos;
+    property public abstract boolean isInfinite;
+    property public abstract T! targetValue;
+    property public abstract androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public final class AnimationConstants {
+    field public static final int DefaultDurationMillis = 300; // 0x12c
+    field public static final androidx.compose.animation.core.AnimationConstants INSTANCE;
+    field public static final long UnspecifiedTime = -9223372036854775808L; // 0x8000000000000000L
+  }
+
+  public enum AnimationEndReason {
+    enum_constant public static final androidx.compose.animation.core.AnimationEndReason BoundReached;
+    enum_constant public static final androidx.compose.animation.core.AnimationEndReason Finished;
+  }
+
+  public final class AnimationKt {
+    method public static androidx.compose.animation.core.DecayAnimation<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> DecayAnimation(androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, float initialValue, optional float initialVelocity);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TargetBasedAnimation<T,V> TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, T? initialVelocity);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! getVelocityFromNanos(androidx.compose.animation.core.Animation<T,V>, long playTimeNanos);
+  }
+
+  public final class AnimationResult<T, V extends androidx.compose.animation.core.AnimationVector> {
+    ctor public AnimationResult(androidx.compose.animation.core.AnimationState<T,V> endState, androidx.compose.animation.core.AnimationEndReason endReason);
+    method public androidx.compose.animation.core.AnimationEndReason getEndReason();
+    method public androidx.compose.animation.core.AnimationState<T,V> getEndState();
+    property public final androidx.compose.animation.core.AnimationEndReason endReason;
+    property public final androidx.compose.animation.core.AnimationState<T,V> endState;
+  }
+
+  public final class AnimationScope<T, V extends androidx.compose.animation.core.AnimationVector> {
+    method public void cancelAnimation();
+    method public long getFinishedTimeNanos();
+    method public long getLastFrameTimeNanos();
+    method public long getStartTimeNanos();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValue();
+    method public T! getVelocity();
+    method public V getVelocityVector();
+    method public boolean isRunning();
+    method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
+    property public final long finishedTimeNanos;
+    property public final boolean isRunning;
+    property public final long lastFrameTimeNanos;
+    property public final long startTimeNanos;
+    property public final T! targetValue;
+    property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+    property public final T! value;
+    property public final T! velocity;
+    property public final V velocityVector;
+  }
+
+  public interface AnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+  }
+
+  public final class AnimationSpecKt {
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.InfiniteRepeatableSpec<T> infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.KeyframesSpec<T> keyframes(kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T>,kotlin.Unit> init);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.RepeatableSpec<T> repeatable(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SnapSpec<T> snap(optional int delayMillis);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SpringSpec<T> spring(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.TweenSpec<T> tween(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+  }
+
+  public final class AnimationState<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.runtime.State<T> {
+    ctor public AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, optional V? initialVelocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public long getFinishedTimeNanos();
+    method public long getLastFrameTimeNanos();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValue();
+    method public T! getVelocity();
+    method public V getVelocityVector();
+    method public boolean isRunning();
+    property public final long finishedTimeNanos;
+    property public final boolean isRunning;
+    property public final long lastFrameTimeNanos;
+    property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+    property public T! value;
+    property public final T! velocity;
+    property public final V velocityVector;
+  }
+
+  public final class AnimationStateKt {
+    method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> AnimationState(float initialValue, optional float initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> copy(androidx.compose.animation.core.AnimationState<T,V>, optional T? value, optional V? velocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> copy(androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D>, optional float value, optional float velocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> V createZeroVectorFrom(androidx.compose.animation.core.TwoWayConverter<T,V>, T? value);
+    method public static boolean isFinished(androidx.compose.animation.core.AnimationState<?,?>);
+  }
+
+  public abstract sealed class AnimationVector {
+  }
+
+  public final class AnimationVector1D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector1D(float initVal);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getValue();
+    method public androidx.compose.animation.core.AnimationVector1D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float value;
+  }
+
+  public final class AnimationVector2D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector2D(float v1, float v2);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getV1();
+    method public float getV2();
+    method public androidx.compose.animation.core.AnimationVector2D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+  }
+
+  public final class AnimationVector3D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector3D(float v1, float v2, float v3);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public androidx.compose.animation.core.AnimationVector3D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+    property public final float v3;
+  }
+
+  public final class AnimationVector4D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector4D(float v1, float v2, float v3, float v4);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public float getV4();
+    method public androidx.compose.animation.core.AnimationVector4D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+    property public final float v3;
+    property public final float v4;
+  }
+
+  public final class AnimationVectorsKt {
+    method public static androidx.compose.animation.core.AnimationVector1D AnimationVector(float v1);
+    method public static androidx.compose.animation.core.AnimationVector2D AnimationVector(float v1, float v2);
+    method public static androidx.compose.animation.core.AnimationVector3D AnimationVector(float v1, float v2, float v3);
+    method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
+  }
+
+  public final class ComplexDoubleKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
+    ctor public CubicBezierEasing(float a, float b, float c, float d);
+    method public float transform(float fraction);
+  }
+
+  public final class DecayAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+    ctor public DecayAnimation(androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+    ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+    ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+    method public long getDurationNanos();
+    method public T! getInitialValue();
+    method public V getInitialVelocityVector();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValueFromNanos(long playTimeNanos);
+    method public V getVelocityVectorFromNanos(long playTimeNanos);
+    method public boolean isInfinite();
+    property public long durationNanos;
+    property public final T! initialValue;
+    property public final V initialVelocityVector;
+    property public boolean isInfinite;
+    property public T! targetValue;
+    property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public interface DecayAnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter);
+  }
+
+  public final class DecayAnimationSpecKt {
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<T>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+    method public static float calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float>, float initialValue, float initialVelocity);
+    method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> exponentialDecay(optional float frictionMultiplier, optional float absVelocityThreshold);
+    method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> generateDecayAnimationSpec(androidx.compose.animation.core.FloatDecayAnimationSpec);
+  }
+
+  public interface DurationBasedAnimationSpec<T> extends androidx.compose.animation.core.FiniteAnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+  }
+
+  @androidx.compose.runtime.Stable public fun interface Easing {
+    method public float transform(float fraction);
+  }
+
+  public final class EasingKt {
+    method public static androidx.compose.animation.core.Easing getFastOutLinearInEasing();
+    method public static androidx.compose.animation.core.Easing getFastOutSlowInEasing();
+    method public static androidx.compose.animation.core.Easing getLinearEasing();
+    method public static androidx.compose.animation.core.Easing getLinearOutSlowInEasing();
+  }
+
+  public interface FiniteAnimationSpec<T> extends androidx.compose.animation.core.AnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+  }
+
+  public interface FloatAnimationSpec extends androidx.compose.animation.core.AnimationSpec<java.lang.Float> {
+    method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+    method public default float getEndVelocity(float initialValue, float targetValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public default <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFloatAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<java.lang.Float,V> converter);
+  }
+
+  public interface FloatDecayAnimationSpec {
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(float initialValue, float initialVelocity);
+    method public float getTargetValue(float initialValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    property public abstract float absVelocityThreshold;
+  }
+
+  public final class FloatDecayAnimationSpecKt {
+  }
+
+  public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+    ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(float initialValue, float initialVelocity);
+    method public float getTargetValue(float initialValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    property public float absVelocityThreshold;
+  }
+
+  public final class FloatSpringSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+    ctor public FloatSpringSpec(optional float dampingRatio, optional float stiffness, optional float visibilityThreshold);
+    method public float getDampingRatio();
+    method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+    method public float getStiffness();
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    property public final float dampingRatio;
+    property public final float stiffness;
+  }
+
+  public final class FloatTweenSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+    ctor public FloatTweenSpec(optional int duration, optional int delay, optional androidx.compose.animation.core.Easing easing);
+    method public int getDelay();
+    method public int getDuration();
+    method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    property public final int delay;
+    property public final int duration;
+  }
+
+  public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
+    method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+    method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+    property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+    field public static final androidx.compose.animation.core.InfiniteAnimationPolicy.Key Key;
+  }
+
+  public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.animation.core.InfiniteAnimationPolicy> {
+  }
+
+  public final class InfiniteAnimationPolicyKt {
+    method public static suspend inline <R> Object? withInfiniteAnimationFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    method public static suspend <R> Object? withInfiniteAnimationFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  public final class InfiniteRepeatableSpec<T> implements androidx.compose.animation.core.AnimationSpec<T> {
+    ctor public InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+    method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+    property public final androidx.compose.animation.core.RepeatMode repeatMode;
+  }
+
+  public final class InfiniteTransition {
+  }
+
+  public final class InfiniteTransitionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.InfiniteTransition, float initialValue, float targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<java.lang.Float> animationSpec);
+    method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.InfiniteTransition, T? initialValue, T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, androidx.compose.animation.core.InfiniteRepeatableSpec<T> animationSpec);
+    method @androidx.compose.runtime.Composable public static androidx.compose.animation.core.InfiniteTransition rememberInfiniteTransition();
+  }
+
+  @kotlin.RequiresOptIn(message="This API is internal to library.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface InternalAnimationApi {
+  }
+
+  @androidx.compose.runtime.Immutable public final class KeyframesSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+    ctor public KeyframesSpec(androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config);
+    method public androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> getConfig();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedKeyframesSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config;
+  }
+
+  public static final class KeyframesSpec.KeyframeEntity<T> {
+  }
+
+  public static final class KeyframesSpec.KeyframesSpecConfig<T> {
+    ctor public KeyframesSpec.KeyframesSpecConfig();
+    method public infix androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T> at(T?, int timeStamp);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public void setDelayMillis(int p);
+    method public void setDurationMillis(int p);
+    method public infix void with(androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T>, androidx.compose.animation.core.Easing easing);
+    property public final int delayMillis;
+    property public final int durationMillis;
+  }
+
+  public final class ManualFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public ManualFrameClock(optional long initialTime);
+    method public void advanceClock(long nanos);
+    method public long getCurrentTime();
+    method public boolean getHasAwaiters();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final long currentTime;
+    property public final boolean hasAwaiters;
+  }
+
+  public final class ManualFrameClockKt {
+    method public static void advanceClockMillis(androidx.compose.animation.core.ManualFrameClock, long millis);
+  }
+
+  public final class MutableTransitionState<S> {
+    ctor public MutableTransitionState(S? initialState);
+    method public S! getCurrentState();
+    method public S! getTargetState();
+    method public void setTargetState(S! p);
+    property public final S! currentState;
+    property public final S! targetState;
+  }
+
+  public enum RepeatMode {
+    enum_constant public static final androidx.compose.animation.core.RepeatMode Restart;
+    enum_constant public static final androidx.compose.animation.core.RepeatMode Reverse;
+  }
+
+  @androidx.compose.runtime.Immutable public final class RepeatableSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+    ctor public RepeatableSpec(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+    method public int getIterations();
+    method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+    property public final int iterations;
+    property public final androidx.compose.animation.core.RepeatMode repeatMode;
+  }
+
+  @androidx.compose.runtime.Immutable public final class SnapSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+    ctor public SnapSpec(optional int delay);
+    method public int getDelay();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final int delay;
+  }
+
+  public final class Spring {
+    field public static final float DampingRatioHighBouncy = 0.2f;
+    field public static final float DampingRatioLowBouncy = 0.75f;
+    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.compose.animation.core.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;
+    field public static final float StiffnessVeryLow = 50.0f;
+  }
+
+  public final class SpringEstimationKt {
+  }
+
+  public final class SpringSimulationKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+    ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+    method public float getDampingRatio();
+    method public float getStiffness();
+    method public T? getVisibilityThreshold();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedSpringSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final float dampingRatio;
+    property public final float stiffness;
+    property public final T? visibilityThreshold;
+  }
+
+  public final class SuspendAnimationKt {
+    method public static suspend Object? animate(float initialValue, float targetValue, optional float initialVelocity, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animate(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional T? initialVelocity, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, kotlin.jvm.functions.Function2<? super T,? super T,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? animateDecay(float initialValue, float initialVelocity, androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateDecay(androidx.compose.animation.core.AnimationState<T,V>, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateTo(androidx.compose.animation.core.AnimationState<T,V>, T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public final class TargetBasedAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+    ctor public TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional V? initialVelocityVector);
+    method public long getDurationNanos();
+    method public T! getInitialValue();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValueFromNanos(long playTimeNanos);
+    method public V getVelocityVectorFromNanos(long playTimeNanos);
+    method public boolean isInfinite();
+    property public long durationNanos;
+    property public final T! initialValue;
+    property public boolean isInfinite;
+    property public T! targetValue;
+    property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public final class Transition<S> {
+    method public S! getCurrentState();
+    method public String? getLabel();
+    method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
+    method public S! getTargetState();
+    method public boolean isRunning();
+    property public final S! currentState;
+    property public final boolean isRunning;
+    property public final String? label;
+    property public final androidx.compose.animation.core.Transition.Segment<S> segment;
+    property public final S! targetState;
+  }
+
+  public static final class Transition.Segment<S> {
+    ctor public Transition.Segment(S? initialState, S? targetState);
+    method public S! getInitialState();
+    method public S! getTargetState();
+    method public infix boolean isTransitioningTo(S?, S? targetState);
+    property public final S! initialState;
+    property public final S! targetState;
+  }
+
+  public final class TransitionKt {
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDp(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.Dp>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.Dp> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Float> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Integer> animateInt(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Integer>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Integer> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntOffset> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntSize> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Offset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Offset> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRect(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Rect>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Rect> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Size>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Size> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S, T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.Transition<S>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<T>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,? extends T> targetValueByState);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(T? targetState, optional String? label);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(androidx.compose.animation.core.MutableTransitionState<T> transitionState, optional String? label);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TweenSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+    ctor public TweenSpec(optional int durationMillis, optional int delay, optional androidx.compose.animation.core.Easing easing);
+    method public int getDelay();
+    method public int getDurationMillis();
+    method public androidx.compose.animation.core.Easing getEasing();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedTweenSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final int delay;
+    property public final int durationMillis;
+    property public final androidx.compose.animation.core.Easing easing;
+  }
+
+  public interface TwoWayConverter<T, V extends androidx.compose.animation.core.AnimationVector> {
+    method public kotlin.jvm.functions.Function1<V,T> getConvertFromVector();
+    method public kotlin.jvm.functions.Function1<T,V> getConvertToVector();
+    property public abstract kotlin.jvm.functions.Function1<V,T> convertFromVector;
+    property public abstract kotlin.jvm.functions.Function1<T,V> convertToVector;
+  }
+
+  public final class VectorConvertersKt {
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TwoWayConverter<T,V> TwoWayConverter(kotlin.jvm.functions.Function1<? super T,? extends V> convertToVector, kotlin.jvm.functions.Function1<? super V,? extends T> convertFromVector);
+    method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.FloatCompanionObject);
+    method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Integer,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.IntCompanionObject);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Rect,androidx.compose.animation.core.AnimationVector4D> getVectorConverter(androidx.compose.ui.geometry.Rect.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.Dp,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(androidx.compose.ui.unit.Dp.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.DpOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.DpOffset.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Size,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Size.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Offset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Offset.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntOffset.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntSize,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntSize.Companion);
+  }
+
+  public interface VectorizedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public default V getEndVelocity(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public boolean isInfinite();
+    property public abstract boolean isInfinite;
+  }
+
+  public final class VectorizedAnimationSpecKt {
+  }
+
+  public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(V initialValue, V initialVelocity);
+    method public V getTargetValue(V initialValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+    property public abstract float absVelocityThreshold;
+  }
+
+  public interface VectorizedDurationBasedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public default long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    property public abstract int delayMillis;
+    property public abstract int durationMillis;
+  }
+
+  public interface VectorizedFiniteAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+    method public default boolean isInfinite();
+    property public default boolean isInfinite;
+  }
+
+  public final class VectorizedFloatAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    ctor public VectorizedFloatAnimationSpec(androidx.compose.animation.core.FloatAnimationSpec anim);
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+  }
+
+  public final class VectorizedInfiniteRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+    ctor public VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public boolean isInfinite();
+    property public boolean isInfinite;
+  }
+
+  public final class VectorizedKeyframesSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+    ctor public VectorizedKeyframesSpec(java.util.Map<java.lang.Integer,? extends kotlin.Pair<? extends V,? extends androidx.compose.animation.core.Easing>> keyframes, int durationMillis, optional int delayMillis);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    property public int delayMillis;
+    property public int durationMillis;
+  }
+
+  public final class VectorizedRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    ctor public VectorizedRepeatableSpec(int iterations, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+  }
+
+  public final class VectorizedSnapSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+    ctor public VectorizedSnapSpec(optional int delayMillis);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    property public int delayMillis;
+    property public int durationMillis;
+  }
+
+  public final class VectorizedSpringSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    ctor public VectorizedSpringSpec(optional float dampingRatio, optional float stiffness, optional V? visibilityThreshold);
+    method public float getDampingRatio();
+    method public float getStiffness();
+    property public final float dampingRatio;
+    property public final float stiffness;
+  }
+
+  public final class VectorizedTweenSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+    ctor public VectorizedTweenSpec(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public androidx.compose.animation.core.Easing getEasing();
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    property public int delayMillis;
+    property public int durationMillis;
+    property public final androidx.compose.animation.core.Easing easing;
+  }
+
+  public final class VisibilityThresholdsKt {
+    method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntOffset.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Offset.Companion);
+    method public static int getVisibilityThreshold(kotlin.jvm.internal.IntCompanionObject);
+    method public static float getVisibilityThreshold(androidx.compose.ui.unit.Dp.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.unit.DpOffset.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Size.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntSize.Companion);
+    method public static androidx.compose.ui.geometry.Rect getVisibilityThreshold(androidx.compose.ui.geometry.Rect.Companion);
+  }
+
+}
+

compose/animation/animation-core/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/animation/animation-core/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/animation/animation-core/api/res-1.0.0-beta04.txt

compose/animation/animation-core/api/restricted_1.0.0-beta04.txt

diff --git a/compose/animation/animation-core/api/restricted_1.0.0-beta04.txt b/compose/animation/animation-core/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..3062208
--- /dev/null
+++ b/compose/animation/animation-core/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,665 @@
+// Signature format: 4.0
+package androidx.compose.animation.core {
+
+  public final class ActualJvmKt {
+  }
+
+  public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
+    ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
+    method public suspend Object? animateDecay(T? initialVelocity, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>> p);
+    method public suspend Object? animateTo(T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? initialVelocity, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>> p);
+    method public androidx.compose.runtime.State<T> asState();
+    method public T? getLowerBound();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T? getUpperBound();
+    method public T! getValue();
+    method public T! getVelocity();
+    method public V getVelocityVector();
+    method public boolean isRunning();
+    method public suspend Object? snapTo(T? targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? stop(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public void updateBounds(optional T? lowerBound, optional T? upperBound);
+    property public final boolean isRunning;
+    property public final T? lowerBound;
+    property public final T! targetValue;
+    property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+    property public final T? upperBound;
+    property public final T! value;
+    property public final T! velocity;
+    property public final V velocityVector;
+  }
+
+  public final class AnimatableKt {
+    method public static androidx.compose.animation.core.Animatable<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> Animatable(float initialValue, optional float visibilityThreshold);
+  }
+
+  public final class AnimateAsStateKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDpAsState-Lz7ev7o(float targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.Dp> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Dp,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloatAsState(float targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional float visibilityThreshold, optional kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Integer> animateIntAsState(int targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Integer> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffsetAsState-2AXSKHY(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntOffset,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSizeAsState-Cmzki-s(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffsetAsState-t81mtYE(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRectAsState(androidx.compose.ui.geometry.Rect targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Rect> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Rect,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSizeAsState-rlPqr8Y(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Size> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Size,kotlin.Unit>? finishedListener);
+    method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValueAsState(T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? visibilityThreshold, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? finishedListener);
+  }
+
+  public interface Animation<T, V extends androidx.compose.animation.core.AnimationVector> {
+    method public long getDurationNanos();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValueFromNanos(long playTimeNanos);
+    method public V getVelocityVectorFromNanos(long playTimeNanos);
+    method public default boolean isFinishedFromNanos(long playTimeNanos);
+    method public boolean isInfinite();
+    property public abstract long durationNanos;
+    property public abstract boolean isInfinite;
+    property public abstract T! targetValue;
+    property public abstract androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public final class AnimationConstants {
+    field public static final int DefaultDurationMillis = 300; // 0x12c
+    field public static final androidx.compose.animation.core.AnimationConstants INSTANCE;
+    field public static final long UnspecifiedTime = -9223372036854775808L; // 0x8000000000000000L
+  }
+
+  public enum AnimationEndReason {
+    enum_constant public static final androidx.compose.animation.core.AnimationEndReason BoundReached;
+    enum_constant public static final androidx.compose.animation.core.AnimationEndReason Finished;
+  }
+
+  public final class AnimationKt {
+    method public static androidx.compose.animation.core.DecayAnimation<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> DecayAnimation(androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, float initialValue, optional float initialVelocity);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TargetBasedAnimation<T,V> TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, T? initialVelocity);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! getVelocityFromNanos(androidx.compose.animation.core.Animation<T,V>, long playTimeNanos);
+  }
+
+  public final class AnimationResult<T, V extends androidx.compose.animation.core.AnimationVector> {
+    ctor public AnimationResult(androidx.compose.animation.core.AnimationState<T,V> endState, androidx.compose.animation.core.AnimationEndReason endReason);
+    method public androidx.compose.animation.core.AnimationEndReason getEndReason();
+    method public androidx.compose.animation.core.AnimationState<T,V> getEndState();
+    property public final androidx.compose.animation.core.AnimationEndReason endReason;
+    property public final androidx.compose.animation.core.AnimationState<T,V> endState;
+  }
+
+  public final class AnimationScope<T, V extends androidx.compose.animation.core.AnimationVector> {
+    method public void cancelAnimation();
+    method public long getFinishedTimeNanos();
+    method public long getLastFrameTimeNanos();
+    method public long getStartTimeNanos();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValue();
+    method public T! getVelocity();
+    method public V getVelocityVector();
+    method public boolean isRunning();
+    method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
+    property public final long finishedTimeNanos;
+    property public final boolean isRunning;
+    property public final long lastFrameTimeNanos;
+    property public final long startTimeNanos;
+    property public final T! targetValue;
+    property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+    property public final T! value;
+    property public final T! velocity;
+    property public final V velocityVector;
+  }
+
+  public interface AnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+  }
+
+  public final class AnimationSpecKt {
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.InfiniteRepeatableSpec<T> infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.KeyframesSpec<T> keyframes(kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T>,kotlin.Unit> init);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.RepeatableSpec<T> repeatable(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SnapSpec<T> snap(optional int delayMillis);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SpringSpec<T> spring(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+    method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.TweenSpec<T> tween(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+  }
+
+  public final class AnimationState<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.runtime.State<T> {
+    ctor public AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, optional V? initialVelocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public long getFinishedTimeNanos();
+    method public long getLastFrameTimeNanos();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValue();
+    method public T! getVelocity();
+    method public V getVelocityVector();
+    method public boolean isRunning();
+    property public final long finishedTimeNanos;
+    property public final boolean isRunning;
+    property public final long lastFrameTimeNanos;
+    property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+    property public T! value;
+    property public final T! velocity;
+    property public final V velocityVector;
+  }
+
+  public final class AnimationStateKt {
+    method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> AnimationState(float initialValue, optional float initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> copy(androidx.compose.animation.core.AnimationState<T,V>, optional T? value, optional V? velocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> copy(androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D>, optional float value, optional float velocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> V createZeroVectorFrom(androidx.compose.animation.core.TwoWayConverter<T,V>, T? value);
+    method public static boolean isFinished(androidx.compose.animation.core.AnimationState<?,?>);
+  }
+
+  public abstract sealed class AnimationVector {
+  }
+
+  public final class AnimationVector1D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector1D(float initVal);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getValue();
+    method public androidx.compose.animation.core.AnimationVector1D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float value;
+  }
+
+  public final class AnimationVector2D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector2D(float v1, float v2);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getV1();
+    method public float getV2();
+    method public androidx.compose.animation.core.AnimationVector2D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+  }
+
+  public final class AnimationVector3D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector3D(float v1, float v2, float v3);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public androidx.compose.animation.core.AnimationVector3D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+    property public final float v3;
+  }
+
+  public final class AnimationVector4D extends androidx.compose.animation.core.AnimationVector {
+    ctor public AnimationVector4D(float v1, float v2, float v3, float v4);
+    method public float get$metalava_module(int index);
+    method public int getSize$metalava_module();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public float getV4();
+    method public androidx.compose.animation.core.AnimationVector4D newVector$metalava_module();
+    method public void reset$metalava_module();
+    method public void set$metalava_module(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+    property public final float v3;
+    property public final float v4;
+  }
+
+  public final class AnimationVectorsKt {
+    method public static androidx.compose.animation.core.AnimationVector1D AnimationVector(float v1);
+    method public static androidx.compose.animation.core.AnimationVector2D AnimationVector(float v1, float v2);
+    method public static androidx.compose.animation.core.AnimationVector3D AnimationVector(float v1, float v2, float v3);
+    method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
+  }
+
+  public final class ComplexDoubleKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
+    ctor public CubicBezierEasing(float a, float b, float c, float d);
+    method public float transform(float fraction);
+  }
+
+  public final class DecayAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+    ctor public DecayAnimation(androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+    ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+    ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+    method public long getDurationNanos();
+    method public T! getInitialValue();
+    method public V getInitialVelocityVector();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValueFromNanos(long playTimeNanos);
+    method public V getVelocityVectorFromNanos(long playTimeNanos);
+    method public boolean isInfinite();
+    property public long durationNanos;
+    property public final T! initialValue;
+    property public final V initialVelocityVector;
+    property public boolean isInfinite;
+    property public T! targetValue;
+    property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public interface DecayAnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter);
+  }
+
+  public final class DecayAnimationSpecKt {
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<T>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+    method public static float calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float>, float initialValue, float initialVelocity);
+    method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> exponentialDecay(optional float frictionMultiplier, optional float absVelocityThreshold);
+    method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> generateDecayAnimationSpec(androidx.compose.animation.core.FloatDecayAnimationSpec);
+  }
+
+  public interface DurationBasedAnimationSpec<T> extends androidx.compose.animation.core.FiniteAnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+  }
+
+  @androidx.compose.runtime.Stable public fun interface Easing {
+    method public float transform(float fraction);
+  }
+
+  public final class EasingKt {
+    method public static androidx.compose.animation.core.Easing getFastOutLinearInEasing();
+    method public static androidx.compose.animation.core.Easing getFastOutSlowInEasing();
+    method public static androidx.compose.animation.core.Easing getLinearEasing();
+    method public static androidx.compose.animation.core.Easing getLinearOutSlowInEasing();
+  }
+
+  public interface FiniteAnimationSpec<T> extends androidx.compose.animation.core.AnimationSpec<T> {
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+  }
+
+  public interface FloatAnimationSpec extends androidx.compose.animation.core.AnimationSpec<java.lang.Float> {
+    method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+    method public default float getEndVelocity(float initialValue, float targetValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public default <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFloatAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<java.lang.Float,V> converter);
+  }
+
+  public interface FloatDecayAnimationSpec {
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(float initialValue, float initialVelocity);
+    method public float getTargetValue(float initialValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    property public abstract float absVelocityThreshold;
+  }
+
+  public final class FloatDecayAnimationSpecKt {
+  }
+
+  public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+    ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(float initialValue, float initialVelocity);
+    method public float getTargetValue(float initialValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    property public float absVelocityThreshold;
+  }
+
+  public final class FloatSpringSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+    ctor public FloatSpringSpec(optional float dampingRatio, optional float stiffness, optional float visibilityThreshold);
+    method public float getDampingRatio();
+    method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+    method public float getStiffness();
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    property public final float dampingRatio;
+    property public final float stiffness;
+  }
+
+  public final class FloatTweenSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+    ctor public FloatTweenSpec(optional int duration, optional int delay, optional androidx.compose.animation.core.Easing easing);
+    method public int getDelay();
+    method public int getDuration();
+    method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+    property public final int delay;
+    property public final int duration;
+  }
+
+  public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
+    method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+    method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+    property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+    field public static final androidx.compose.animation.core.InfiniteAnimationPolicy.Key Key;
+  }
+
+  public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.animation.core.InfiniteAnimationPolicy> {
+  }
+
+  public final class InfiniteAnimationPolicyKt {
+    method public static suspend inline <R> Object? withInfiniteAnimationFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    method public static suspend <R> Object? withInfiniteAnimationFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  public final class InfiniteRepeatableSpec<T> implements androidx.compose.animation.core.AnimationSpec<T> {
+    ctor public InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+    method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+    property public final androidx.compose.animation.core.RepeatMode repeatMode;
+  }
+
+  public final class InfiniteTransition {
+  }
+
+  public final class InfiniteTransitionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.InfiniteTransition, float initialValue, float targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<java.lang.Float> animationSpec);
+    method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.InfiniteTransition, T? initialValue, T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, androidx.compose.animation.core.InfiniteRepeatableSpec<T> animationSpec);
+    method @androidx.compose.runtime.Composable public static androidx.compose.animation.core.InfiniteTransition rememberInfiniteTransition();
+  }
+
+  @androidx.compose.runtime.Immutable public final class KeyframesSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+    ctor public KeyframesSpec(androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config);
+    method public androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> getConfig();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedKeyframesSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config;
+  }
+
+  public static final class KeyframesSpec.KeyframeEntity<T> {
+  }
+
+  public static final class KeyframesSpec.KeyframesSpecConfig<T> {
+    ctor public KeyframesSpec.KeyframesSpecConfig();
+    method public infix androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T> at(T?, int timeStamp);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public void setDelayMillis(int p);
+    method public void setDurationMillis(int p);
+    method public infix void with(androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T>, androidx.compose.animation.core.Easing easing);
+    property public final int delayMillis;
+    property public final int durationMillis;
+  }
+
+  public final class ManualFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public ManualFrameClock(optional long initialTime);
+    method public void advanceClock(long nanos);
+    method public long getCurrentTime();
+    method public boolean getHasAwaiters();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final long currentTime;
+    property public final boolean hasAwaiters;
+  }
+
+  public final class ManualFrameClockKt {
+    method public static void advanceClockMillis(androidx.compose.animation.core.ManualFrameClock, long millis);
+  }
+
+  public final class MutableTransitionState<S> {
+    ctor public MutableTransitionState(S? initialState);
+    method public S! getCurrentState();
+    method public S! getTargetState();
+    method public void setTargetState(S! p);
+    property public final S! currentState;
+    property public final S! targetState;
+  }
+
+  public enum RepeatMode {
+    enum_constant public static final androidx.compose.animation.core.RepeatMode Restart;
+    enum_constant public static final androidx.compose.animation.core.RepeatMode Reverse;
+  }
+
+  @androidx.compose.runtime.Immutable public final class RepeatableSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+    ctor public RepeatableSpec(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+    method public int getIterations();
+    method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+    property public final int iterations;
+    property public final androidx.compose.animation.core.RepeatMode repeatMode;
+  }
+
+  @androidx.compose.runtime.Immutable public final class SnapSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+    ctor public SnapSpec(optional int delay);
+    method public int getDelay();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final int delay;
+  }
+
+  public final class Spring {
+    field public static final float DampingRatioHighBouncy = 0.2f;
+    field public static final float DampingRatioLowBouncy = 0.75f;
+    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.compose.animation.core.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;
+    field public static final float StiffnessVeryLow = 50.0f;
+  }
+
+  public final class SpringEstimationKt {
+  }
+
+  public final class SpringSimulationKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+    ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+    method public float getDampingRatio();
+    method public float getStiffness();
+    method public T? getVisibilityThreshold();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedSpringSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final float dampingRatio;
+    property public final float stiffness;
+    property public final T? visibilityThreshold;
+  }
+
+  public final class SuspendAnimationKt {
+    method public static suspend Object? animate(float initialValue, float targetValue, optional float initialVelocity, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animate(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional T? initialVelocity, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, kotlin.jvm.functions.Function2<? super T,? super T,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? animateDecay(float initialValue, float initialVelocity, androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateDecay(androidx.compose.animation.core.AnimationState<T,V>, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateTo(androidx.compose.animation.core.AnimationState<T,V>, T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public final class TargetBasedAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+    ctor public TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional V? initialVelocityVector);
+    method public long getDurationNanos();
+    method public T! getInitialValue();
+    method public T! getTargetValue();
+    method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+    method public T! getValueFromNanos(long playTimeNanos);
+    method public V getVelocityVectorFromNanos(long playTimeNanos);
+    method public boolean isInfinite();
+    property public long durationNanos;
+    property public final T! initialValue;
+    property public boolean isInfinite;
+    property public T! targetValue;
+    property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public final class Transition<S> {
+    method @kotlin.PublishedApi internal boolean addAnimation(androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?> animation);
+    method public S! getCurrentState();
+    method public String? getLabel();
+    method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
+    method public S! getTargetState();
+    method public boolean isRunning();
+    method @kotlin.PublishedApi internal void removeAnimation(androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?> animation);
+    property public final S! currentState;
+    property public final boolean isRunning;
+    property public final String? label;
+    property public final androidx.compose.animation.core.Transition.Segment<S> segment;
+    property public final S! targetState;
+    field @kotlin.PublishedApi internal final androidx.compose.runtime.MutableState isSeeking$delegate;
+  }
+
+  public static final class Transition.Segment<S> {
+    ctor public Transition.Segment(S? initialState, S? targetState);
+    method public S! getInitialState();
+    method public S! getTargetState();
+    method public infix boolean isTransitioningTo(S?, S? targetState);
+    property public final S! initialState;
+    property public final S! targetState;
+  }
+
+  public final class TransitionKt {
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDp(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.Dp>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.Dp> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Float> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Integer> animateInt(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Integer>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Integer> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntOffset> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntSize> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Offset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Offset> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRect(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Rect>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Rect> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Size>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Size> targetValueByState);
+    method @androidx.compose.runtime.Composable public static inline <S, T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.Transition<S>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<T>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,? extends T> targetValueByState);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(T? targetState, optional String? label);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(androidx.compose.animation.core.MutableTransitionState<T> transitionState, optional String? label);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TweenSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+    ctor public TweenSpec(optional int durationMillis, optional int delay, optional androidx.compose.animation.core.Easing easing);
+    method public int getDelay();
+    method public int getDurationMillis();
+    method public androidx.compose.animation.core.Easing getEasing();
+    method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedTweenSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+    property public final int delay;
+    property public final int durationMillis;
+    property public final androidx.compose.animation.core.Easing easing;
+  }
+
+  public interface TwoWayConverter<T, V extends androidx.compose.animation.core.AnimationVector> {
+    method public kotlin.jvm.functions.Function1<V,T> getConvertFromVector();
+    method public kotlin.jvm.functions.Function1<T,V> getConvertToVector();
+    property public abstract kotlin.jvm.functions.Function1<V,T> convertFromVector;
+    property public abstract kotlin.jvm.functions.Function1<T,V> convertToVector;
+  }
+
+  public final class VectorConvertersKt {
+    method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TwoWayConverter<T,V> TwoWayConverter(kotlin.jvm.functions.Function1<? super T,? extends V> convertToVector, kotlin.jvm.functions.Function1<? super V,? extends T> convertFromVector);
+    method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.FloatCompanionObject);
+    method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Integer,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.IntCompanionObject);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Rect,androidx.compose.animation.core.AnimationVector4D> getVectorConverter(androidx.compose.ui.geometry.Rect.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.Dp,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(androidx.compose.ui.unit.Dp.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.DpOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.DpOffset.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Size,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Size.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Offset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Offset.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntOffset.Companion);
+    method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntSize,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntSize.Companion);
+  }
+
+  public interface VectorizedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public default V getEndVelocity(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public boolean isInfinite();
+    property public abstract boolean isInfinite;
+  }
+
+  public final class VectorizedAnimationSpecKt {
+  }
+
+  public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(V initialValue, V initialVelocity);
+    method public V getTargetValue(V initialValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+    property public abstract float absVelocityThreshold;
+  }
+
+  public interface VectorizedDurationBasedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public default long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    property public abstract int delayMillis;
+    property public abstract int durationMillis;
+  }
+
+  public interface VectorizedFiniteAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+    method public default boolean isInfinite();
+    property public default boolean isInfinite;
+  }
+
+  public final class VectorizedFloatAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    ctor public VectorizedFloatAnimationSpec(androidx.compose.animation.core.FloatAnimationSpec anim);
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+  }
+
+  public final class VectorizedInfiniteRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+    ctor public VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public boolean isInfinite();
+    property public boolean isInfinite;
+  }
+
+  public final class VectorizedKeyframesSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+    ctor public VectorizedKeyframesSpec(java.util.Map<java.lang.Integer,? extends kotlin.Pair<? extends V,? extends androidx.compose.animation.core.Easing>> keyframes, int durationMillis, optional int delayMillis);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    property public int delayMillis;
+    property public int durationMillis;
+  }
+
+  public final class VectorizedRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    ctor public VectorizedRepeatableSpec(int iterations, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+    method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+  }
+
+  public final class VectorizedSnapSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+    ctor public VectorizedSnapSpec(optional int delayMillis);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    property public int delayMillis;
+    property public int durationMillis;
+  }
+
+  public final class VectorizedSpringSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+    ctor public VectorizedSpringSpec(optional float dampingRatio, optional float stiffness, optional V? visibilityThreshold);
+    method public float getDampingRatio();
+    method public float getStiffness();
+    property public final float dampingRatio;
+    property public final float stiffness;
+  }
+
+  public final class VectorizedTweenSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+    ctor public VectorizedTweenSpec(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+    method public int getDelayMillis();
+    method public int getDurationMillis();
+    method public androidx.compose.animation.core.Easing getEasing();
+    method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+    property public int delayMillis;
+    property public int durationMillis;
+    property public final androidx.compose.animation.core.Easing easing;
+  }
+
+  public final class VisibilityThresholdsKt {
+    method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntOffset.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Offset.Companion);
+    method public static int getVisibilityThreshold(kotlin.jvm.internal.IntCompanionObject);
+    method public static float getVisibilityThreshold(androidx.compose.ui.unit.Dp.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.unit.DpOffset.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Size.Companion);
+    method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntSize.Companion);
+    method public static androidx.compose.ui.geometry.Rect getVisibilityThreshold(androidx.compose.ui.geometry.Rect.Companion);
+  }
+
+}
+

compose/animation/animation-core/build.gradle

diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle
index ded35c3..ef336ff 100644
--- a/compose/animation/animation-core/build.gradle
+++ b/compose/animation/animation-core/build.gradle
@@ -59,6 +59,8 @@
         androidTestImplementation(JUNIT)
         androidTestImplementation(project(":compose:animation:animation"))
         androidTestImplementation(project(":compose:ui:ui-test-junit4"))
+
+        lintPublish project(":compose:animation:animation-core-lint")
     }
 }
 

compose/animation/animation/api/1.0.0-beta04.txt

diff --git a/compose/animation/animation/api/1.0.0-beta04.txt b/compose/animation/animation/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..83b6f53
--- /dev/null
+++ b/compose/animation/animation/api/1.0.0-beta04.txt
@@ -0,0 +1,57 @@
+// Signature format: 4.0
+package androidx.compose.animation {
+
+  public final class AndroidActualDefaultDecayAnimationSpec_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> defaultDecayAnimationSpec();
+  }
+
+  public final class AndroidFlingCalculator_androidKt {
+  }
+
+  public final class AndroidFlingSpline_androidKt {
+  }
+
+  public final class AnimatedVisibilityKt {
+  }
+
+  public final class AnimationModifierKt {
+    method public static androidx.compose.ui.Modifier animateContentSize(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function2<? super androidx.compose.ui.unit.IntSize,? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+  }
+
+  public final class ColorVectorConverterKt {
+    method public static kotlin.jvm.functions.Function1<androidx.compose.ui.graphics.colorspace.ColorSpace,androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D>> getVectorConverter(androidx.compose.ui.graphics.Color.Companion);
+  }
+
+  public final class CrossfadeKt {
+    method @androidx.compose.runtime.Composable public static <T> void Crossfade(T? targetState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> content);
+  }
+
+  public final class EnterExitTransitionKt {
+  }
+
+  public final class SingleValueAnimationKt {
+    method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable-8_81llA(long initialValue);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState-m3E411Q(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
+  }
+
+  public final class SplineBasedFloatDecayAnimationSpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+    ctor public SplineBasedFloatDecayAnimationSpec(androidx.compose.ui.unit.Density density);
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(float initialValue, float initialVelocity);
+    method public float getTargetValue(float initialValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    property public float absVelocityThreshold;
+  }
+
+  public final class SplineBasedFloatDecayAnimationSpec_androidKt {
+    method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> splineBasedDecay(androidx.compose.ui.unit.Density density);
+  }
+
+  public final class TransitionKt {
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.graphics.Color>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.graphics.Color> targetValueByState);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor-Baa6hxQ(androidx.compose.animation.core.InfiniteTransition, long initialValue, long targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<androidx.compose.ui.graphics.Color> animationSpec);
+  }
+
+}
+

compose/animation/animation/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/animation/animation/api/public_plus_experimental_1.0.0-beta04.txt b/compose/animation/animation/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..b18b405
--- /dev/null
+++ b/compose/animation/animation/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,85 @@
+// Signature format: 4.0
+package androidx.compose.animation {
+
+  public final class AndroidActualDefaultDecayAnimationSpec_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> defaultDecayAnimationSpec();
+  }
+
+  public final class AndroidFlingCalculator_androidKt {
+  }
+
+  public final class AndroidFlingSpline_androidKt {
+  }
+
+  public final class AnimatedVisibilityKt {
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static void AnimatedVisibility(boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional boolean initiallyVisible, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.RowScope, boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional boolean initiallyVisible, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.ColumnScope, boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional boolean initiallyVisible, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class AnimationModifierKt {
+    method public static androidx.compose.ui.Modifier animateContentSize(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function2<? super androidx.compose.ui.unit.IntSize,? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+  }
+
+  public final class ColorVectorConverterKt {
+    method public static kotlin.jvm.functions.Function1<androidx.compose.ui.graphics.colorspace.ColorSpace,androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D>> getVectorConverter(androidx.compose.ui.graphics.Color.Companion);
+  }
+
+  public final class CrossfadeKt {
+    method @androidx.compose.runtime.Composable public static <T> void Crossfade(T? targetState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> content);
+  }
+
+  public final class EnterExitTransitionKt {
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandHorizontally(optional androidx.compose.ui.Alignment.Horizontal expandFrom, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialWidth, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional boolean clip);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandIn(optional androidx.compose.ui.Alignment expandFrom, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntSize> initialSize, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional boolean clip);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandVertically(optional androidx.compose.ui.Alignment.Vertical expandFrom, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialHeight, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional boolean clip);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition fadeIn(optional float initialAlpha, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition fadeOut(optional float targetAlpha, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkHorizontally(optional androidx.compose.ui.Alignment.Horizontal shrinkTowards, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetWidth, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional boolean clip);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkOut(optional androidx.compose.ui.Alignment shrinkTowards, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntSize> targetSize, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional boolean clip);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkVertically(optional androidx.compose.ui.Alignment.Vertical shrinkTowards, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetHeight, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional boolean clip);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideIn(kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntOffset> initialOffset, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideInHorizontally(optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffsetX, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideInVertically(optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffsetY, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOut(kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntOffset> targetOffset, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOutHorizontally(optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffsetX, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
+    method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOutVertically(optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffsetY, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
+  }
+
+  @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Immutable public abstract sealed class EnterTransition {
+    method @androidx.compose.runtime.Stable public final operator androidx.compose.animation.EnterTransition plus(androidx.compose.animation.EnterTransition enter);
+  }
+
+  @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Immutable public abstract sealed class ExitTransition {
+    method @androidx.compose.runtime.Stable public final operator androidx.compose.animation.ExitTransition plus(androidx.compose.animation.ExitTransition exit);
+  }
+
+  @kotlin.RequiresOptIn(message="This is an experimental animation API.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ExperimentalAnimationApi {
+  }
+
+  public final class SingleValueAnimationKt {
+    method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable-8_81llA(long initialValue);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState-m3E411Q(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
+  }
+
+  public final class SplineBasedFloatDecayAnimationSpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+    ctor public SplineBasedFloatDecayAnimationSpec(androidx.compose.ui.unit.Density density);
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(float initialValue, float initialVelocity);
+    method public float getTargetValue(float initialValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    property public float absVelocityThreshold;
+  }
+
+  public final class SplineBasedFloatDecayAnimationSpec_androidKt {
+    method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> splineBasedDecay(androidx.compose.ui.unit.Density density);
+  }
+
+  public final class TransitionKt {
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.graphics.Color>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.graphics.Color> targetValueByState);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor-Baa6hxQ(androidx.compose.animation.core.InfiniteTransition, long initialValue, long targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<androidx.compose.ui.graphics.Color> animationSpec);
+  }
+
+}
+

compose/animation/animation/api/res-1.0.0-beta04.txt

diff --git a/serialization/serialization/api/res-current.txt b/compose/animation/animation/api/res-1.0.0-beta04.txt
similarity index 100%
rename from serialization/serialization/api/res-current.txt
rename to compose/animation/animation/api/res-1.0.0-beta04.txt

compose/animation/animation/api/restricted_1.0.0-beta04.txt

diff --git a/compose/animation/animation/api/restricted_1.0.0-beta04.txt b/compose/animation/animation/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..83b6f53
--- /dev/null
+++ b/compose/animation/animation/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,57 @@
+// Signature format: 4.0
+package androidx.compose.animation {
+
+  public final class AndroidActualDefaultDecayAnimationSpec_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> defaultDecayAnimationSpec();
+  }
+
+  public final class AndroidFlingCalculator_androidKt {
+  }
+
+  public final class AndroidFlingSpline_androidKt {
+  }
+
+  public final class AnimatedVisibilityKt {
+  }
+
+  public final class AnimationModifierKt {
+    method public static androidx.compose.ui.Modifier animateContentSize(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function2<? super androidx.compose.ui.unit.IntSize,? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+  }
+
+  public final class ColorVectorConverterKt {
+    method public static kotlin.jvm.functions.Function1<androidx.compose.ui.graphics.colorspace.ColorSpace,androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D>> getVectorConverter(androidx.compose.ui.graphics.Color.Companion);
+  }
+
+  public final class CrossfadeKt {
+    method @androidx.compose.runtime.Composable public static <T> void Crossfade(T? targetState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> content);
+  }
+
+  public final class EnterExitTransitionKt {
+  }
+
+  public final class SingleValueAnimationKt {
+    method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable-8_81llA(long initialValue);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState-m3E411Q(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
+  }
+
+  public final class SplineBasedFloatDecayAnimationSpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+    ctor public SplineBasedFloatDecayAnimationSpec(androidx.compose.ui.unit.Density density);
+    method public float getAbsVelocityThreshold();
+    method public long getDurationNanos(float initialValue, float initialVelocity);
+    method public float getTargetValue(float initialValue, float initialVelocity);
+    method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+    property public float absVelocityThreshold;
+  }
+
+  public final class SplineBasedFloatDecayAnimationSpec_androidKt {
+    method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> splineBasedDecay(androidx.compose.ui.unit.Density density);
+  }
+
+  public final class TransitionKt {
+    method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.graphics.Color>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.graphics.Color> targetValueByState);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor-Baa6hxQ(androidx.compose.animation.core.InfiniteTransition, long initialValue, long targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<androidx.compose.ui.graphics.Color> animationSpec);
+  }
+
+}
+

compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/EnterExitTransitionDemo.kt

diff --git a/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/EnterExitTransitionDemo.kt b/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/EnterExitTransitionDemo.kt
index 646887f..cccb234 100644
--- a/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/EnterExitTransitionDemo.kt
+++ b/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/EnterExitTransitionDemo.kt
@@ -38,7 +38,6 @@
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -130,7 +129,13 @@
                         Text("Bottom\nStart")
                     }
                 }
-                CenterMenu(selectedOptions, oppositeAlignment.value, alignment, visible)
+                CenterMenu(
+                    Modifier.weight(1f),
+                    selectedOptions,
+                    oppositeAlignment.value,
+                    alignment,
+                    visible
+                )
                 Box(Modifier.fillMaxHeight().wrapContentWidth()) {
                     Button(
                         modifier = Modifier.align(TopStart),
@@ -191,12 +196,13 @@
 @OptIn(ExperimentalAnimationApi::class)
 @Composable
 fun CenterMenu(
+    modifier: Modifier = Modifier,
     selectedOptions: List<Boolean>,
     oppositeDirection: Boolean,
     alignment: Alignment,
     visible: Boolean
 ) {
-    Box(with(RowScope) { Modifier.fillMaxHeight().weight(1f) }) {
+    Box(modifier.fillMaxHeight()) {
 
         val animationAlignment = if (oppositeDirection) opposite(alignment) else alignment
         val expand = when (animationAlignment) {

compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/RepeatedRotationDemo.kt

diff --git a/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/RepeatedRotationDemo.kt b/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/RepeatedRotationDemo.kt
index 8374f9e..bff20ac 100644
--- a/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/RepeatedRotationDemo.kt
+++ b/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/RepeatedRotationDemo.kt
@@ -64,6 +64,7 @@
         }
         Spacer(Modifier.requiredHeight(10.dp))
         val transition = updateTransition(state.value)
+        @Suppress("UnusedTransitionTargetStateParameter")
         val rotation by transition.animateFloat(
             transitionSpec = {
                 if (initialState == RotationStates.Original) {

compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/SpringChainDemo.kt

diff --git a/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/SpringChainDemo.kt b/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/SpringChainDemo.kt
index d03313b..8ba6ba8 100644
--- a/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/SpringChainDemo.kt
+++ b/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/SpringChainDemo.kt
@@ -16,15 +16,23 @@
 
 package androidx.compose.animation.demos
 
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.animateIntAsState
 import androidx.compose.animation.core.animateOffsetAsState
+import androidx.compose.animation.core.spring
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectDragGestures
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Icon
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
@@ -35,8 +43,10 @@
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.consumeAllChanges
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.round
 
@@ -55,34 +65,56 @@
             modifier = Modifier.align(Alignment.Center),
             text = "Since we are here, why not drag me around?"
         )
-        val size = pastelAwakening.size
+        val size = vibrantColors.size
         val followers = remember { Array<State<Offset>>(size) { mutableStateOf(Offset.Zero) } }
         for (i in 0 until size) {
             // Each follower on the spring chain uses the previous follower's position as target
             followers[i] = animateOffsetAsState(if (i == 0) leader else followers[i - 1].value)
         }
 
+        var expanded by remember { mutableStateOf(false) }
+        // Put space between followers when expanded
+        val spacing by animateIntAsState(if (expanded) -300 else 0, spring(dampingRatio = 0.7f))
+
         // Followers stacked in reverse orders
         for (i in followers.size - 1 downTo 0) {
             Box(
                 Modifier
                     .offset { followers[i].value.round() }
-                    .size(80.dp)
-                    .background(pastelAwakening[i], CircleShape)
+                    .offset { IntOffset(0, spacing * (i + 1)) }
+                    .size(circleSize)
+                    .background(vibrantColors[i], CircleShape)
             )
         }
+
         // Leader
         Box(
-            Modifier.offset { leader.round() }.size(80.dp)
-                .background(Color(0xFFfffbd0), CircleShape)
-        )
+            Modifier.offset { leader.round() }.size(circleSize)
+                .clickable(
+                    indication = null,
+                    interactionSource = remember { MutableInteractionSource() }
+                ) { expanded = !expanded }
+                .background(Color(0xFFfff8ad), CircleShape)
+        ) {
+            // Rotate icon when expanded / collapsed
+            val rotation by animateFloatAsState(if (expanded) 180f else 0f)
+            Icon(
+                Icons.Filled.KeyboardArrowDown,
+                contentDescription = "Expand or Collapse",
+                modifier = Modifier.size(30.dp).align(Alignment.Center)
+                    .graphicsLayer { this.rotationZ = rotation },
+                tint = Color.Gray
+            )
+        }
     }
 }
 
-private val pastelAwakening = listOf(
-    Color(0xffdfdeff),
-    Color(0xffffe0f5),
-    Color(0xffffefd8),
-    Color(0xffe6ffd0),
-    Color(0xffd9f6ff)
+val circleSize = 60.dp
+
+private val vibrantColors = listOf(
+    Color(0xffbfbdff),
+    Color(0xffffc7ed),
+    Color(0xffffdcab),
+    Color(0xffd5ffb0),
+    Color(0xffbaefff)
 )
\ No newline at end of file

compose/animation/animation/samples/src/main/java/androidx/compose/animation/samples/AnimatedVisibilitySamples.kt

diff --git a/compose/animation/animation/samples/src/main/java/androidx/compose/animation/samples/AnimatedVisibilitySamples.kt b/compose/animation/animation/samples/src/main/java/androidx/compose/animation/samples/AnimatedVisibilitySamples.kt
index 8ab8fbd..e065cf5 100644
--- a/compose/animation/animation/samples/src/main/java/androidx/compose/animation/samples/AnimatedVisibilitySamples.kt
+++ b/compose/animation/animation/samples/src/main/java/androidx/compose/animation/samples/AnimatedVisibilitySamples.kt
@@ -163,11 +163,11 @@
 @OptIn(ExperimentalAnimationApi::class)
 @Sampled
 @Composable
-fun AnimatedFloatingActionButton() {
+fun ColumnScope.AnimatedFloatingActionButton() {
     var expanded by remember { mutableStateOf(true) }
     FloatingActionButton(
         onClick = { expanded = !expanded },
-        modifier = with(ColumnScope) { Modifier.align(Alignment.CenterHorizontally) }
+        modifier = Modifier.align(Alignment.CenterHorizontally)
     ) {
         Row(Modifier.padding(start = 12.dp, end = 12.dp)) {
             Icon(

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractCodegenSignatureTest.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractCodegenSignatureTest.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractCodegenSignatureTest.kt
index 49f83020..c091eea 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractCodegenSignatureTest.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractCodegenSignatureTest.kt
@@ -273,6 +273,7 @@
 
            $text
 
+            fun used(x: Any?) {}
         """,
             dumpClasses
         )

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractCodegenTest.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractCodegenTest.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractCodegenTest.kt
index 9fb039e..64dc648 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractCodegenTest.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractCodegenTest.kt
@@ -87,6 +87,8 @@
            import androidx.compose.runtime.*
 
            $src
+
+            fun used(x: Any?) {}
         """,
             fileName, dumpClasses
         )

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractControlFlowTransformTests.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractControlFlowTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractControlFlowTransformTests.kt
index 6355b8b..15cb5c8 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractControlFlowTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractControlFlowTransformTests.kt
@@ -37,6 +37,7 @@
             import androidx.compose.runtime.Composable
 
             inline class InlineClass(val value: Int)
+            fun used(x: Any?) {}
 
             @Composable fun A() {}
             @Composable fun A(x: Int) { }

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ClassStabilityTransformTests.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ClassStabilityTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ClassStabilityTransformTests.kt
index 7562046..e1afd43 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ClassStabilityTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ClassStabilityTransformTests.kt
@@ -512,12 +512,14 @@
             class UnstableDelegateProp {
                 var p1 by UnstableDelegate()
             }
+            fun used(x: Any?) {}
         """,
         """
             import a.*
             import androidx.compose.runtime.Composable
 
             @Composable fun A(y: Any) {
+                used(y)
                 A(EmptyClass())
                 A(SingleStableValInt(123))
                 A(SingleStableVal(StableClass()))
@@ -541,6 +543,7 @@
             @Composable
             fun A(y: Any, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>, "C(A)<A(Empt...>,<A(Sing...>,<A(Sing...>,<A(Sing...>,<A(Sing...>,<A(Sing...>,<A(Sing...>,<A(Doub...>,<A(Doub...>,<A(Doub...>,<A(Doub...>,<A(X(li...>,<A(X(li...>,<A(NonB...>,<A(NonB...>,<A(Stab...>,<A(Unst...>:Test.kt")
+              used(y)
               A(EmptyClass(), %composer, EmptyClass.%stable)
               A(SingleStableValInt(123), %composer, SingleStableValInt.%stable)
               A(SingleStableVal(StableClass()), %composer, SingleStableVal.%stable)
@@ -609,6 +612,7 @@
                     get() { TODO() }
                     set(value) { }
             }
+            fun used(x: Any?) {}
         """,
         """
             import a.*
@@ -622,6 +626,7 @@
                 var p1 by UnstableDelegate()
             }
             @Composable fun A(y: Any) {
+                used(y)
                 A(X(listOf(StableClass())))
                 A(StableDelegateProp())
                 A(UnstableDelegateProp())
@@ -657,6 +662,7 @@
             @Composable
             fun A(y: Any, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>, "C(A)<A(X(li...>,<A(Stab...>,<A(Unst...>:Test.kt")
+              used(y)
               A(X(listOf(StableClass())), %composer, 0b1000)
               A(StableDelegateProp(), %composer, 0)
               A(UnstableDelegateProp(), %composer, UnstableDelegate.%stable)
@@ -675,13 +681,14 @@
               fun make(): T = error("")
             }
             class Foo
+            fun used(x: Any?) {}
         """,
         """
-            import a.Wrapper
-            import a.Foo
+            import a.*
             import androidx.compose.runtime.Composable
 
             @Composable fun A(y: Any) {
+                used(y)
                 A(Wrapper(Foo()))
             }
         """,
@@ -689,6 +696,7 @@
             @Composable
             fun A(y: Any, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>, "C(A)<A(Wrap...>:Test.kt")
+              used(y)
               A(Wrapper(Foo()), %composer, Wrapper.%stable)
               %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
                 A(y, %composer, %changed or 0b0001)
@@ -742,10 +750,11 @@
             @Composable
             fun <T> X(items: List<T>, itemContent: Function3<T, Composer, Int, Unit>, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>, "C(X)P(1)*<itemCo...>:Test.kt")
+              val %dirty = %changed
               val tmp0_iterator = items.iterator()
               while (tmp0_iterator.hasNext()) {
                 val item = tmp0_iterator.next()
-                itemContent(item, %composer, 0b01110000 and %changed)
+                itemContent(item, %composer, 0b01110000 and %dirty)
               }
               %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
                 X(items, itemContent, %composer, %changed or 0b0001)
@@ -801,9 +810,12 @@
 
             class Foo
             @Composable fun A(y: Int, x: Any) {
+                used(y)
                 B(x)
             }
-            @Composable fun B(x: Any) {}
+            @Composable fun B(x: Any) {
+                used(x)
+            }
         """,
         """
             @StabilityInferred(parameters = 0)
@@ -813,6 +825,7 @@
             @Composable
             fun A(y: Int, x: Any, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>, "C(A)P(1)<B(x)>:Test.kt")
+              used(y)
               B(x, %composer, 0b1000)
               %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
                 A(y, x, %composer, %changed or 0b0001)
@@ -821,6 +834,7 @@
             @Composable
             fun B(x: Any, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>, "C(B):Test.kt")
+              used(x)
               %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
                 B(x, %composer, %changed or 0b0001)
               }
@@ -835,9 +849,12 @@
 
             class Foo(var bar: Int = 0)
             @Composable fun A(y: Int, x: Foo) {
+                used(y)
                 B(x)
             }
-            @Composable fun B(x: Any) {}
+            @Composable fun B(x: Any) {
+                used(x)
+            }
         """,
         """
             @StabilityInferred(parameters = 0)
@@ -847,6 +864,7 @@
             @Composable
             fun A(y: Int, x: Foo, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>, "C(A)P(1)<B(x)>:Test.kt")
+              used(y)
               B(x, %composer, 0b1000)
               %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
                 A(y, x, %composer, %changed or 0b0001)
@@ -855,6 +873,7 @@
             @Composable
             fun B(x: Any, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>, "C(B):Test.kt")
+              used(x)
               %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
                 B(x, %composer, %changed or 0b0001)
               }
@@ -1018,7 +1037,10 @@
     ) = verifyComposeIrTransform(
         checked,
         expectedTransformed,
-        unchecked,
+        """
+            $unchecked
+            fun used(x: Any?) {}
+        """,
         dumpTree = dumpTree
     )
 }
\ No newline at end of file

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt
index d93c8be..e36dde9 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt
@@ -97,6 +97,33 @@
     }
 
     @Test
+    fun testStrangeReceiverIssue(): Unit = codegen(
+        """
+        import androidx.compose.runtime.ExplicitGroupsComposable
+        import androidx.compose.runtime.NonRestartableComposable
+        class Foo
+
+        @Composable
+        @ExplicitGroupsComposable
+        fun A(foo: Foo) {
+            foo.b()
+        }
+
+        @Composable
+        @ExplicitGroupsComposable
+        inline fun Foo.b(label: String = "") {
+            c(this, label)
+        }
+
+        @Composable
+        @ExplicitGroupsComposable
+        inline fun c(foo: Foo, label: String) {
+            used(label)
+        }
+        """
+    )
+
+    @Test
     fun testInterfaceMethodWithComposableParameter(): Unit = validateBytecode(
         """
             @Composable
@@ -139,7 +166,16 @@
             f: Float,
             g: Long,
             h: Double
-        ) {}
+        ) {
+            used(a)
+            used(b)
+            used(c)
+            used(d)
+            used(e)
+            used(f)
+            used(g)
+            used(h)
+        }
         """
     ) {
         assert(it.contains("INVOKEINTERFACE androidx/compose/runtime/Composer.changed (Z)Z"))
@@ -159,7 +195,9 @@
         import androidx.compose.runtime.Stable
 
         @Stable class Bar
-        @Composable fun Foo(a: Bar) {}
+        @Composable fun Foo(a: Bar) {
+            used(a)
+        }
         """
     ) {
         assert(!it.contains("INVOKEINTERFACE androidx/compose/runtime/Composer.changed (Z)Z"))
@@ -177,7 +215,9 @@
     fun testInlineClassChangedCalls(): Unit = validateBytecode(
         """
         inline class Bar(val value: Int)
-        @Composable fun Foo(a: Bar) {}
+        @Composable fun Foo(a: Bar) {
+            used(a)
+        }
         """
     ) {
         assert(!it.contains("INVOKESTATIC Bar.box-impl (I)LBar;"))
@@ -191,7 +231,9 @@
     fun testNullableInlineClassChangedCalls(): Unit = validateBytecode(
         """
         inline class Bar(val value: Int)
-        @Composable fun Foo(a: Bar?) {}
+        @Composable fun Foo(a: Bar?) {
+            used(a)
+        }
         """
     ) {
         val testClass = it.split("public final class ").single { it.startsWith("test/TestKt") }
@@ -1081,11 +1123,9 @@
               public final static Wat(Landroidx/compose/runtime/Composer;I)V
               public final static Foo(ILandroidx/compose/runtime/Composer;I)V
               private final static Foo%goo(Landroidx/compose/runtime/Composer;I)V
-              public final static synthetic access%Foo%goo(Landroidx/compose/runtime/Composer;I)V
               final static INNERCLASS TestKt%Wat%1 null null
               public final static INNERCLASS TestKt%Foo%Bar null Bar
               final static INNERCLASS TestKt%Foo%1 null null
-              final static INNERCLASS TestKt%Foo%goo%1 null null
             }
             final class TestKt%Wat%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
               <init>(I)V
@@ -1099,17 +1139,6 @@
               public <init>()V
               public final baz(Landroidx/compose/runtime/Composer;I)V
               OUTERCLASS TestKt Foo (ILandroidx/compose/runtime/Composer;I)V
-              final static INNERCLASS TestKt%Foo%Bar%baz%1 null null
-              public final static INNERCLASS TestKt%Foo%Bar null Bar
-            }
-            final class TestKt%Foo%Bar%baz%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
-              <init>(LTestKt%Foo%Bar;I)V
-              public final invoke(Landroidx/compose/runtime/Composer;I)V
-              public synthetic bridge invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-              final synthetic LTestKt%Foo%Bar; %tmp0_rcvr
-              final synthetic I %%changed
-              OUTERCLASS TestKt%Foo%Bar baz (Landroidx/compose/runtime/Composer;I)V
-              final static INNERCLASS TestKt%Foo%Bar%baz%1 null null
               public final static INNERCLASS TestKt%Foo%Bar null Bar
             }
             final class TestKt%Foo%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
@@ -1121,14 +1150,6 @@
               OUTERCLASS TestKt Foo (ILandroidx/compose/runtime/Composer;I)V
               final static INNERCLASS TestKt%Foo%1 null null
             }
-            final class TestKt%Foo%goo%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
-              <init>(I)V
-              public final invoke(Landroidx/compose/runtime/Composer;I)V
-              public synthetic bridge invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-              final synthetic I %%changed
-              OUTERCLASS TestKt Foo%goo (Landroidx/compose/runtime/Composer;I)V
-              final static INNERCLASS TestKt%Foo%goo%1 null null
-            }
         """
     )
 

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamTransformTests.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamTransformTests.kt
index a1bb13c..dd98c75 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamTransformTests.kt
@@ -47,7 +47,10 @@
             $source
         """.trimIndent(),
         expectedTransformed,
-        "",
+        """
+            package test
+            fun used(x: Any?) {}
+        """,
         validator,
         dumpTree
     )
@@ -349,7 +352,9 @@
                 }
 
                 @Composable
-                fun Leaf(text: String) { }
+                fun Leaf(text: String) {
+                    used(text)
+                }
 
                 @Composable
                 fun Test(value: Int) {
@@ -385,6 +390,7 @@
                     %dirty = %dirty or if (%composer.changed(text)) 0b0100 else 0b0010
                   }
                   if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
+                    used(text)
                   } else {
                     %composer.skipToGroupEnd()
                   }

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt
index 5a3ba82..d7f5794 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt
@@ -2430,6 +2430,7 @@
         """
             @Composable
             fun Test(value: InlineClass) {
+                used(value)
                 A()
             }
         """,
@@ -2442,6 +2443,7 @@
                 %dirty = %dirty or if (%composer.changed(value.value)) 0b0100 else 0b0010
               }
               if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
+                used(value)
                 A(%composer, 0)
               } else {
                 %composer.skipToGroupEnd()
@@ -2456,30 +2458,150 @@
     @Test
     fun testParameterOrderInformation(): Unit = controlFlow(
         """
-            @Composable fun Test01(p0: Int, p1: Int, p2: Int, p3: Int) { }
-            @Composable fun Test02(p0: Int, p1: Int, p3: Int, p2: Int) { }
-            @Composable fun Test03(p0: Int, p2: Int, p1: Int, p3: Int) { }
-            @Composable fun Test04(p0: Int, p2: Int, p3: Int, p1: Int) { }
-            @Composable fun Test05(p0: Int, p3: Int, p1: Int, p2: Int) { }
-            @Composable fun Test06(p0: Int, p3: Int, p2: Int, p1: Int) { }
-            @Composable fun Test07(p1: Int, p0: Int, p2: Int, p3: Int) { }
-            @Composable fun Test08(p1: Int, p0: Int, p3: Int, p2: Int) { }
-            @Composable fun Test09(p1: Int, p2: Int, p0: Int, p3: Int) { }
-            @Composable fun Test00(p1: Int, p2: Int, p3: Int, p0: Int) { }
-            @Composable fun Test11(p1: Int, p3: Int, p0: Int, p2: Int) { }
-            @Composable fun Test12(p1: Int, p3: Int, p2: Int, p0: Int) { }
-            @Composable fun Test13(p2: Int, p0: Int, p1: Int, p3: Int) { }
-            @Composable fun Test14(p2: Int, p0: Int, p3: Int, p1: Int) { }
-            @Composable fun Test15(p2: Int, p1: Int, p0: Int, p3: Int) { }
-            @Composable fun Test16(p2: Int, p1: Int, p3: Int, p0: Int) { }
-            @Composable fun Test17(p2: Int, p3: Int, p0: Int, p1: Int) { }
-            @Composable fun Test18(p2: Int, p3: Int, p1: Int, p0: Int) { }
-            @Composable fun Test19(p3: Int, p0: Int, p1: Int, p2: Int) { }
-            @Composable fun Test20(p3: Int, p0: Int, p2: Int, p1: Int) { }
-            @Composable fun Test21(p3: Int, p1: Int, p0: Int, p2: Int) { }
-            @Composable fun Test22(p3: Int, p1: Int, p2: Int, p0: Int) { }
-            @Composable fun Test23(p3: Int, p2: Int, p0: Int, p1: Int) { }
-            @Composable fun Test24(p3: Int, p2: Int, p1: Int, p0: Int) { }
+            @Composable fun Test01(p0: Int, p1: Int, p2: Int, p3: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test02(p0: Int, p1: Int, p3: Int, p2: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test03(p0: Int, p2: Int, p1: Int, p3: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test04(p0: Int, p2: Int, p3: Int, p1: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test05(p0: Int, p3: Int, p1: Int, p2: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test06(p0: Int, p3: Int, p2: Int, p1: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test07(p1: Int, p0: Int, p2: Int, p3: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test08(p1: Int, p0: Int, p3: Int, p2: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test09(p1: Int, p2: Int, p0: Int, p3: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test00(p1: Int, p2: Int, p3: Int, p0: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test11(p1: Int, p3: Int, p0: Int, p2: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test12(p1: Int, p3: Int, p2: Int, p0: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test13(p2: Int, p0: Int, p1: Int, p3: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test14(p2: Int, p0: Int, p3: Int, p1: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test15(p2: Int, p1: Int, p0: Int, p3: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test16(p2: Int, p1: Int, p3: Int, p0: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test17(p2: Int, p3: Int, p0: Int, p1: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test18(p2: Int, p3: Int, p1: Int, p0: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test19(p3: Int, p0: Int, p1: Int, p2: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test20(p3: Int, p0: Int, p2: Int, p1: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test21(p3: Int, p1: Int, p0: Int, p2: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test22(p3: Int, p1: Int, p2: Int, p0: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test23(p3: Int, p2: Int, p0: Int, p1: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
+            @Composable fun Test24(p3: Int, p2: Int, p1: Int, p0: Int) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
+            }
         """,
         """
             @Composable
@@ -2499,6 +2621,10 @@
                 %dirty = %dirty or if (%composer.changed(p3)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2523,6 +2649,10 @@
                 %dirty = %dirty or if (%composer.changed(p2)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2547,6 +2677,10 @@
                 %dirty = %dirty or if (%composer.changed(p3)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2571,6 +2705,10 @@
                 %dirty = %dirty or if (%composer.changed(p1)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2595,6 +2733,10 @@
                 %dirty = %dirty or if (%composer.changed(p2)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2619,6 +2761,10 @@
                 %dirty = %dirty or if (%composer.changed(p1)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2643,6 +2789,10 @@
                 %dirty = %dirty or if (%composer.changed(p3)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2667,6 +2817,10 @@
                 %dirty = %dirty or if (%composer.changed(p2)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2691,6 +2845,10 @@
                 %dirty = %dirty or if (%composer.changed(p3)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2715,6 +2873,10 @@
                 %dirty = %dirty or if (%composer.changed(p0)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2739,6 +2901,10 @@
                 %dirty = %dirty or if (%composer.changed(p2)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2763,6 +2929,10 @@
                 %dirty = %dirty or if (%composer.changed(p0)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2787,6 +2957,10 @@
                 %dirty = %dirty or if (%composer.changed(p3)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2811,6 +2985,10 @@
                 %dirty = %dirty or if (%composer.changed(p1)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2835,6 +3013,10 @@
                 %dirty = %dirty or if (%composer.changed(p3)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2859,6 +3041,10 @@
                 %dirty = %dirty or if (%composer.changed(p0)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2883,6 +3069,10 @@
                 %dirty = %dirty or if (%composer.changed(p1)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2907,6 +3097,10 @@
                 %dirty = %dirty or if (%composer.changed(p0)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2931,6 +3125,10 @@
                 %dirty = %dirty or if (%composer.changed(p2)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2955,6 +3153,10 @@
                 %dirty = %dirty or if (%composer.changed(p1)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2979,6 +3181,10 @@
                 %dirty = %dirty or if (%composer.changed(p2)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -3003,6 +3209,10 @@
                 %dirty = %dirty or if (%composer.changed(p0)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -3027,6 +3237,10 @@
                 %dirty = %dirty or if (%composer.changed(p1)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -3051,6 +3265,10 @@
                 %dirty = %dirty or if (%composer.changed(p0)) 0b100000000000 else 0b010000000000
               }
               if (%dirty and 0b0001011011011011 xor 0b010010010010 !== 0 || !%composer.skipping) {
+                used(p0)
+                used(p1)
+                used(p2)
+                used(p3)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -3070,13 +3288,14 @@
 
             @Composable
             fun Test(value: LocalInlineClass) {
-
+                used(value)
             }
         """,
         extra = """
             package androidx.compose.runtime.tests
 
             inline class LocalInlineClass(val value: Int)
+            fun used(x: Any?) {}
         """,
         expectedTransformed = """
             @Composable
@@ -3087,6 +3306,7 @@
                 %dirty = %dirty or if (%composer.changed(value.value)) 0b0100 else 0b0010
               }
               if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
+                used(value)
               } else {
                 %composer.skipToGroupEnd()
               }

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/DefaultParamTransformTests.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/DefaultParamTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/DefaultParamTransformTests.kt
index 4b90282..1c8d410 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/DefaultParamTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/DefaultParamTransformTests.kt
@@ -40,6 +40,8 @@
             import androidx.compose.runtime.NonRestartableComposable
 
             $unchecked
+
+            fun used(x: Any?) {}
         """.trimIndent(),
         dumpTree = dumpTree
     )
@@ -165,7 +167,7 @@
         """
             @Composable
             fun Test(x: Int = makeInt()) {
-
+                used(x)
             }
         """,
         """
@@ -190,6 +192,7 @@
                     %dirty = %dirty and 0b1110.inv()
                   }
                 }
+                used(x)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -292,7 +295,37 @@
                 a29: Int = 0,
                 a30: Int = 0
             ) {
-                print("Hello world!")
+                used(a00)
+                used(a01)
+                used(a02)
+                used(a03)
+                used(a04)
+                used(a05)
+                used(a06)
+                used(a07)
+                used(a08)
+                used(a09)
+                used(a10)
+                used(a11)
+                used(a12)
+                used(a13)
+                used(a14)
+                used(a15)
+                used(a16)
+                used(a17)
+                used(a18)
+                used(a19)
+                used(a20)
+                used(a21)
+                used(a22)
+                used(a23)
+                used(a24)
+                used(a25)
+                used(a26)
+                used(a27)
+                used(a28)
+                used(a29)
+                used(a30)
             }
         """,
         """
@@ -552,7 +585,37 @@
                 if (%default and 0b01000000000000000000000000000000 !== 0) {
                   a30 = 0
                 }
-                print("Hello world!")
+                used(a00)
+                used(a01)
+                used(a02)
+                used(a03)
+                used(a04)
+                used(a05)
+                used(a06)
+                used(a07)
+                used(a08)
+                used(a09)
+                used(a10)
+                used(a11)
+                used(a12)
+                used(a13)
+                used(a14)
+                used(a15)
+                used(a16)
+                used(a17)
+                used(a18)
+                used(a19)
+                used(a20)
+                used(a21)
+                used(a22)
+                used(a23)
+                used(a24)
+                used(a25)
+                used(a26)
+                used(a27)
+                used(a28)
+                used(a29)
+                used(a30)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -603,7 +666,38 @@
                 a30: Int = 0,
                 a31: Int = 0
             ) {
-                print("Hello world!")
+                used(a00)
+                used(a01)
+                used(a02)
+                used(a03)
+                used(a04)
+                used(a05)
+                used(a06)
+                used(a07)
+                used(a08)
+                used(a09)
+                used(a10)
+                used(a11)
+                used(a12)
+                used(a13)
+                used(a14)
+                used(a15)
+                used(a16)
+                used(a17)
+                used(a18)
+                used(a19)
+                used(a20)
+                used(a21)
+                used(a22)
+                used(a23)
+                used(a24)
+                used(a25)
+                used(a26)
+                used(a27)
+                used(a28)
+                used(a29)
+                used(a30)
+                used(a31)
             }
         """,
         """
@@ -871,7 +965,38 @@
                 if (%default1 and 0b0001 !== 0) {
                   a31 = 0
                 }
-                print("Hello world!")
+                used(a00)
+                used(a01)
+                used(a02)
+                used(a03)
+                used(a04)
+                used(a05)
+                used(a06)
+                used(a07)
+                used(a08)
+                used(a09)
+                used(a10)
+                used(a11)
+                used(a12)
+                used(a13)
+                used(a14)
+                used(a15)
+                used(a16)
+                used(a17)
+                used(a18)
+                used(a19)
+                used(a20)
+                used(a21)
+                used(a22)
+                used(a23)
+                used(a24)
+                used(a25)
+                used(a26)
+                used(a27)
+                used(a28)
+                used(a29)
+                used(a30)
+                used(a31)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -923,7 +1048,38 @@
                 a30: Int = 0,
                 a31: Foo = Foo()
             ) {
-                print("Hello world!")
+                used(a00)
+                used(a01)
+                used(a02)
+                used(a03)
+                used(a04)
+                used(a05)
+                used(a06)
+                used(a07)
+                used(a08)
+                used(a09)
+                used(a10)
+                used(a11)
+                used(a12)
+                used(a13)
+                used(a14)
+                used(a15)
+                used(a16)
+                used(a17)
+                used(a18)
+                used(a19)
+                used(a20)
+                used(a21)
+                used(a22)
+                used(a23)
+                used(a24)
+                used(a25)
+                used(a26)
+                used(a27)
+                used(a28)
+                used(a29)
+                used(a30)
+                used(a31)
             }
         """,
         """
@@ -1201,7 +1357,38 @@
                     %dirty3 = %dirty3 and 0b01110000.inv()
                   }
                 }
-                print("Hello world!")
+                used(a00)
+                used(a01)
+                used(a02)
+                used(a03)
+                used(a04)
+                used(a05)
+                used(a06)
+                used(a07)
+                used(a08)
+                used(a09)
+                used(a10)
+                used(a11)
+                used(a12)
+                used(a13)
+                used(a14)
+                used(a15)
+                used(a16)
+                used(a17)
+                used(a18)
+                used(a19)
+                used(a20)
+                used(a21)
+                used(a22)
+                used(a23)
+                used(a24)
+                used(a25)
+                used(a26)
+                used(a27)
+                used(a28)
+                used(a29)
+                used(a30)
+                used(a31)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -1246,7 +1433,7 @@
               @Composable
               fun Example(%composer: Composer?, %changed: Int) {
                 %composer.startReplaceableGroup(<>, "C(Example)<foo()>:Test.kt")
-                foo(0, %composer, 0, 0b0001)
+                foo(0, %composer, 0b01110000 and %changed shl 0b0011, 0b0001)
                 %composer.endReplaceableGroup()
               }
               static val %stable: Int = 0

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt
index b27a838..b07a52e 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt
@@ -40,6 +40,7 @@
             import androidx.compose.runtime.Composable
 
             $unchecked
+            fun used(x: Any?) {}
         """.trimIndent(),
         dumpTree = dumpTree
     )
@@ -55,6 +56,7 @@
         """
             @Composable
             fun Test(x: Int = 0, y: Int = 0) {
+                used(y)
                 Wrap {
                     if (x > 0) {
                         A(x)
@@ -86,6 +88,7 @@
                 if (%default and 0b0010 !== 0) {
                   y = 0
                 }
+                used(y)
                 Wrap(composableLambda(%composer, <>, true, "C:Test.kt") { %composer: Composer?, %changed: Int ->
                   if (%changed and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
                     if (x > 0) {
@@ -120,11 +123,13 @@
         """,
         """
             fun Example(a: A) {
+                used(a)
                 Example { it -> a.compute(it) }
             }
         """,
         """
             fun Example(a: A) {
+              used(a)
               Example(class <no name provided> : A {
                 @Composable
                 override fun compute(it: Int, %composer: Composer?, %changed: Int) {
@@ -133,8 +138,7 @@
                   if (%changed and 0b1110 === 0) {
                     %dirty = %dirty or if (%composer.changed(it)) 0b0100 else 0b0010
                   }
-                  %dirty = %dirty or 0b00110000
-                  if (%dirty and 0b01011011 xor 0b00010010 !== 0 || !%composer.skipping) {
+                  if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
                     a.compute(it, %composer, 0b1110 and %dirty)
                   } else {
                     %composer.skipToGroupEnd()
@@ -273,7 +277,12 @@
               crossAxisSize: SizeMode = SizeMode.Wrap,
               content: @Composable() ()->Unit
             ) {
-              println()
+                used(orientation)
+                used(modifier)
+                used(arrangement)
+                used(crossAxisAlignment)
+                used(crossAxisSize)
+                content()
             }
 
             @Composable
@@ -296,7 +305,7 @@
         """
             @Composable
             fun RowColumnImpl(orientation: LayoutOrientation, modifier: Modifier?, arrangement: Vertical?, crossAxisAlignment: Horizontal?, crossAxisSize: SizeMode?, content: Function2<Composer, Int, Unit>, %composer: Composer?, %changed: Int, %default: Int) {
-              %composer = %composer.startRestartGroup(<>, "C(RowColumnImpl)P(5,4!1,2,3):Test.kt")
+              %composer = %composer.startRestartGroup(<>, "C(RowColumnImpl)P(5,4!1,2,3)<conten...>:Test.kt")
               val %dirty = %changed
               if (%default and 0b0001 !== 0) {
                 %dirty = %dirty or 0b0110
@@ -349,7 +358,12 @@
                     %dirty = %dirty and 0b0001110000000000.inv()
                   }
                 }
-                println()
+                used(orientation)
+                used(modifier)
+                used(arrangement)
+                used(crossAxisAlignment)
+                used(crossAxisSize)
+                content(%composer, 0b1110 and %dirty shr 0b1111)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -425,7 +439,7 @@
         """
             @Composable
             fun SimpleBox(modifier: Modifier = Modifier) {
-               println()
+               used(modifier)
             }
         """,
         """
@@ -442,7 +456,7 @@
                 if (%default and 0b0001 !== 0) {
                   modifier = Companion
                 }
-                println()
+                used(modifier)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -498,6 +512,46 @@
     )
 
     @Test
+    fun testLocalComposableFunctions(): Unit = comparisonPropagation(
+        """
+            @Composable fun A(a: Int) {}
+        """,
+        """
+            @Composable
+            fun Example(a: Int) {
+                @Composable fun Inner() {
+                    A(a)
+                }
+                Inner()
+            }
+        """,
+        """
+            @Composable
+            fun Example(a: Int, %composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>, "C(Example)<Inner(...>:Test.kt")
+              val %dirty = %changed
+              if (%changed and 0b1110 === 0) {
+                %dirty = %dirty or if (%composer.changed(a)) 0b0100 else 0b0010
+              }
+              if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
+                @Composable
+                fun Inner(%composer: Composer?, %changed: Int) {
+                  %composer.startReplaceableGroup(<>, "C(Inner)<A(a)>:Test.kt")
+                  A(a, %composer, 0b1110 and %dirty)
+                  %composer.endReplaceableGroup()
+                }
+                Inner(%composer, 0)
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                Example(a, %composer, %changed or 0b0001)
+              }
+            }
+        """
+    )
+
+    @Test
     fun testLoopWithContinueAndCallAfter(): Unit = comparisonPropagation(
         """
             @Composable fun Call() {}
@@ -557,7 +611,8 @@
         """
             @Composable
             fun SimpleBox(modifier: Modifier = Modifier, shape: Shape = RectangleShape) {
-               println()
+                used(modifier)
+                used(shape)
             }
         """,
         """
@@ -590,7 +645,8 @@
                     %dirty = %dirty and 0b01110000.inv()
                   }
                 }
-                println()
+                used(modifier)
+                used(shape)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -614,13 +670,14 @@
         """
             @Composable
             fun SimpleBox(modifier: Modifier = Modifier, content: @Composable() () -> Unit = {}) {
-               println()
+                used(modifier)
+                content()
             }
         """,
         """
             @Composable
             fun SimpleBox(modifier: Modifier?, content: Function2<Composer, Int, Unit>?, %composer: Composer?, %changed: Int, %default: Int) {
-              %composer = %composer.startRestartGroup(<>, "C(SimpleBox)P(1):Test.kt")
+              %composer = %composer.startRestartGroup(<>, "C(SimpleBox)P(1)<conten...>:Test.kt")
               val %dirty = %changed
               if (%default and 0b0001 !== 0) {
                 %dirty = %dirty or 0b0110
@@ -647,7 +704,8 @@
                     %dirty = %dirty and 0b01110000.inv()
                   }
                 }
-                println()
+                used(modifier)
+                content(%composer, 0b1110 and %dirty shr 0b0011)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -733,7 +791,7 @@
         """
         """,
         """
-            @Composable fun SomeThing(content: @Composable() () -> Unit) {}
+            @Composable fun SomeThing(content: @Composable() () -> Unit) { content() }
 
             @Composable
             fun Example() {
@@ -745,12 +803,13 @@
         """
             @Composable
             fun SomeThing(content: Function2<Composer, Int, Unit>, %composer: Composer?, %changed: Int) {
-              %composer = %composer.startRestartGroup(<>, "C(SomeThing):Test.kt")
+              %composer = %composer.startRestartGroup(<>, "C(SomeThing)<conten...>:Test.kt")
               val %dirty = %changed
               if (%changed and 0b1110 === 0) {
                 %dirty = %dirty or if (%composer.changed(content)) 0b0100 else 0b0010
               }
               if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
+                content(%composer, 0b1110 and %dirty)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -904,9 +963,7 @@
               @Composable
               fun A(%composer: Composer?, %changed: Int) {
                 %composer = %composer.startRestartGroup(<>, "C(A):Test.kt")
-                val %dirty = %changed
-                %dirty = %dirty or 0b0110
-                if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
+                if (%changed and 0b0001 !== 0 || !%composer.skipping) {
                   print("hello world")
                 } else {
                   %composer.skipToGroupEnd()
@@ -919,7 +976,6 @@
               @Composable
               fun B(%composer: Composer?, %changed: Int) {
                 %composer = %composer.startRestartGroup(<>, "C(B):Test.kt")
-                val %dirty = %changed
                 print(counter)
                 val tmp0_rcvr = <this>
                 %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
@@ -939,7 +995,9 @@
         """
             @Composable
             fun Example(a: Int = 0, b: Int = makeInt(), c: Int = 0) {
-
+                used(a)
+                used(b)
+                used(c)
             }
         """,
         """
@@ -980,6 +1038,9 @@
                     %dirty = %dirty and 0b01110000.inv()
                   }
                 }
+                used(a)
+                used(b)
+                used(c)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -1001,7 +1062,9 @@
             }
             @Composable
             fun Test(x: Int = 0, y: Int = 0) {
+                used(y)
                 Wrap(10) {
+                    used(it)
                     A(x)
                 }
             }
@@ -1047,12 +1110,14 @@
                 if (%default and 0b0010 !== 0) {
                   y = 0
                 }
+                used(y)
                 Wrap(10, composableLambda(%composer, <>, true, "C<A(x)>:Test.kt") { it: Int, %composer: Composer?, %changed: Int ->
                   val %dirty = %changed
                   if (%changed and 0b1110 === 0) {
                     %dirty = %dirty or if (%composer.changed(it)) 0b0100 else 0b0010
                   }
                   if (%dirty and 0b01011011 xor 0b00010010 !== 0 || !%composer.skipping) {
+                    used(it)
                     A(x, 0, %composer, 0b1110 and %dirty, 0b0010)
                   } else {
                     %composer.skipToGroupEnd()
@@ -1186,9 +1251,12 @@
         """,
         """
             @Composable fun CanSkip(a: Int = 0, b: Foo = Foo()) {
-                print("Hello World")
+                used(a)
+                used(b)
             }
             @Composable fun CannotSkip(a: Int, b: Foo) {
+                used(a)
+                used(b)
                 print("Hello World")
             }
             @Composable fun NoParams() {
@@ -1226,7 +1294,8 @@
                     %dirty = %dirty and 0b01110000.inv()
                   }
                 }
-                print("Hello World")
+                used(a)
+                used(b)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -1237,6 +1306,8 @@
             @Composable
             fun CannotSkip(a: Int, b: Foo, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>, "C(CannotSkip):Test.kt")
+              used(a)
+              used(b)
               print("Hello World")
               %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
                 CannotSkip(a, b, %composer, %changed or 0b0001)
@@ -1258,6 +1329,48 @@
     )
 
     @Test
+    fun testOptionalUnstableWithStableExtensionReceiver(): Unit = comparisonPropagation(
+        """
+            class Foo(var value: Int = 0)
+            class Bar
+        """,
+        """
+            @Composable fun Bar.CanSkip(b: Foo = Foo()) {
+                print("Hello World")
+            }
+        """,
+        """
+            @Composable
+            fun Bar.CanSkip(b: Foo?, %composer: Composer?, %changed: Int, %default: Int) {
+              %composer = %composer.startRestartGroup(<>, "C(CanSkip):Test.kt")
+              val %dirty = %changed
+              if (%default.inv() and 0b0001 !== 0 || %dirty and 0b0001 !== 0 || !%composer.skipping) {
+                if (%changed and 0b0001 === 0 || %composer.defaultsInvalid) {
+                  %composer.startDefaults()
+                  if (%default and 0b0001 !== 0) {
+                    b = Foo(
+                    )
+                    %dirty = %dirty and 0b01110000.inv()
+                  }
+                  %composer.endDefaults()
+                } else {
+                  %composer.skipCurrentGroup()
+                  if (%default and 0b0001 !== 0) {
+                    %dirty = %dirty and 0b01110000.inv()
+                  }
+                }
+                print("Hello World")
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                CanSkip(b, %composer, %changed or 0b0001, %default)
+              }
+            }
+        """
+    )
+
+    @Test
     fun testNoParams(): Unit = comparisonPropagation(
         """
             @Composable fun A() {}
@@ -1331,7 +1444,10 @@
             }
 
             @Composable
-            fun B(text: String, color: Color = Color.Unset) {}
+            fun B(text: String, color: Color = Color.Unset) {
+                used(text)
+                used(color)
+            }
         """,
         """
             @Composable
@@ -1376,6 +1492,8 @@
                     %dirty = %dirty and 0b01110000.inv()
                   }
                 }
+                used(text)
+                used(color)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -1785,6 +1903,151 @@
     )
 
     @Test
+    fun testLambdaSkipping(): Unit = comparisonPropagation(
+        """
+        import androidx.compose.runtime.*
+
+        data class User(
+            val id: Int,
+            val name: String
+        )
+
+        interface LazyPagingItems<T> {
+            val itemCount: Int
+            operator fun get(index: Int): State<T?>
+        }
+
+        @Stable interface LazyListScope {
+            fun items(itemCount: Int, itemContent: @Composable LazyItemScope.(Int) -> Unit)
+        }
+
+        @Stable interface LazyItemScope
+
+        public fun <T : Any> LazyListScope.itemsIndexed(
+            lazyPagingItems: LazyPagingItems<T>,
+            itemContent: @Composable LazyItemScope.(Int, T?) -> Unit
+        ) {
+            items(lazyPagingItems.itemCount) { index ->
+                val item = lazyPagingItems[index].value
+                itemContent(index, item)
+            }
+        }
+        """,
+        """
+            fun LazyListScope.Example(items: LazyPagingItems<User>) {
+                itemsIndexed(items) { index, user ->
+                    print("Hello World")
+                }
+            }
+        """,
+        """
+            fun LazyListScope.Example(items: LazyPagingItems<User>) {
+              itemsIndexed(items, ComposableSingletons%TestKt.lambda-1)
+            }
+            internal object ComposableSingletons%TestKt {
+              val lambda-1: @[ExtensionFunctionType] Function5<LazyItemScope, Int, User?, Composer, Int, Unit> = composableLambdaInstance(<>, false, "C:Test.kt") { index: Int, user: User?, %composer: Composer?, %changed: Int ->
+                if (%changed and 0b0001010000000001 xor 0b010000000000 !== 0 || !%composer.skipping) {
+                  print("Hello World")
+                } else {
+                  %composer.skipToGroupEnd()
+                }
+              }
+            }
+        """
+    )
+
+    @Test
+    fun testPassedExtensionWhenExtensionIsPotentiallyUnstable(): Unit = comparisonPropagation(
+        """
+            interface Unstable
+        """,
+        """
+            @Composable fun Unstable.Test() {
+                doSomething(this) // does this reference %dirty without %dirty
+            }
+
+            @Composable fun doSomething(x: Unstable) {}
+        """,
+        """
+            @Composable
+            fun Unstable.Test(%composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>, "C(Test)<doSome...>:Test.kt")
+              val %dirty = %changed
+              if (%changed and 0b1110 === 0) {
+                %dirty = %dirty or if (%composer.changed(<this>)) 0b0100 else 0b0010
+              }
+              if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
+                doSomething(<this>, %composer, 0b1110 and %dirty)
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                Test(%composer, %changed or 0b0001)
+              }
+            }
+            @Composable
+            fun doSomething(x: Unstable, %composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>, "C(doSomething):Test.kt")
+              if (%changed and 0b0001 !== 0 || !%composer.skipping) {
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                doSomething(x, %composer, %changed or 0b0001)
+              }
+            }
+        """
+    )
+
+    @Test
+    fun testReceiverIssue(): Unit = comparisonPropagation(
+        """
+            class Foo
+        """,
+        """
+            import androidx.compose.runtime.ExplicitGroupsComposable
+
+            @Composable
+            @ExplicitGroupsComposable
+            fun A(foo: Foo) {
+                foo.b()
+            }
+
+            @Composable
+            @ExplicitGroupsComposable
+            inline fun Foo.b(label: String = "") {
+                c(this, label)
+            }
+
+            @Composable
+            @ExplicitGroupsComposable
+            inline fun c(foo: Foo, label: String) {
+                print(label)
+            }
+        """,
+        """
+            @Composable
+            @ExplicitGroupsComposable
+            fun A(foo: Foo, %composer: Composer?, %changed: Int) {
+              foo.b(null, %composer, 0b1110 and %changed, 0b0001)
+            }
+            @Composable
+            @ExplicitGroupsComposable
+            fun Foo.b(label: String?, %composer: Composer?, %changed: Int, %default: Int) {
+              if (%default and 0b0001 !== 0) {
+                label = ""
+              }
+              c(<this>, label, %composer, 0b1110 and %changed or 0b01110000 and %changed)
+            }
+            @Composable
+            @ExplicitGroupsComposable
+            fun c(foo: Foo, label: String, %composer: Composer?, %changed: Int) {
+              print(label)
+            }
+        """
+    )
+
+    @Test
     fun testDifferentParameters(): Unit = comparisonPropagation(
         """
             @Composable fun B(a: Int, b: Int, c: Int, d: Int) {}
@@ -1838,12 +2101,12 @@
             val unstableUnused: @Composable Foo.() -> Unit = {
             }
             val unstableUsed: @Composable Foo.() -> Unit = {
-                print(x)
+                used(x)
             }
             val stableUnused: @Composable StableFoo.() -> Unit = {
             }
             val stableUsed: @Composable StableFoo.() -> Unit = {
-                print(x)
+                used(x)
             }
         """,
         """
@@ -1853,9 +2116,7 @@
             val stableUsed: @[ExtensionFunctionType] Function3<StableFoo, Composer, Int, Unit> = ComposableSingletons%TestKt.lambda-4
             internal object ComposableSingletons%TestKt {
               val lambda-1: @[ExtensionFunctionType] Function3<Foo, Composer, Int, Unit> = composableLambdaInstance(<>, false, "C:") { %composer: Composer?, %changed: Int ->
-                val %dirty = %changed
-                %dirty = %dirty or 0b0110
-                if (%dirty and 0b01011011 xor 0b00010010 !== 0 || !%composer.skipping) {
+                if (%changed and 0b01010001 xor 0b00010000 !== 0 || !%composer.skipping) {
                   Unit
                 } else {
                   %composer.skipToGroupEnd()
@@ -1863,12 +2124,17 @@
               }
               val lambda-2: @[ExtensionFunctionType] Function3<Foo, Composer, Int, Unit> = composableLambdaInstance(<>, false, "C:") { %composer: Composer?, %changed: Int ->
                 val %dirty = %changed
-                print(%this%null.x)
+                if (%changed and 0b1110 === 0) {
+                  %dirty = %dirty or if (%composer.changed(%this%null)) 0b0100 else 0b0010
+                }
+                if (%dirty and 0b01011011 xor 0b00010010 !== 0 || !%composer.skipping) {
+                  used(%this%null.x)
+                } else {
+                  %composer.skipToGroupEnd()
+                }
               }
               val lambda-3: @[ExtensionFunctionType] Function3<StableFoo, Composer, Int, Unit> = composableLambdaInstance(<>, false, "C:") { %composer: Composer?, %changed: Int ->
-                val %dirty = %changed
-                %dirty = %dirty or 0b0110
-                if (%dirty and 0b01011011 xor 0b00010010 !== 0 || !%composer.skipping) {
+                if (%changed and 0b01010001 xor 0b00010000 !== 0 || !%composer.skipping) {
                   Unit
                 } else {
                   %composer.skipToGroupEnd()
@@ -1880,7 +2146,7 @@
                   %dirty = %dirty or if (%composer.changed(%this%null)) 0b0100 else 0b0010
                 }
                 if (%dirty and 0b01011011 xor 0b00010010 !== 0 || !%composer.skipping) {
-                  print(%this%null.x)
+                  used(%this%null.x)
                 } else {
                   %composer.skipToGroupEnd()
                 }
@@ -1974,19 +2240,9 @@
               if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
                 @Composable
                 fun foo(y: Int, %composer: Composer?, %changed: Int) {
-                  %composer = %composer.startRestartGroup(<>, "C(foo)<B(x,>:Test.kt")
-                  val %dirty = %changed
-                  if (%changed and 0b1110 === 0) {
-                    %dirty = %dirty or if (%composer.changed(y)) 0b0100 else 0b0010
-                  }
-                  if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
-                    B(x, y, %composer, 0b1110 and %dirty or 0b01110000 and %dirty shl 0b0011)
-                  } else {
-                    %composer.skipToGroupEnd()
-                  }
-                  %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
-                    foo(y, %composer, %changed or 0b0001)
-                  }
+                  %composer.startReplaceableGroup(<>, "C(foo)<B(x,>:Test.kt")
+                  B(x, y, %composer, 0b1110 and %dirty or 0b01110000 and %changed shl 0b0011)
+                  %composer.endReplaceableGroup()
                 }
                 foo(x, %composer, 0b1110 and %dirty)
               } else {
@@ -2580,13 +2836,15 @@
                 paddingStart: Dp = Dp.Unspecified,
                 content: @Composable () -> Unit = {}
             ) {
-
+                used(modifier)
+                used(paddingStart)
+                content()
             }
         """,
         """
             @Composable
             fun Box2(modifier: Modifier?, paddingStart: Dp, content: Function2<Composer, Int, Unit>?, %composer: Composer?, %changed: Int, %default: Int) {
-              %composer = %composer.startRestartGroup(<>, "C(Box2)P(1,2:c#ui.unit.Dp):Test.kt")
+              %composer = %composer.startRestartGroup(<>, "C(Box2)P(1,2:c#ui.unit.Dp)<conten...>:Test.kt")
               val %dirty = %changed
               if (%default and 0b0001 !== 0) {
                 %dirty = %dirty or 0b0110
@@ -2623,6 +2881,9 @@
                     %dirty = %dirty and 0b001110000000.inv()
                   }
                 }
+                used(modifier)
+                used(paddingStart)
+                content(%composer, 0b1110 and %dirty shr 0b0110)
               } else {
                 %composer.skipToGroupEnd()
               }
@@ -2693,4 +2954,139 @@
             }
         """
     )
+
+    @Test
+    fun testUnusedParameters(): Unit = comparisonPropagation(
+        """
+            class Unstable(var count: Int)
+            class Stable(val count: Int)
+            interface MaybeStable
+        """,
+        """
+            @Composable
+            fun Unskippable(a: Unstable, b: Stable, c: MaybeStable) {
+                used(a)
+            }
+            @Composable
+            fun Skippable1(a: Unstable, b: Stable, c: MaybeStable) {
+                used(b)
+            }
+            @Composable
+            fun Skippable2(a: Unstable, b: Stable, c: MaybeStable) {
+                used(c)
+            }
+            @Composable
+            fun Skippable3(a: Unstable, b: Stable, c: MaybeStable) { }
+        """,
+        """
+            @Composable
+            fun Unskippable(a: Unstable, b: Stable, c: MaybeStable, %composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>, "C(Unskippable):Test.kt")
+              used(a)
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                Unskippable(a, b, c, %composer, %changed or 0b0001)
+              }
+            }
+            @Composable
+            fun Skippable1(a: Unstable, b: Stable, c: MaybeStable, %composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>, "C(Skippable1):Test.kt")
+              val %dirty = %changed
+              if (%changed and 0b01110000 === 0) {
+                %dirty = %dirty or if (%composer.changed(b)) 0b00100000 else 0b00010000
+              }
+              if (%dirty and 0b01010001 xor 0b00010000 !== 0 || !%composer.skipping) {
+                used(b)
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                Skippable1(a, b, c, %composer, %changed or 0b0001)
+              }
+            }
+            @Composable
+            fun Skippable2(a: Unstable, b: Stable, c: MaybeStable, %composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>, "C(Skippable2):Test.kt")
+              val %dirty = %changed
+              if (%changed and 0b001110000000 === 0) {
+                %dirty = %dirty or if (%composer.changed(c)) 0b000100000000 else 0b10000000
+              }
+              if (%dirty and 0b001010000001 xor 0b10000000 !== 0 || !%composer.skipping) {
+                used(c)
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                Skippable2(a, b, c, %composer, %changed or 0b0001)
+              }
+            }
+            @Composable
+            fun Skippable3(a: Unstable, b: Stable, c: MaybeStable, %composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>, "C(Skippable3):Test.kt")
+              if (%changed and 0b0001 !== 0 || !%composer.skipping) {
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                Skippable3(a, b, c, %composer, %changed or 0b0001)
+              }
+            }
+        """
+    )
+
+    @Test
+    fun testExtensionReceiver(): Unit = comparisonPropagation(
+        """
+            interface MaybeStable
+        """,
+        """
+            @Composable fun MaybeStable.example(x: Int) {
+                used(this)
+                used(x)
+            }
+            val example: @Composable MaybeStable.(Int) -> Unit = {
+                used(this)
+                used(it)
+            }
+        """,
+        """
+            @Composable
+            fun MaybeStable.example(x: Int, %composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>, "C(example):Test.kt")
+              val %dirty = %changed
+              if (%changed and 0b1110 === 0) {
+                %dirty = %dirty or if (%composer.changed(<this>)) 0b0100 else 0b0010
+              }
+              if (%changed and 0b01110000 === 0) {
+                %dirty = %dirty or if (%composer.changed(x)) 0b00100000 else 0b00010000
+              }
+              if (%dirty and 0b01011011 xor 0b00010010 !== 0 || !%composer.skipping) {
+                used(<this>)
+                used(x)
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                example(x, %composer, %changed or 0b0001)
+              }
+            }
+            val example: @[ExtensionFunctionType] Function4<MaybeStable, Int, Composer, Int, Unit> = ComposableSingletons%TestKt.lambda-1
+            internal object ComposableSingletons%TestKt {
+              val lambda-1: @[ExtensionFunctionType] Function4<MaybeStable, Int, Composer, Int, Unit> = composableLambdaInstance(<>, false, "C:") { it: Int, %composer: Composer?, %changed: Int ->
+                val %dirty = %changed
+                if (%changed and 0b1110 === 0) {
+                  %dirty = %dirty or if (%composer.changed(%this%null)) 0b0100 else 0b0010
+                }
+                if (%changed and 0b01110000 === 0) {
+                  %dirty = %dirty or if (%composer.changed(it)) 0b00100000 else 0b00010000
+                }
+                if (%dirty and 0b001011011011 xor 0b10010010 !== 0 || !%composer.skipping) {
+                  used(%this%null)
+                  used(it)
+                } else {
+                  %composer.skipToGroupEnd()
+                }
+              }
+            }
+        """
+    )
 }
\ No newline at end of file

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/LambdaMemoizationTransformTests.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/LambdaMemoizationTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/LambdaMemoizationTransformTests.kt
index 7e64583..838f9bf 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/LambdaMemoizationTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/LambdaMemoizationTransformTests.kt
@@ -57,7 +57,7 @@
 
             @Composable fun Example() {
                 @Composable fun A() { }
-                @Composable fun B(content: @Composable () -> Unit) { }
+                @Composable fun B(content: @Composable () -> Unit) { content() }
                 @Composable fun C() {
                     B { A() }
                 }
@@ -70,47 +70,26 @@
               if (%changed !== 0 || !%composer.skipping) {
                 @Composable
                 fun A(%composer: Composer?, %changed: Int) {
-                  %composer = %composer.startRestartGroup(<>, "C(A):Test.kt")
-                  if (%changed !== 0 || !%composer.skipping) {
-                  } else {
-                    %composer.skipToGroupEnd()
-                  }
-                  %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
-                    A(%composer, %changed or 0b0001)
-                  }
+                  %composer.startReplaceableGroup(<>, "C(A):Test.kt")
+                  %composer.endReplaceableGroup()
                 }
                 @Composable
                 fun B(content: Function2<Composer, Int, Unit>, %composer: Composer?, %changed: Int) {
-                  %composer = %composer.startRestartGroup(<>, "C(B):Test.kt")
-                  val %dirty = %changed
-                  if (%changed and 0b1110 === 0) {
-                    %dirty = %dirty or if (%composer.changed(content)) 0b0100 else 0b0010
-                  }
-                  if (%dirty and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
-                  } else {
-                    %composer.skipToGroupEnd()
-                  }
-                  %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
-                    B(content, %composer, %changed or 0b0001)
-                  }
+                  %composer.startReplaceableGroup(<>, "C(B)<conten...>:Test.kt")
+                  content(%composer, 0b1110 and %changed)
+                  %composer.endReplaceableGroup()
                 }
                 @Composable
                 fun C(%composer: Composer?, %changed: Int) {
-                  %composer = %composer.startRestartGroup(<>, "C(C)<B>:Test.kt")
-                  if (%changed !== 0 || !%composer.skipping) {
-                    B(composableLambda(%composer, <>, false, "C<A()>:Test.kt") { %composer: Composer?, %changed: Int ->
-                      if (%changed and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
-                        A(%composer, 0)
-                      } else {
-                        %composer.skipToGroupEnd()
-                      }
-                    }, %composer, 0b0110)
-                  } else {
-                    %composer.skipToGroupEnd()
-                  }
-                  %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
-                    C(%composer, %changed or 0b0001)
-                  }
+                  %composer.startReplaceableGroup(<>, "C(C)<B>:Test.kt")
+                  B(composableLambda(%composer, <>, false, "C<A()>:Test.kt") { %composer: Composer?, %changed: Int ->
+                    if (%changed and 0b1011 xor 0b0010 !== 0 || !%composer.skipping) {
+                      A(%composer, 0)
+                    } else {
+                      %composer.skipToGroupEnd()
+                    }
+                  }, %composer, 0b0110)
+                  %composer.endReplaceableGroup()
                 }
               } else {
                 %composer.skipToGroupEnd()

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/RememberIntrinsicTransformTests.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/RememberIntrinsicTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/RememberIntrinsicTransformTests.kt
index 9d46a28..51532ad 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/RememberIntrinsicTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/RememberIntrinsicTransformTests.kt
@@ -17,6 +17,7 @@
 package androidx.compose.compiler.plugins.kotlin
 
 import org.intellij.lang.annotations.Language
+import org.junit.Ignore
 import org.junit.Test
 
 class RememberIntrinsicTransformTests : ComposeIrTransformTest() {
@@ -39,6 +40,7 @@
             import androidx.compose.runtime.Composable
 
             $unchecked
+            fun used(x: Any?) {}
         """.trimIndent(),
         dumpTree = dumpTree
     )
@@ -666,6 +668,7 @@
             @Composable
             fun Test(items: List<Int>) {
                 val foo = remember { Foo() }
+                used(items)
             }
         """,
         """
@@ -676,6 +679,7 @@
                 val tmp0_return = Foo()
                 tmp0_return
               }
+              used(items)
               %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
                 Test(items, %composer, %changed or 0b0001)
               }
@@ -900,8 +904,8 @@
         """
     )
 
-    @Test
-    fun testOptimizationFailsIfDefaultsGroupIsUsed(): Unit = comparisonPropagation(
+    @Ignore("This test must pass before intrinsic remember can be turned on")
+    fun xtestOptimizationFailsIfDefaultsGroupIsUsed(): Unit = comparisonPropagation(
         """
             class Foo
             fun someInt(): Int = 123
@@ -910,8 +914,8 @@
             @Composable
             fun Test(a: Int = someInt()) {
                 val foo = remember { Foo() }
-                print(foo)
-                print(a)
+                used(foo)
+                used(a)
             }
         """,
         """
@@ -940,8 +944,8 @@
                   val tmp0_return = Foo()
                   tmp0_return
                 }, %composer, 0)
-                print(foo)
-                print(a)
+                used(foo)
+                used(a)
               } else {
                 %composer.skipToGroupEnd()
               }

compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/analysis/ComposableCheckerTests.kt

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/analysis/ComposableCheckerTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/analysis/ComposableCheckerTests.kt
index 877bd29..1b21477 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/analysis/ComposableCheckerTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/analysis/ComposableCheckerTests.kt
@@ -1095,6 +1095,17 @@
     """
     )
 
+    fun testComposableLambdaToAll() = check(
+        """
+        import androidx.compose.runtime.*
+
+        fun foo() {
+            val lambda = @Composable { }
+            println(lambda)  // println accepts Any, verify no type mismatach.
+        }
+    """
+    )
+
     fun testReadOnlyComposablePropagation() = check(
         """
         import androidx.compose.runtime.*

compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposableCallChecker.kt

diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposableCallChecker.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposableCallChecker.kt
index 90b9bfb..acebc74 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposableCallChecker.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposableCallChecker.kt
@@ -65,6 +65,7 @@
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.lowerIfFlexible
 import org.jetbrains.kotlin.types.typeUtil.builtIns
+import org.jetbrains.kotlin.types.typeUtil.isAnyOrNullableAny
 import org.jetbrains.kotlin.types.upperIfFlexible
 import org.jetbrains.kotlin.util.OperatorNameConventions
 
@@ -332,6 +333,7 @@
         val expectedType = c.expectedType
         if (expectedType === TypeUtils.NO_EXPECTED_TYPE) return
         if (expectedType === TypeUtils.UNIT_EXPECTED_TYPE) return
+        if (expectedType.isAnyOrNullableAny()) return
         val expectedComposable = expectedType.hasComposableAnnotation()
         if (expression is KtLambdaExpression) {
             val descriptor = bindingContext[BindingContext.FUNCTION, expression.functionLiteral]

compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrorMessages.kt

diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrorMessages.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrorMessages.kt
index e6f7690..49effa6 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrorMessages.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrorMessages.kt
@@ -93,12 +93,6 @@
             "Composable main functions are not currently supported"
         )
         MAP.put(
-            ComposeErrors.ILLEGAL_ASSIGN_TO_UNIONTYPE,
-            "Value of type {0} can't be assigned to union type {1}.",
-            Renderers.RENDER_COLLECTION_OF_TYPES,
-            Renderers.RENDER_COLLECTION_OF_TYPES
-        )
-        MAP.put(
             ComposeErrors.ILLEGAL_TRY_CATCH_AROUND_COMPOSABLE,
             "Try catch is not supported around composable function invocations."
         )

compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrors.kt

diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrors.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrors.kt
index 8a5aff2..e5cd30a 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrors.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrors.kt
@@ -110,12 +110,6 @@
         )
 
     @JvmField
-    val ILLEGAL_ASSIGN_TO_UNIONTYPE =
-        DiagnosticFactory2.create<KtExpression, Collection<KotlinType>, Collection<KotlinType>>(
-            Severity.ERROR
-        )
-
-    @JvmField
     val ILLEGAL_TRY_CATCH_AROUND_COMPOSABLE =
         DiagnosticFactory0.create<PsiElement>(
             Severity.ERROR

compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt

diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt
index a872344..4c86015 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt
@@ -29,6 +29,7 @@
 import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
 import org.jetbrains.kotlin.backend.common.pop
 import org.jetbrains.kotlin.backend.common.push
+import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
@@ -136,7 +137,9 @@
 import org.jetbrains.kotlin.ir.util.functions
 import org.jetbrains.kotlin.ir.util.getPropertyGetter
 import org.jetbrains.kotlin.ir.util.isInlined
+import org.jetbrains.kotlin.ir.util.isLocal
 import org.jetbrains.kotlin.ir.util.isVararg
+import org.jetbrains.kotlin.ir.util.parentClassOrNull
 import org.jetbrains.kotlin.ir.util.patchDeclarationParents
 import org.jetbrains.kotlin.ir.util.properties
 import org.jetbrains.kotlin.ir.util.statements
@@ -251,10 +254,11 @@
 }
 
 interface IrChangedBitMaskValue {
+    val used: Boolean
     fun irLowBit(): IrExpression
     fun irIsolateBitsAtSlot(slot: Int, includeStableBit: Boolean): IrExpression
     fun irSlotAnd(slot: Int, bits: Int): IrExpression
-    fun irHasDifferences(): IrExpression
+    fun irHasDifferences(usedParams: BooleanArray): IrExpression
     fun irCopyToTemporary(
         nameHint: String? = null,
         isVar: Boolean = false,
@@ -721,6 +725,10 @@
         if (body == null)
             return false
 
+        if (isLocal && parentClassOrNull?.origin != JvmLoweredDeclarationOrigin.LAMBDA_IMPL) {
+            return false
+        }
+
         val descriptor = descriptor
 
         // Do not insert observe scope in an inline function
@@ -730,6 +738,9 @@
         if (descriptor.hasNonRestartableComposableAnnotation())
             return false
 
+        if (descriptor.hasExplicitGroupsAnnotation())
+            return false
+
         // Do not insert an observe scope in an inline composable lambda
         descriptor.findPsi()?.let { psi ->
             (psi as? KtFunctionLiteral)?.let {
@@ -797,31 +808,24 @@
 
         scope.dirty = changedParam
 
-        val realParams = declaration.valueParameters.take(scope.realValueParamCount)
-
-        buildStatementsForSkippingAndDefaults(
-            body,
-            skipPreamble,
-            bodyPreamble,
-            false,
-            realParams,
-            scope,
-            changedParam,
-            changedParam,
-            defaultParam,
-            booleanArrayOf()
-        )
-
-        realParams.forEach {
-            // we want to remove the default expression from the function. This will prevent
-            // the kotlin compiler from doing its own default handling, which we don't need.
-            it.defaultValue = null
-        }
+        val defaultScope = transformDefaults(scope)
 
         var (transformed, returnVar) = body.asBodyAndResultVar()
 
         transformed = transformed.apply { transformChildrenVoid() }
 
+        buildPreambleStatementsAndReturnIfSkippingPossible(
+            body,
+            skipPreamble,
+            bodyPreamble,
+            false,
+            scope,
+            changedParam,
+            changedParam,
+            defaultParam,
+            defaultScope,
+        )
+
         if (!elideGroups) scope.realizeGroup(::irEndReplaceableGroup)
 
         declaration.body = IrBlockBodyImpl(
@@ -836,7 +840,6 @@
                     )
                 else
                     null,
-                *skipPreamble.statements.toTypedArray(),
                 *bodyPreamble.statements.toTypedArray(),
                 *transformed.statements.toTypedArray(),
                 if (!elideGroups) irEndReplaceableGroup() else null,
@@ -865,24 +868,14 @@
         val skipPreamble = mutableStatementContainer()
         val bodyPreamble = mutableStatementContainer()
 
-        val realParams = declaration.valueParameters.take(scope.realValueParamCount)
-
-        val realParamsIncludingThis = realParams + listOfNotNull(
-            declaration.extensionReceiverParameter
-        )
-
-        // boolean array mapped to parameters. true indicates that the type is unstable
-        val unstableMask = realParams.map {
-            stabilityOf(it.type).knownUnstable()
-        }.toBooleanArray()
-
         // we start off assuming that we *can* skip execution of the function
-        var canSkipExecution = unstableMask.none { it } && declaration.returnType.isUnit()
+        var canSkipExecution = declaration.returnType.isUnit() &&
+            scope.allTrackedParams.none { stabilityOf(it.type).knownUnstable() }
 
         // if the function can never skip, or there are no parameters to test, then we
         // don't need to have the dirty parameter locally since it will never be different from
         // the passed in `changed` parameter.
-        val dirty = if (canSkipExecution && realParamsIncludingThis.isNotEmpty())
+        val dirty = if (canSkipExecution && scope.allTrackedParams.isNotEmpty())
         // NOTE(lmr): Technically, dirty is a mutable variable, but we don't want to mark it
         // as one since that will cause a `Ref<Int>` to get created if it is captured. Since
         // we know we will never be mutating this variable _after_ it gets captured, we can
@@ -891,51 +884,40 @@
                 isVar = false,
                 nameHint = "\$dirty",
                 exactName = true
-            ).also {
-                skipPreamble.statements.addAll(it.asStatements())
-            }
+            )
         else
             changedParam
 
         scope.dirty = dirty
 
-        buildStatementsForSkippingAndDefaults(
-            body,
-            skipPreamble,
-            bodyPreamble,
-            canSkipExecution,
-            realParams,
-            scope,
-            dirty,
-            changedParam,
-            null,
-            unstableMask
-        )
-
         val (nonReturningBody, returnVar) = body.asBodyAndResultVar()
 
         // we must transform the body first, since that will allow us to see whether or not we
         // are using the dispatchReceiverParameter or the extensionReceiverParameter
         val transformed = nonReturningBody.apply { transformChildrenVoid() }
 
-        if (declaration.extensionReceiverParameter != null) {
-            canSkipExecution = buildStatementsForSkippingThisParameter(
-                declaration.extensionReceiverParameter!!,
-                scope.extensionReceiverUsed,
-                canSkipExecution,
-                skipPreamble,
-                changedParam,
-                dirty,
-                scope.realValueParamCount
-            )
-        }
+        canSkipExecution = buildPreambleStatementsAndReturnIfSkippingPossible(
+            body,
+            skipPreamble,
+            bodyPreamble,
+            canSkipExecution,
+            scope,
+            dirty,
+            changedParam,
+            null,
+            Scope.ParametersScope(),
+        )
 
+        val dirtyForSkipping = if (dirty.used && dirty is IrChangedBitMaskVariable) {
+            skipPreamble.statements.addAll(0, dirty.asStatements())
+            dirty
+        } else changedParam
         if (canSkipExecution) {
             // We CANNOT skip if any of the following conditions are met
             // 1. if any of the stable parameters have *differences* from last execution.
             // 2. if the composer.skipping call returns false
             val shouldExecute = irOrOr(
-                scope.dirty!!.irHasDifferences(),
+                dirtyForSkipping.irHasDifferences(scope.usedParams),
                 irNot(irIsSkipping())
             )
 
@@ -998,75 +980,24 @@
         val skipPreamble = mutableStatementContainer()
         val bodyPreamble = mutableStatementContainer()
 
-        // these are the parameters excluding the synthetic ones that we generate for compose.
-        // These are the only parameters we want to consider in skipping calculations
-        val realParams = declaration.valueParameters.take(scope.realValueParamCount)
-
-        val thisParams = listOfNotNull(
-            declaration.extensionReceiverParameter,
-            declaration.dispatchReceiverParameter
-        )
-
-        val realParamsIncludingThis = realParams + thisParams
-
         // we start off assuming that we *can* skip execution of the function
         var canSkipExecution = true
 
-        // boolean array mapped to parameters. true indicates that the type is unstable
-        val unstableMask = realParams.map {
-            if (stabilityOf((it.varargElementType ?: it.type)).knownUnstable()) {
-                if (!it.hasDefaultValueSafe()) {
-                    // if it has non-optional unstable params, the function can never skip
-                    canSkipExecution = false
-                }
-                true
-            } else {
-                false
-            }
-        }.toBooleanArray()
-
-        // if the function can never skip, or there are no parameters to test, then we
-        // don't need to have the dirty parameter locally since it will never be different from
-        // the passed in `changed` parameter.
-        val dirty = if (canSkipExecution && realParamsIncludingThis.isNotEmpty())
         // NOTE(lmr): Technically, dirty is a mutable variable, but we don't want to mark it
         // as one since that will cause a `Ref<Int>` to get created if it is captured. Since
         // we know we will never be mutating this variable _after_ it gets captured, we can
         // safely mark this as `isVar = false`.
+        val dirty = if (scope.allTrackedParams.isNotEmpty())
             changedParam.irCopyToTemporary(
                 isVar = false,
                 nameHint = "\$dirty",
                 exactName = true
-            ).also {
-                skipPreamble.statements.addAll(it.asStatements())
-            }
+            )
         else
             changedParam
 
         scope.dirty = dirty
 
-        buildStatementsForSkippingAndDefaults(
-            body,
-            skipPreamble,
-            bodyPreamble,
-            canSkipExecution,
-            realParams,
-            scope,
-            dirty,
-            changedParam,
-            defaultParam,
-            unstableMask
-        )
-
-        realParams.forEach {
-            // we want to remove the default expression from the function. This will prevent
-            // the kotlin compiler from doing its own default handling, which we don't need.
-
-            // NOTE: we are doing this AFTER buildStatementsForSkipping, because the default
-            // value is used in those calculations
-            it.defaultValue = null
-        }
-
         val (nonReturningBody, returnVar) = body.asBodyAndResultVar()
 
         val end = {
@@ -1078,39 +1009,31 @@
             )
         }
 
+        val defaultScope = transformDefaults(scope)
+
         // we must transform the body first, since that will allow us to see whether or not we
         // are using the dispatchReceiverParameter or the extensionReceiverParameter
         val transformed = nonReturningBody.apply { transformChildrenVoid() }
 
-        var slotIndex = scope.realValueParamCount
-
-        if (declaration.extensionReceiverParameter != null) {
-            canSkipExecution = buildStatementsForSkippingThisParameter(
-                declaration.extensionReceiverParameter!!,
-                scope.extensionReceiverUsed,
-                canSkipExecution,
-                skipPreamble,
-                changedParam,
-                dirty,
-                slotIndex++
-            )
-        }
-
-        if (declaration.dispatchReceiverParameter != null) {
-            canSkipExecution = buildStatementsForSkippingThisParameter(
-                declaration.dispatchReceiverParameter!!,
-                scope.dispatchReceiverUsed,
-                canSkipExecution,
-                skipPreamble,
-                changedParam,
-                dirty,
-                slotIndex
-            )
-        }
+        canSkipExecution = buildPreambleStatementsAndReturnIfSkippingPossible(
+            body,
+            skipPreamble,
+            bodyPreamble,
+            canSkipExecution,
+            scope,
+            dirty,
+            changedParam,
+            defaultParam,
+            defaultScope,
+        )
 
         // if it has non-optional unstable params, the function can never skip, so we always
         // execute the body. Otherwise, we wrap the body in an if and only skip when certain
         // conditions are met.
+        val dirtyForSkipping = if (dirty.used && dirty is IrChangedBitMaskVariable) {
+            skipPreamble.statements.addAll(0, dirty.asStatements())
+            dirty
+        } else changedParam
         val transformedBody = if (canSkipExecution) {
             // We CANNOT skip if any of the following conditions are met
             // 1. if any of the stable parameters have *differences* from last execution.
@@ -1119,11 +1042,20 @@
 
             // (3) is only necessary to check if we actually have unstable params, so we only
             // generate that check if we need to.
-
             var shouldExecute = irOrOr(
-                scope.dirty!!.irHasDifferences(),
+                dirtyForSkipping.irHasDifferences(scope.usedParams),
                 irNot(irIsSkipping())
             )
+
+            // boolean array mapped to parameters. true indicates that the type is unstable
+            // NOTE: the unstable mask is indexed by valueParameter index, which is different
+            // than the slotIndex but that is OKAY because we only care about defaults, which
+            // also use the value parameter index.
+            val realParams = declaration.valueParameters.take(scope.realValueParamCount)
+            val unstableMask = realParams.map {
+                stabilityOf((it.varargElementType ?: it.type)).knownUnstable()
+            }.toBooleanArray()
+
             val hasAnyUnstableParams = unstableMask.any { it }
 
             // if there are unstable params, then we fence the whole expression with a check to
@@ -1195,228 +1127,202 @@
         sourceFixups.clear()
     }
 
-    @ObsoleteDescriptorBasedAPI
-    private fun buildStatementsForSkippingThisParameter(
-        thisParam: IrValueParameter,
-        isUsed: Boolean,
-        canSkipExecution: Boolean,
-        preamble: IrStatementContainer,
-        changedParam: IrChangedBitMaskValue,
-        dirty: IrChangedBitMaskValue,
-        index: Int
-    ): Boolean {
-        val type = thisParam.type
-        val isStable = stabilityOf(type).knownStable()
-
-        return when {
-            !isStable && isUsed -> false
-            isStable && isUsed && canSkipExecution && dirty is IrChangedBitMaskVariable -> {
-                preamble.statements.add(
-                    irIf(
-                        // we only call `$composer.changed(...)` on a parameter if the value came in
-                        // with an "Uncertain" state AND the value was provided. This is safe to do
-                        // because this will remain true or false for *every* execution of the
-                        // function, so we will never get a slot table misalignment as a result.
-                        condition = irIsUncertainAndStable(changedParam, index),
-                        body = dirty.irOrSetBitsAtSlot(
-                            index,
-                            irIfThenElse(
-                                context.irBuiltIns.intType,
-                                irChanged(irGet(thisParam)),
-                                // if the value has changed, update the bits in the slot to be
-                                // "Different"
-                                thenPart = irConst(ParamState.Different.bitsForSlot(index)),
-                                // if the value has not changed, update the bits in the slot to
-                                // be "Same"
-                                elsePart = irConst(ParamState.Same.bitsForSlot(index))
-                            )
-                        )
-                    )
-                )
-                true
+    private fun transformDefaults(scope: Scope.FunctionScope): Scope.ParametersScope {
+        val parameters = scope.allTrackedParams
+        val parametersScope = Scope.ParametersScope()
+        parameters.forEach { param ->
+            val defaultValue = param.defaultValue
+            if (defaultValue != null) {
+                defaultValue.expression = inScope(parametersScope) {
+                    defaultValue.expression.transform(this, null)
+                }
             }
-            !isUsed && canSkipExecution && dirty is IrChangedBitMaskVariable -> {
-                // if the param isn't used we can safely ignore it, but if we can skip the
-                // execution of the function, then we need to make sure that we are only
-                // considering the not-ignored parameters. to do this, we set the changed slot bits
-                // to Static
-                preamble.statements.add(
-                    dirty.irOrSetBitsAtSlot(
-                        index,
-                        irConst(ParamState.Static.bitsForSlot(index))
-                    )
-                )
-            }
-            // nothing changes
-            else -> canSkipExecution
         }
+        return parametersScope
     }
 
     @ObsoleteDescriptorBasedAPI
-    private fun buildStatementsForSkippingAndDefaults(
+    private fun buildPreambleStatementsAndReturnIfSkippingPossible(
         sourceElement: IrElement,
         skipPreamble: IrStatementContainer,
         bodyPreamble: IrStatementContainer,
-        canSkipExecution: Boolean,
-        parameters: List<IrValueParameter>,
+        isSkippableDeclaration: Boolean,
         scope: Scope.FunctionScope,
         dirty: IrChangedBitMaskValue,
         changedParam: IrChangedBitMaskValue,
         defaultParam: IrDefaultBitMaskValue?,
-        unstableMask: BooleanArray
-    ) {
+        defaultScope: Scope.ParametersScope
+    ): Boolean {
+        val parameters = scope.allTrackedParams
         // we default to true because the absence of a default expression we want to consider as
         // "static"
         val defaultExprIsStatic = BooleanArray(parameters.size) { true }
         val defaultExpr = Array<IrExpression?>(parameters.size) { null }
+        val stabilities = Array(parameters.size) { Stability.Unstable }
+        var mightSkip = isSkippableDeclaration
 
-        // first we create the necessary local variables for default handling.
         val setDefaults = mutableStatementContainer()
         val skipDefaults = mutableStatementContainer()
-        val parametersScope = Scope.ParametersScope()
-        parameters.forEachIndexed { index, param ->
-            val defaultValue = param.defaultValue
+//        val parametersScope = Scope.ParametersScope()
+        parameters.forEachIndexed { slotIndex, param ->
+            val defaultIndex = scope.defaultIndexForSlotIndex(slotIndex)
+            val defaultValue = param.defaultValue?.expression
             if (defaultParam != null && defaultValue != null) {
-                val transformedDefault = inScope(parametersScope) {
-                    defaultValue.expression.transform(this, null)
-                }
+//                val transformedDefault = inScope(parametersScope) {
+//                    defaultValue.expression.transform(this, null)
+//                }
 
                 // we want to call this on the transformed version.
-                defaultExprIsStatic[index] = transformedDefault.isStatic()
-                defaultExpr[index] = transformedDefault
-
-                // Generate code to reassign parameter local for default arguments.
-                if (
-                    canSkipExecution &&
-                    !defaultExprIsStatic[index] &&
-                    dirty is IrChangedBitMaskVariable
-                ) {
-                    // If we are setting the parameter to the default expression and
-                    // running the default expression again, and the expression isn't
-                    // provably static, we can't be certain that the dirty value of
-                    // SAME is going to be valid. We must mark it as UNCERTAIN. In order
-                    // to avoid slot-table misalignment issues, we must mark it as
-                    // UNCERTAIN even when we skip the defaults, so that any child
-                    // function receives UNCERTAIN vs SAME/DIFFERENT deterministically.
-                    setDefaults.statements.add(
-                        irIf(
-                            condition = irGetBit(defaultParam, index),
-                            body = irBlock(
-                                statements = listOf(
-                                    irSet(param, transformedDefault),
-                                    dirty.irSetSlotUncertain(index)
+                defaultExprIsStatic[slotIndex] = defaultValue.isStatic()
+                defaultExpr[slotIndex] = defaultValue
+                val hasStaticDefaultExpr = defaultExprIsStatic[slotIndex]
+                when {
+                    isSkippableDeclaration && !hasStaticDefaultExpr &&
+                        dirty is IrChangedBitMaskVariable -> {
+                        // If we are setting the parameter to the default expression and
+                        // running the default expression again, and the expression isn't
+                        // provably static, we can't be certain that the dirty value of
+                        // SAME is going to be valid. We must mark it as UNCERTAIN. In order
+                        // to avoid slot-table misalignment issues, we must mark it as
+                        // UNCERTAIN even when we skip the defaults, so that any child
+                        // function receives UNCERTAIN vs SAME/DIFFERENT deterministically.
+                        setDefaults.statements.add(
+                            irIf(
+                                condition = irGetBit(defaultParam, defaultIndex),
+                                body = irBlock(
+                                    statements = listOf(
+                                        irSet(param, defaultValue),
+                                        dirty.irSetSlotUncertain(slotIndex)
+                                    )
                                 )
                             )
                         )
-                    )
-                    skipDefaults.statements.add(
-                        irIf(
-                            condition = irGetBit(defaultParam, index),
-                            body = dirty.irSetSlotUncertain(index)
+                        skipDefaults.statements.add(
+                            irIf(
+                                condition = irGetBit(defaultParam, defaultIndex),
+                                body = dirty.irSetSlotUncertain(slotIndex)
+                            )
                         )
-                    )
-                } else {
-                    setDefaults.statements.add(
-                        irIf(
-                            condition = irGetBit(defaultParam, index),
-                            body = irSet(param, transformedDefault)
+                    }
+                    else -> {
+                        setDefaults.statements.add(
+                            irIf(
+                                condition = irGetBit(defaultParam, defaultIndex),
+                                body = irSet(param, defaultValue)
+                            )
                         )
-                    )
+                    }
                 }
             }
-
-            // In order to propagate the change detection we might perform on this parameter,
-            // we need to know which "slot" it is in
-            scope.remappedParams[param] = param
-            scope.paramsToSlots[param] = index
         }
+
+        parameters.forEachIndexed { slotIndex, param ->
+            val stability = stabilityOf(param.varargElementType ?: param.type)
+
+            stabilities[slotIndex] = stability
+
+            val isRequired = param.defaultValue == null
+            val isUnstable = stability.knownUnstable()
+            val isUsed = scope.usedParams[slotIndex]
+
+            if (isUsed && isUnstable && isRequired) {
+                // if it is a used + unstable parameter with no default expression, the fn
+                // will _never_ skip
+                mightSkip = false
+            }
+        }
+
         // we start the skipPreamble with all of the changed calls. These need to go at the top
         // of the function's group. Note that these end up getting called *before* default
         // expressions, but this is okay because it will only ever get called on parameters that
         // are provided to the function
-        parameters.forEachIndexed { index, param ->
+        parameters.forEachIndexed { slotIndex, param ->
             // varargs get handled separately because they will require their own groups
             if (param.isVararg) return@forEachIndexed
+            val defaultIndex = scope.defaultIndexForSlotIndex(slotIndex)
             val defaultValue = param.defaultValue
-            if (canSkipExecution && dirty is IrChangedBitMaskVariable) {
-                if (unstableMask[index]) {
-                    if (defaultParam != null && defaultValue != null) {
-                        skipPreamble.statements.add(
-                            irIf(
-                                condition = irGetBit(defaultParam, index),
-                                body = dirty.irOrSetBitsAtSlot(
-                                    index,
-                                    irConst(ParamState.Same.bitsForSlot(index))
+            val isUnstable = stabilities[slotIndex].knownUnstable()
+            val isUsed = scope.usedParams[slotIndex]
+
+            when {
+                !mightSkip || !isUsed -> {
+                    // nothing to do
+                }
+                dirty !is IrChangedBitMaskVariable -> {
+                    // this will only ever be true when mightSkip is false, but we put this
+                    // branch here so that `dirty` gets smart cast in later branches
+                }
+                isUnstable && defaultParam != null && defaultValue != null -> {
+                    // if it has a default parameter then the function can still potentially skip
+                    skipPreamble.statements.add(
+                        irIf(
+                            condition = irGetBit(defaultParam, defaultIndex),
+                            body = dirty.irOrSetBitsAtSlot(
+                                slotIndex,
+                                irConst(ParamState.Same.bitsForSlot(slotIndex))
+                            )
+                        )
+                    )
+                }
+                !isUnstable -> {
+                    val defaultValueIsStatic = defaultExprIsStatic[slotIndex]
+                    val callChanged = irChanged(irGet(param))
+                    val isChanged = if (defaultParam != null && !defaultValueIsStatic)
+                        irAndAnd(irIsProvided(defaultParam, slotIndex), callChanged)
+                    else
+                        callChanged
+                    val modifyDirtyFromChangedResult = dirty.irOrSetBitsAtSlot(
+                        slotIndex,
+                        irIfThenElse(
+                            context.irBuiltIns.intType,
+                            isChanged,
+                            // if the value has changed, update the bits in the slot to be
+                            // "Different"
+                            thenPart = irConst(ParamState.Different.bitsForSlot(slotIndex)),
+                            // if the value has not changed, update the bits in the slot to
+                            // be "Same"
+                            elsePart = irConst(ParamState.Same.bitsForSlot(slotIndex))
+                        )
+                    )
+
+                    val stmt = if (defaultParam != null && defaultValueIsStatic) {
+                        // if the default expression is "static", then we know that if we are using the
+                        // default expression, the parameter can be considered "static".
+                        irWhen(
+                            origin = IrStatementOrigin.IF,
+                            branches = listOf(
+                                irBranch(
+                                    condition = irGetBit(defaultParam, defaultIndex),
+                                    result = dirty.irOrSetBitsAtSlot(
+                                        slotIndex,
+                                        irConst(ParamState.Static.bitsForSlot(slotIndex))
+                                    )
+                                ),
+                                irBranch(
+                                    condition = irIsUncertainAndStable(changedParam, slotIndex),
+                                    result = modifyDirtyFromChangedResult
                                 )
                             )
                         )
+                    } else {
+                        // we only call `$composer.changed(...)` on a parameter if the value came in
+                        // with an "Uncertain" state AND the value was provided. This is safe to do
+                        // because this will remain true or false for *every* execution of the
+                        // function, so we will never get a slot table misalignment as a result.
+                        irIf(
+                            condition = irIsUncertainAndStable(changedParam, slotIndex),
+                            body = modifyDirtyFromChangedResult
+                        )
                     }
-
-                    // if the value is unstable, there is no reason for us to store it in the slot table
-                    return@forEachIndexed
+                    skipPreamble.statements.add(stmt)
                 }
-
-                val defaultValueIsStatic = defaultExprIsStatic[index]
-                val callChanged = irChanged(irGet(scope.remappedParams[param]!!))
-                val isChanged = if (defaultParam != null && !defaultValueIsStatic)
-                    irAndAnd(irIsProvided(defaultParam, index), callChanged)
-                else
-                    callChanged
-                val modifyDirtyFromChangedResult = dirty.irOrSetBitsAtSlot(
-                    index,
-                    irIfThenElse(
-                        context.irBuiltIns.intType,
-                        isChanged,
-                        // if the value has changed, update the bits in the slot to be
-                        // "Different"
-                        thenPart = irConst(ParamState.Different.bitsForSlot(index)),
-                        // if the value has not changed, update the bits in the slot to
-                        // be "Same"
-                        elsePart = irConst(ParamState.Same.bitsForSlot(index))
-                    )
-                )
-
-                val stmt = if (defaultParam != null && defaultValueIsStatic) {
-                    // if the default expression is "static", then we know that if we are using the
-                    // default expression, the parameter can be considered "static".
-                    irWhen(
-                        origin = IrStatementOrigin.IF,
-                        branches = listOf(
-                            irBranch(
-                                condition = irGetBit(defaultParam, index),
-                                result = dirty.irOrSetBitsAtSlot(
-                                    index,
-                                    irConst(ParamState.Static.bitsForSlot(index))
-                                )
-                            ),
-                            irBranch(
-                                condition = irIsUncertainAndStable(changedParam, index),
-                                result = modifyDirtyFromChangedResult
-                            )
-                        )
-                    )
-                } else {
-                    // we only call `$composer.changed(...)` on a parameter if the value came in
-                    // with an "Uncertain" state AND the value was provided. This is safe to do
-                    // because this will remain true or false for *every* execution of the
-                    // function, so we will never get a slot table misalignment as a result.
-                    irIf(
-                        condition = irIsUncertainAndStable(changedParam, index),
-                        body = modifyDirtyFromChangedResult
-                    )
-                }
-                skipPreamble.statements.add(stmt)
             }
         }
-        // now we handle the vararg parameters specially since it needs to create a group
-        parameters.forEachIndexed { index, param ->
-            val varargElementType = param.varargElementType ?: return@forEachIndexed
-            if (canSkipExecution && dirty is IrChangedBitMaskVariable) {
-                if (unstableMask[index]) {
-                    // if the value is unstable, there is no reason for us to store it in the slot table
-                    return@forEachIndexed
-                }
 
+        // now we handle the vararg parameters specially since it needs to create a group
+        parameters.forEachIndexed { slotIndex, param ->
+            val varargElementType = param.varargElementType ?: return@forEachIndexed
+            if (mightSkip && dirty is IrChangedBitMaskVariable) {
                 // for vararg parameters of stable type, we can store each value in the slot
                 // table, but need to generate a group since the size of the array could change
                 // over time. In the future, we may want to make an optimization where whether or
@@ -1431,7 +1337,7 @@
                 skipPreamble.statements.add(
                     irStartReplaceableGroup(
                         param,
-                        parametersScope,
+                        defaultScope,
                         irGetParamSize
                     )
                 )
@@ -1445,16 +1351,16 @@
                         irGet(param)
                     ) { loopVar ->
                         dirty.irOrSetBitsAtSlot(
-                            index,
+                            slotIndex,
                             irIfThenElse(
                                 context.irBuiltIns.intType,
                                 irChanged(irGet(loopVar)),
                                 // if the value has changed, update the bits in the slot to be
                                 // "Different".
-                                thenPart = irConst(ParamState.Different.bitsForSlot(index)),
+                                thenPart = irConst(ParamState.Different.bitsForSlot(slotIndex)),
                                 // if the value has not changed, we are still uncertain if the entire
                                 // list of values has gone unchanged or not, so we use Uncertain
-                                elsePart = irConst(ParamState.Uncertain.bitsForSlot(index))
+                                elsePart = irConst(ParamState.Uncertain.bitsForSlot(slotIndex))
                             )
                         )
                     }
@@ -1468,18 +1374,23 @@
                 // }
                 skipPreamble.statements.add(
                     irIf(
-                        condition = irIsUncertainAndStable(dirty, index),
+                        condition = irIsUncertainAndStable(dirty, slotIndex),
                         body = dirty.irOrSetBitsAtSlot(
-                            index,
-                            irConst(ParamState.Same.bitsForSlot(index))
+                            slotIndex,
+                            irConst(ParamState.Same.bitsForSlot(slotIndex))
                         )
                     )
                 )
             }
         }
+        parameters.forEach {
+            // we want to remove the default expression from the function. This will prevent
+            // the kotlin compiler from doing its own default handling, which we don't need.
+            it.defaultValue = null
+        }
         // after all of this, we need to potentially wrap the default setters in a group and if
         // statement, to make sure that defaults are only executed when they need to be.
-        if (!canSkipExecution || defaultExprIsStatic.all { it }) {
+        if (!mightSkip || defaultExprIsStatic.all { it }) {
             // if we don't skip execution ever, then we don't need these groups at all.
             // Additionally, if all of the defaults are static, we can avoid creating the groups
             // as well.
@@ -1515,6 +1426,8 @@
                 )
             )
         }
+
+        return mightSkip
     }
 
     @OptIn(ObsoleteDescriptorBasedAPI::class)
@@ -1627,11 +1540,6 @@
                 context.irBuiltIns.intType
             )
             fn.body = localIrBuilder.irBlockBody {
-
-                fun remappedParam(index: Int) = function.valueParameters[index].let {
-                    scope.remappedParams[it] ?: it
-                }
-
                 // Call the function again with the same parameters
                 +irReturn(
                     irCall(function.symbol).apply {
@@ -1650,7 +1558,7 @@
                                                 IrSpreadElementImpl(
                                                     UNDEFINED_OFFSET,
                                                     UNDEFINED_OFFSET,
-                                                    irGet(remappedParam(index))
+                                                    irGet(param)
                                                 )
                                             )
                                         )
@@ -1658,7 +1566,7 @@
                                 } else {
                                     // NOTE(lmr): should we be using the parameter here, or the temporary
                                     // with the default value?
-                                    putValueArgument(index, irGet(remappedParam(index)))
+                                    putValueArgument(index, irGet(param))
                                 }
                             }
 
@@ -2366,15 +2274,15 @@
             arg.isStatic() -> meta.isStatic = true
             arg is IrGetValue -> {
                 val owner = arg.symbol.owner
-                val found = extractParamMetaFromScopes(meta, owner)
-                if (!found) {
-                    when (owner) {
-                        is IrVariable -> {
-                            if (owner.isConst) {
-                                meta.isStatic = true
-                            } else if (!owner.isVar && owner.initializer != null) {
-                                populateParamMeta(owner.initializer!!, meta)
-                            }
+                when (owner) {
+                    is IrValueParameter -> {
+                        extractParamMetaFromScopes(meta, owner)
+                    }
+                    is IrVariable -> {
+                        if (owner.isConst) {
+                            meta.isStatic = true
+                        } else if (!owner.isVar && owner.initializer != null) {
+                            populateParamMeta(owner.initializer!!, meta)
                         }
                     }
                 }
@@ -2670,8 +2578,12 @@
                 arg is IrVararg -> {
                     inputArgs.addAll(
                         arg.elements.mapNotNull {
-                            if (it is IrSpreadElement) hasSpreadArgs = true
-                            it as? IrExpression
+                            if (it is IrSpreadElement) {
+                                hasSpreadArgs = true
+                                arg
+                            } else {
+                                it as? IrExpression
+                            }
                         }
                     )
                 }
@@ -2873,13 +2785,19 @@
 
     private fun extractParamMetaFromScopes(meta: ParamMeta, param: IrValueDeclaration): Boolean {
         var scope: Scope? = currentScope
+        val fn = param.parent
         while (scope != null) {
             when (scope) {
                 is Scope.FunctionScope -> {
-                    if (scope.remappedParams.containsValue(param)) {
-                        meta.isCertain = true
-                        meta.maskParam = scope.dirty
-                        meta.maskSlot = scope.paramsToSlots[param]!!
+                    if (scope.function == fn) {
+                        if (scope.isComposable) {
+                            val slotIndex = scope.allTrackedParams.indexOf(param)
+                            if (slotIndex != -1) {
+                                meta.isCertain = true
+                                meta.maskParam = scope.dirty
+                                meta.maskSlot = slotIndex
+                            }
+                        }
                         return true
                     }
                 }
@@ -2894,10 +2812,9 @@
         extensionParam: ParamMeta?,
         dispatchParam: ParamMeta?
     ): List<IrExpression> {
-        val thisParams = listOfNotNull(extensionParam, dispatchParam)
-        val allParams = valueParams + thisParams
+        val allParams = listOfNotNull(extensionParam) + valueParams + listOfNotNull(dispatchParam)
         // passing in 0 for thisParams since they should be included in the params list
-        val changedCount = changedParamCount(valueParams.size, thisParams.size)
+        val changedCount = changedParamCount(valueParams.size, allParams.size - valueParams.size)
         val result = mutableListOf<IrExpression>()
         for (i in 0 until changedCount) {
             val start = i * SLOTS_PER_INT
@@ -2926,7 +2843,7 @@
         // (the shift amount represented here by `x`, `y`, and `z`).
 
         // TODO: we could make some small optimization here if we have multiple values passed
-        //  from one function into another in the same order. This may not happen commonly enough
+        //  from one function into another in the same order. This may not happen commonly eugh
         //  to be worth the complication though.
 
         // NOTE: we start with 0b0 because it is important that the low bit is always 0
@@ -3022,7 +2939,8 @@
                             for (it in fn.valueParameters) {
                                 val classifier = it.type.classifierOrNull
                                 if (classifier == param.symbol) {
-                                    val parentSlot = scope.paramsToSlots[it] ?: return null
+                                    val parentSlot = scope.allTrackedParams.indexOf(it)
+                                    if (parentSlot == -1) return null
                                     return irAnd(
                                         irConst(StabilityBits.UNSTABLE.bitsForSlot(0)),
                                         maskParam.irShiftBits(parentSlot, 0)
@@ -3046,20 +2964,20 @@
     override fun visitGetValue(expression: IrGetValue): IrExpression {
         val declaration = expression.symbol.owner
         var scope: Scope? = currentScope
-        while (scope != null) {
-            if (scope is Scope.FunctionScope) {
-                if (scope.function.extensionReceiverParameter == declaration) {
-                    scope.markGetExtensionReceiver()
+        if (declaration is IrValueParameter) {
+            val fn = declaration.parent
+            while (scope != null) {
+                if (scope is Scope.FunctionScope) {
+                    if (scope.function == fn) {
+                        val index = scope.allTrackedParams.indexOf(declaration)
+                        if (index != -1) {
+                            scope.usedParams[index] = true
+                        }
+                        return expression
+                    }
                 }
-                if (scope.function.dispatchReceiverParameter == declaration) {
-                    scope.markGetDispatchReceiver()
-                }
-                val remapped = scope.remappedParams[declaration]
-                if (remapped != null) {
-                    return irGet(remapped)
-                }
+                scope = scope.parent
             }
-            scope = scope.parent
         }
         return expression
     }
@@ -3279,8 +3197,6 @@
             val function: IrFunction,
             private val transformer: ComposableFunctionBodyTransformer
         ) : BlockScope("fun ${function.name.asString()}") {
-            val remappedParams = mutableMapOf<IrValueDeclaration, IrValueDeclaration>()
-            val paramsToSlots = mutableMapOf<IrValueDeclaration, Int>()
             val isInlinedLambda = with(transformer) { function.isInlinedLambda() }
 
             private var lastTemporaryIndex: Int = 0
@@ -3311,20 +3227,6 @@
 
             var dirty: IrChangedBitMaskValue? = null
 
-            var dispatchReceiverUsed: Boolean = false
-                private set
-
-            var extensionReceiverUsed: Boolean = false
-                private set
-
-            fun markGetDispatchReceiver() {
-                dispatchReceiverUsed = true
-            }
-
-            fun markGetExtensionReceiver() {
-                extensionReceiverUsed = true
-            }
-
             // Parameter information is an index from the sorted order of the parameters to the
             // actual order. This is used to reorder the fields of the lambda class generated for
             // restart lambdas into parameter order. If all the parameters are in sorted order
@@ -3498,6 +3400,29 @@
 
             val isComposable = composerParameter != null
 
+            val allTrackedParams = listOfNotNull(
+                function.extensionReceiverParameter
+            ) + function.valueParameters.take(realValueParamCount) + listOfNotNull(
+                function.dispatchReceiverParameter
+            )
+
+            fun defaultIndexForSlotIndex(index: Int): Int {
+                return if (function.extensionReceiverParameter != null) index - 1 else index
+            }
+
+            val usedParams = BooleanArray(slotCount) { false }
+
+            init {
+                if (
+                    isComposable &&
+                    function.origin == IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA
+                ) {
+                    // in the case of a composable lambda, we want to make sure the dispatch
+                    // receiver is always marked as "used"
+                    usedParams[slotCount - 1] = true
+                }
+            }
+
             fun getNameForTemporary(nameHint: String?): String {
                 val index = nextTemporaryIndex()
                 return if (nameHint != null) "tmp${index}_$nameHint" else "tmp$index"
@@ -3792,7 +3717,10 @@
             }
         }
 
+        override var used: Boolean = false
+
         override fun irLowBit(): IrExpression {
+            used = true
             return irAnd(
                 irGet(params[0]),
                 irConst(0b1)
@@ -3800,6 +3728,7 @@
         }
 
         override fun irIsolateBitsAtSlot(slot: Int, includeStableBit: Boolean): IrExpression {
+            used = true
             // %changed and 0b11
             return irAnd(
                 irGet(params[paramIndexForSlot(slot)]),
@@ -3814,6 +3743,7 @@
         }
 
         override fun irSlotAnd(slot: Int, bits: Int): IrExpression {
+            used = true
             // %changed and 0b11
             return irAnd(
                 irGet(params[paramIndexForSlot(slot)]),
@@ -3821,7 +3751,9 @@
             )
         }
 
-        override fun irHasDifferences(): IrExpression {
+        override fun irHasDifferences(usedParams: BooleanArray): IrExpression {
+            used = true
+            require(usedParams.size == count)
             if (count == 0) {
                 // for 0 slots (no params), we can create a shortcut expression of just checking the
                 // low-bit for non-zero. Since all of the higher bits will also be 0, we can just
@@ -3836,16 +3768,23 @@
                 val start = index * SLOTS_PER_INT
                 val end = min(start + SLOTS_PER_INT, count)
 
-                // makes an int with each slot having 0b01 mask and the low bit being 0.
-                // so for 3 slots, we would get 0b 01 01 01 0.
+                // makes an int with each slot having 0b101 mask and the low bit being 0.
+                // so for 3 slots, we would get 0b 101 101 101 0.
                 // This pattern is useful because we can and + xor it with our $changed bitmask and it
-                // will only be non-zero if any of the slots were DIFFERENT or UNCERTAIN.
+                // will only be non-zero if any of the slots were DIFFERENT or UNCERTAIN or
+                // UNSTABLE.
+                // we _only_ use this pattern for the slots where the body of the function
+                // actually uses that parameter, otherwise we pass in 0b000 which will transfer
+                // none of the bits to the rhs
                 val lhs = (start until end).fold(0) { mask, slot ->
-                    mask or bitsForSlot(0b101, slot)
+                    if (usedParams[slot]) mask or bitsForSlot(0b101, slot) else mask
                 }
 
+                // we _only_ use this pattern for the slots where the body of the function
+                // actually uses that parametser, otherwise we pass in 0b000 which will transfer
+                // none of the bits to the rhs
                 val rhs = (start until end).fold(0) { mask, slot ->
-                    mask or bitsForSlot(0b001, slot)
+                    if (usedParams[slot]) mask or bitsForSlot(0b001, slot) else mask
                 }
 
                 // we use this pattern with the low bit set to 1 in the "and", and the low bit set to 0
@@ -3853,17 +3792,30 @@
                 // low bit. Since we use this calculation to determine if we need to run the body of the
                 // function, this is exactly what we want.
 
-                // $dirty and (0b 01 ... 01 1) xor (0b 01 ... 01 0)
-                irNotEqual(
-                    irXor(
+                // if the rhs is 0, that means that none of the parameters ended up getting used
+                // in the body of the function which means we can simplify the expression quite a
+                // bit. In this case we just care about if the low bit is non-zero
+                if (rhs == 0) {
+                    irNotEqual(
                         irAnd(
                             irGet(param),
-                            irConst(lhs or 0b1)
+                            irConst(1)
                         ),
-                        irConst(rhs or 0b0)
-                    ),
-                    irConst(0) // anything non-zero means we have differences
-                )
+                        irConst(0)
+                    )
+                } else {
+                    // $dirty and (0b 101 ... 101 1) xor (0b 001 ... 001 0)
+                    irNotEqual(
+                        irXor(
+                            irAnd(
+                                irGet(param),
+                                irConst(lhs or 0b1)
+                            ),
+                            irConst(rhs or 0b0)
+                        ),
+                        irConst(0) // anything non-zero means we have differences
+                    )
+                }
             }
             return if (expressions.size == 1)
                 expressions.single()
@@ -3876,6 +3828,7 @@
             isVar: Boolean,
             exactName: Boolean
         ): IrChangedBitMaskVariable {
+            used = true
             val temps = params.mapIndexed { index, param ->
                 irTemporary(
                     irGet(param),
@@ -3893,6 +3846,7 @@
             startIndex: Int,
             lowBit: Boolean
         ) {
+            used = true
             params.forEachIndexed { index, param ->
                 fn.putValueArgument(
                     startIndex + index,
@@ -3906,6 +3860,7 @@
         }
 
         override fun irShiftBits(fromSlot: Int, toSlot: Int): IrExpression {
+            used = true
             val fromSlotAdjusted = fromSlot.rem(SLOTS_PER_INT)
             val toSlotAdjusted = toSlot.rem(SLOTS_PER_INT)
             val bitsToShiftLeft = (toSlotAdjusted - fromSlotAdjusted) * BITS_PER_SLOT
@@ -3941,6 +3896,7 @@
         }
 
         override fun irOrSetBitsAtSlot(slot: Int, value: IrExpression): IrExpression {
+            used = true
             val temp = temps[paramIndexForSlot(slot)]
             return irSet(
                 temp,
@@ -3952,6 +3908,7 @@
         }
 
         override fun irSetSlotUncertain(slot: Int): IrExpression {
+            used = true
             val temp = temps[paramIndexForSlot(slot)]
             return irSet(
                 temp,

compose/desktop/desktop/samples/src/jvmMain/kotlin/androidx/compose/desktop/examples/example1/Main.jvm.kt

diff --git a/compose/desktop/desktop/samples/src/jvmMain/kotlin/androidx/compose/desktop/examples/example1/Main.jvm.kt b/compose/desktop/desktop/samples/src/jvmMain/kotlin/androidx/compose/desktop/examples/example1/Main.jvm.kt
index 9eae1d7..7108861 100644
--- a/compose/desktop/desktop/samples/src/jvmMain/kotlin/androidx/compose/desktop/examples/example1/Main.jvm.kt
+++ b/compose/desktop/desktop/samples/src/jvmMain/kotlin/androidx/compose/desktop/examples/example1/Main.jvm.kt
@@ -19,6 +19,7 @@
 import androidx.compose.animation.core.TweenSpec
 import androidx.compose.desktop.AppWindow
 import androidx.compose.desktop.DesktopMaterialTheme
+import androidx.compose.desktop.LocalAppWindow
 import androidx.compose.desktop.Window
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
@@ -179,8 +180,10 @@
     val amount = remember { mutableStateOf(0) }
     val animation = remember { mutableStateOf(true) }
     Column(Modifier.fillMaxSize().verticalScroll(scrollState)) {
+        val window = LocalAppWindow.current.window
+        val info = "${window.renderApi} (${window.windowHandle})"
         Text(
-            text = "Привет! 你好! Desktop Compose ${amount.value}",
+            text = "Привет! 你好! Desktop Compose use $info: ${amount.value}",
             color = Color.Black,
             modifier = Modifier
                 .background(Color.Blue)

compose/foundation/foundation-layout/api/1.0.0-beta04.txt

diff --git a/compose/foundation/foundation-layout/api/1.0.0-beta04.txt b/compose/foundation/foundation-layout/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..e119d9f
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/1.0.0-beta04.txt
@@ -0,0 +1,207 @@
+// Signature format: 4.0
+package androidx.compose.foundation.layout {
+
+  public final class AlignmentLineKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom-XACvGJ4(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional long before, optional long after);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom-x1H7Rps(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional float before, optional float after);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline-S2lCeAQ(androidx.compose.ui.Modifier, optional float top, optional float bottom);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline-zCFLmh4(androidx.compose.ui.Modifier, optional long top, optional long bottom);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Arrangement {
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical aligned(androidx.compose.ui.Alignment.Vertical alignment);
+    method public androidx.compose.foundation.layout.Arrangement.Vertical getBottom();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getCenter();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getEnd();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceAround();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceBetween();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceEvenly();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getStart();
+    method public androidx.compose.foundation.layout.Arrangement.Vertical getTop();
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy-0680j_4(float space);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy-6mHxxJo(float space, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy-w0p642k(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+    property public final androidx.compose.foundation.layout.Arrangement.Vertical Bottom;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical Center;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal End;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceAround;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceBetween;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceEvenly;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Start;
+    property public final androidx.compose.foundation.layout.Arrangement.Vertical Top;
+    field public static final androidx.compose.foundation.layout.Arrangement INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class Arrangement.Absolute {
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getCenter();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getLeft();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getRight();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceAround();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceBetween();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceEvenly();
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy-0680j_4(float space);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy-6mHxxJo(float space, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy-w0p642k(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Center;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Left;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Right;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceAround;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceBetween;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceEvenly;
+    field public static final androidx.compose.foundation.layout.Arrangement.Absolute INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public static interface Arrangement.Horizontal {
+    method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, androidx.compose.ui.unit.LayoutDirection layoutDirection, int[] outPositions);
+    method public default float getSpacing-D9Ej5fM();
+    property public default float spacing;
+  }
+
+  @androidx.compose.runtime.Immutable public static interface Arrangement.HorizontalOrVertical extends androidx.compose.foundation.layout.Arrangement.Horizontal androidx.compose.foundation.layout.Arrangement.Vertical {
+    property public default float spacing;
+  }
+
+  @androidx.compose.runtime.Immutable public static interface Arrangement.Vertical {
+    method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, int[] outPositions);
+    method public default float getSpacing-D9Ej5fM();
+    property public default float spacing;
+  }
+
+  public final class AspectRatioKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier aspectRatio(androidx.compose.ui.Modifier, float ratio, optional boolean matchHeightConstraintsFirst);
+  }
+
+  public final class BoxKt {
+    method @androidx.compose.runtime.Composable public static inline void Box(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Box(androidx.compose.ui.Modifier modifier);
+  }
+
+  @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface BoxScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
+  }
+
+  public final class BoxWithConstraintsKt {
+    method @androidx.compose.runtime.Composable public static void BoxWithConstraints(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxWithConstraintsScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Stable public interface BoxWithConstraintsScope extends androidx.compose.foundation.layout.BoxScope {
+    method public long getConstraints-msEJaDk();
+    method public float getMaxHeight-D9Ej5fM();
+    method public float getMaxWidth-D9Ej5fM();
+    method public float getMinHeight-D9Ej5fM();
+    method public float getMinWidth-D9Ej5fM();
+    property public abstract long constraints;
+    property public abstract float maxHeight;
+    property public abstract float maxWidth;
+    property public abstract float minHeight;
+    property public abstract float minWidth;
+  }
+
+  public final class ColumnKt {
+    method @androidx.compose.runtime.Composable public static inline void Column(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface ColumnScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+  }
+
+  public final class IntrinsicKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+  }
+
+  public enum IntrinsicSize {
+    enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Max;
+    enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Min;
+  }
+
+  @kotlin.DslMarker public @interface LayoutScopeMarker {
+  }
+
+  public final class OffsetKt {
+    method public static androidx.compose.ui.Modifier absoluteOffset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absoluteOffset-S2lCeAQ(androidx.compose.ui.Modifier, optional float x, optional float y);
+    method public static androidx.compose.ui.Modifier offset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier offset-S2lCeAQ(androidx.compose.ui.Modifier, optional float x, optional float y);
+  }
+
+  public final class PaddingKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues-0680j_4(float all);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues-ZmiikuI(optional float start, optional float top, optional float end, optional float bottom);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues-ioHfwGI(float horizontal, float vertical);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absolutePadding-w2-DAAU(androidx.compose.ui.Modifier, optional float left, optional float top, optional float right, optional float bottom);
+    method @androidx.compose.runtime.Stable public static float calculateEndPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Stable public static float calculateStartPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.PaddingValues paddingValues);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding-S2lCeAQ(androidx.compose.ui.Modifier, optional float horizontal, optional float vertical);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding-w2-DAAU(androidx.compose.ui.Modifier, optional float start, optional float top, optional float end, optional float bottom);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding-wxomhCo(androidx.compose.ui.Modifier, float all);
+  }
+
+  @androidx.compose.runtime.Immutable public interface PaddingValues {
+    method @androidx.compose.runtime.Stable public float calculateBottomPadding-D9Ej5fM();
+    method @androidx.compose.runtime.Stable public float calculateLeftPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Stable public float calculateRightPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Stable public float calculateTopPadding-D9Ej5fM();
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PaddingValues.Absolute implements androidx.compose.foundation.layout.PaddingValues {
+    method public float calculateBottomPadding-D9Ej5fM();
+    method public float calculateLeftPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public float calculateRightPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public float calculateTopPadding-D9Ej5fM();
+  }
+
+  public final class RowColumnImplKt {
+  }
+
+  public final class RowKt {
+    method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface RowScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+  }
+
+  public final class SizeKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier defaultMinSize-S2lCeAQ(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height-wxomhCo(androidx.compose.ui.Modifier, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier heightIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight-wxomhCo(androidx.compose.ui.Modifier, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeightIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize-S2lCeAQ(androidx.compose.ui.Modifier, float width, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize-wxomhCo(androidx.compose.ui.Modifier, float size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSizeIn-w2-DAAU(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth-wxomhCo(androidx.compose.ui.Modifier, float width);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidthIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size-S2lCeAQ(androidx.compose.ui.Modifier, float width, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size-wxomhCo(androidx.compose.ui.Modifier, float size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier sizeIn-w2-DAAU(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width-wxomhCo(androidx.compose.ui.Modifier, float width);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier widthIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentHeight(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Vertical align, optional boolean unbounded);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentSize(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment align, optional boolean unbounded);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentWidth(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Horizontal align, optional boolean unbounded);
+  }
+
+  public final class SpacerKt {
+    method @androidx.compose.runtime.Composable public static void Spacer(androidx.compose.ui.Modifier modifier);
+  }
+
+}
+

compose/foundation/foundation-layout/api/current.ignore

diff --git a/compose/foundation/foundation-layout/api/current.ignore b/compose/foundation/foundation-layout/api/current.ignore
new file mode 100644
index 0000000..3bc3a38
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/current.ignore
@@ -0,0 +1,15 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.foundation.layout.BoxScope.Companion:
+    Removed class androidx.compose.foundation.layout.BoxScope.Companion
+RemovedClass: androidx.compose.foundation.layout.ColumnScope.Companion:
+    Removed class androidx.compose.foundation.layout.ColumnScope.Companion
+RemovedClass: androidx.compose.foundation.layout.RowScope.Companion:
+    Removed class androidx.compose.foundation.layout.RowScope.Companion
+
+
+RemovedField: androidx.compose.foundation.layout.BoxScope#Companion:
+    Removed field androidx.compose.foundation.layout.BoxScope.Companion
+RemovedField: androidx.compose.foundation.layout.ColumnScope#Companion:
+    Removed field androidx.compose.foundation.layout.ColumnScope.Companion
+RemovedField: androidx.compose.foundation.layout.RowScope#Companion:
+    Removed field androidx.compose.foundation.layout.RowScope.Companion

compose/foundation/foundation-layout/api/current.txt

diff --git a/compose/foundation/foundation-layout/api/current.txt b/compose/foundation/foundation-layout/api/current.txt
index 2ad21c0..e119d9f 100644
--- a/compose/foundation/foundation-layout/api/current.txt
+++ b/compose/foundation/foundation-layout/api/current.txt
@@ -79,12 +79,8 @@
   }
 
   @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface BoxScope {
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
-    field public static final androidx.compose.foundation.layout.BoxScope.Companion Companion;
-  }
-
-  public static final class BoxScope.Companion implements androidx.compose.foundation.layout.BoxScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
   }
 
   public final class BoxWithConstraintsKt {
@@ -109,14 +105,10 @@
   }
 
   @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface ColumnScope {
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
-    field public static final androidx.compose.foundation.layout.ColumnScope.Companion Companion;
-  }
-
-  public static final class ColumnScope.Companion implements androidx.compose.foundation.layout.ColumnScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
   }
 
   public final class IntrinsicKt {
@@ -176,15 +168,11 @@
   }
 
   @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface RowScope {
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
-    field public static final androidx.compose.foundation.layout.RowScope.Companion Companion;
-  }
-
-  public static final class RowScope.Companion implements androidx.compose.foundation.layout.RowScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
   }
 
   public final class SizeKt {

compose/foundation/foundation-layout/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/foundation/foundation-layout/api/public_plus_experimental_1.0.0-beta04.txt b/compose/foundation/foundation-layout/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..ca89232
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,210 @@
+// Signature format: 4.0
+package androidx.compose.foundation.layout {
+
+  public final class AlignmentLineKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom-XACvGJ4(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional long before, optional long after);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom-x1H7Rps(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional float before, optional float after);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline-S2lCeAQ(androidx.compose.ui.Modifier, optional float top, optional float bottom);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline-zCFLmh4(androidx.compose.ui.Modifier, optional long top, optional long bottom);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Arrangement {
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical aligned(androidx.compose.ui.Alignment.Vertical alignment);
+    method public androidx.compose.foundation.layout.Arrangement.Vertical getBottom();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getCenter();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getEnd();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceAround();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceBetween();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceEvenly();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getStart();
+    method public androidx.compose.foundation.layout.Arrangement.Vertical getTop();
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy-0680j_4(float space);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy-6mHxxJo(float space, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy-w0p642k(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+    property public final androidx.compose.foundation.layout.Arrangement.Vertical Bottom;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical Center;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal End;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceAround;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceBetween;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceEvenly;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Start;
+    property public final androidx.compose.foundation.layout.Arrangement.Vertical Top;
+    field public static final androidx.compose.foundation.layout.Arrangement INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class Arrangement.Absolute {
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getCenter();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getLeft();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getRight();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceAround();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceBetween();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceEvenly();
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy-0680j_4(float space);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy-6mHxxJo(float space, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy-w0p642k(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Center;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Left;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Right;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceAround;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceBetween;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceEvenly;
+    field public static final androidx.compose.foundation.layout.Arrangement.Absolute INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public static interface Arrangement.Horizontal {
+    method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, androidx.compose.ui.unit.LayoutDirection layoutDirection, int[] outPositions);
+    method public default float getSpacing-D9Ej5fM();
+    property public default float spacing;
+  }
+
+  @androidx.compose.runtime.Immutable public static interface Arrangement.HorizontalOrVertical extends androidx.compose.foundation.layout.Arrangement.Horizontal androidx.compose.foundation.layout.Arrangement.Vertical {
+    property public default float spacing;
+  }
+
+  @androidx.compose.runtime.Immutable public static interface Arrangement.Vertical {
+    method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, int[] outPositions);
+    method public default float getSpacing-D9Ej5fM();
+    property public default float spacing;
+  }
+
+  public final class AspectRatioKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier aspectRatio(androidx.compose.ui.Modifier, float ratio, optional boolean matchHeightConstraintsFirst);
+  }
+
+  public final class BoxKt {
+    method @androidx.compose.runtime.Composable public static inline void Box(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Box(androidx.compose.ui.Modifier modifier);
+  }
+
+  @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface BoxScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
+  }
+
+  public final class BoxWithConstraintsKt {
+    method @androidx.compose.runtime.Composable public static void BoxWithConstraints(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxWithConstraintsScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Stable public interface BoxWithConstraintsScope extends androidx.compose.foundation.layout.BoxScope {
+    method public long getConstraints-msEJaDk();
+    method public float getMaxHeight-D9Ej5fM();
+    method public float getMaxWidth-D9Ej5fM();
+    method public float getMinHeight-D9Ej5fM();
+    method public float getMinWidth-D9Ej5fM();
+    property public abstract long constraints;
+    property public abstract float maxHeight;
+    property public abstract float maxWidth;
+    property public abstract float minHeight;
+    property public abstract float minWidth;
+  }
+
+  public final class ColumnKt {
+    method @androidx.compose.runtime.Composable public static inline void Column(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface ColumnScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+  }
+
+  @kotlin.RequiresOptIn(message="The API of this layout is experimental and is likely to change in the future.") public @interface ExperimentalLayoutApi {
+  }
+
+  public final class IntrinsicKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+  }
+
+  public enum IntrinsicSize {
+    enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Max;
+    enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Min;
+  }
+
+  @kotlin.DslMarker public @interface LayoutScopeMarker {
+  }
+
+  public final class OffsetKt {
+    method public static androidx.compose.ui.Modifier absoluteOffset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absoluteOffset-S2lCeAQ(androidx.compose.ui.Modifier, optional float x, optional float y);
+    method public static androidx.compose.ui.Modifier offset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier offset-S2lCeAQ(androidx.compose.ui.Modifier, optional float x, optional float y);
+  }
+
+  public final class PaddingKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues-0680j_4(float all);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues-ZmiikuI(optional float start, optional float top, optional float end, optional float bottom);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues-ioHfwGI(float horizontal, float vertical);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absolutePadding-w2-DAAU(androidx.compose.ui.Modifier, optional float left, optional float top, optional float right, optional float bottom);
+    method @androidx.compose.runtime.Stable public static float calculateEndPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Stable public static float calculateStartPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.PaddingValues paddingValues);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding-S2lCeAQ(androidx.compose.ui.Modifier, optional float horizontal, optional float vertical);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding-w2-DAAU(androidx.compose.ui.Modifier, optional float start, optional float top, optional float end, optional float bottom);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding-wxomhCo(androidx.compose.ui.Modifier, float all);
+  }
+
+  @androidx.compose.runtime.Immutable public interface PaddingValues {
+    method @androidx.compose.runtime.Stable public float calculateBottomPadding-D9Ej5fM();
+    method @androidx.compose.runtime.Stable public float calculateLeftPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Stable public float calculateRightPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Stable public float calculateTopPadding-D9Ej5fM();
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PaddingValues.Absolute implements androidx.compose.foundation.layout.PaddingValues {
+    method public float calculateBottomPadding-D9Ej5fM();
+    method public float calculateLeftPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public float calculateRightPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public float calculateTopPadding-D9Ej5fM();
+  }
+
+  public final class RowColumnImplKt {
+  }
+
+  public final class RowKt {
+    method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface RowScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+  }
+
+  public final class SizeKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier defaultMinSize-S2lCeAQ(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height-wxomhCo(androidx.compose.ui.Modifier, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier heightIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight-wxomhCo(androidx.compose.ui.Modifier, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeightIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize-S2lCeAQ(androidx.compose.ui.Modifier, float width, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize-wxomhCo(androidx.compose.ui.Modifier, float size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSizeIn-w2-DAAU(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth-wxomhCo(androidx.compose.ui.Modifier, float width);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidthIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size-S2lCeAQ(androidx.compose.ui.Modifier, float width, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size-wxomhCo(androidx.compose.ui.Modifier, float size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier sizeIn-w2-DAAU(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width-wxomhCo(androidx.compose.ui.Modifier, float width);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier widthIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentHeight(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Vertical align, optional boolean unbounded);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentSize(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment align, optional boolean unbounded);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentWidth(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Horizontal align, optional boolean unbounded);
+  }
+
+  public final class SpacerKt {
+    method @androidx.compose.runtime.Composable public static void Spacer(androidx.compose.ui.Modifier modifier);
+  }
+
+}
+

compose/foundation/foundation-layout/api/public_plus_experimental_current.txt

diff --git a/compose/foundation/foundation-layout/api/public_plus_experimental_current.txt b/compose/foundation/foundation-layout/api/public_plus_experimental_current.txt
index 15c4829..ca89232 100644
--- a/compose/foundation/foundation-layout/api/public_plus_experimental_current.txt
+++ b/compose/foundation/foundation-layout/api/public_plus_experimental_current.txt
@@ -79,12 +79,8 @@
   }
 
   @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface BoxScope {
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
-    field public static final androidx.compose.foundation.layout.BoxScope.Companion Companion;
-  }
-
-  public static final class BoxScope.Companion implements androidx.compose.foundation.layout.BoxScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
   }
 
   public final class BoxWithConstraintsKt {
@@ -109,14 +105,10 @@
   }
 
   @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface ColumnScope {
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
-    field public static final androidx.compose.foundation.layout.ColumnScope.Companion Companion;
-  }
-
-  public static final class ColumnScope.Companion implements androidx.compose.foundation.layout.ColumnScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
   }
 
   @kotlin.RequiresOptIn(message="The API of this layout is experimental and is likely to change in the future.") public @interface ExperimentalLayoutApi {
@@ -179,15 +171,11 @@
   }
 
   @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface RowScope {
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
-    field public static final androidx.compose.foundation.layout.RowScope.Companion Companion;
-  }
-
-  public static final class RowScope.Companion implements androidx.compose.foundation.layout.RowScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
   }
 
   public final class SizeKt {

compose/foundation/foundation-layout/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/foundation/foundation-layout/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/foundation/foundation-layout/api/res-1.0.0-beta04.txt

compose/foundation/foundation-layout/api/restricted_1.0.0-beta04.txt

diff --git a/compose/foundation/foundation-layout/api/restricted_1.0.0-beta04.txt b/compose/foundation/foundation-layout/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..4c0fda5
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,212 @@
+// Signature format: 4.0
+package androidx.compose.foundation.layout {
+
+  public final class AlignmentLineKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom-XACvGJ4(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional long before, optional long after);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom-x1H7Rps(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional float before, optional float after);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline-S2lCeAQ(androidx.compose.ui.Modifier, optional float top, optional float bottom);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline-zCFLmh4(androidx.compose.ui.Modifier, optional long top, optional long bottom);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Arrangement {
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical aligned(androidx.compose.ui.Alignment.Vertical alignment);
+    method public androidx.compose.foundation.layout.Arrangement.Vertical getBottom();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getCenter();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getEnd();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceAround();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceBetween();
+    method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceEvenly();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getStart();
+    method public androidx.compose.foundation.layout.Arrangement.Vertical getTop();
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy-0680j_4(float space);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy-6mHxxJo(float space, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy-w0p642k(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+    property public final androidx.compose.foundation.layout.Arrangement.Vertical Bottom;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical Center;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal End;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceAround;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceBetween;
+    property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceEvenly;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Start;
+    property public final androidx.compose.foundation.layout.Arrangement.Vertical Top;
+    field public static final androidx.compose.foundation.layout.Arrangement INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class Arrangement.Absolute {
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getCenter();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getLeft();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getRight();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceAround();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceBetween();
+    method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceEvenly();
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy-0680j_4(float space);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy-6mHxxJo(float space, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy-w0p642k(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Center;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Left;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal Right;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceAround;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceBetween;
+    property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceEvenly;
+    field public static final androidx.compose.foundation.layout.Arrangement.Absolute INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public static interface Arrangement.Horizontal {
+    method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, androidx.compose.ui.unit.LayoutDirection layoutDirection, int[] outPositions);
+    method public default float getSpacing-D9Ej5fM();
+    property public default float spacing;
+  }
+
+  @androidx.compose.runtime.Immutable public static interface Arrangement.HorizontalOrVertical extends androidx.compose.foundation.layout.Arrangement.Horizontal androidx.compose.foundation.layout.Arrangement.Vertical {
+    property public default float spacing;
+  }
+
+  @androidx.compose.runtime.Immutable public static interface Arrangement.Vertical {
+    method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, int[] outPositions);
+    method public default float getSpacing-D9Ej5fM();
+    property public default float spacing;
+  }
+
+  public final class AspectRatioKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier aspectRatio(androidx.compose.ui.Modifier, float ratio, optional boolean matchHeightConstraintsFirst);
+  }
+
+  public final class BoxKt {
+    method @androidx.compose.runtime.Composable public static inline void Box(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Box(androidx.compose.ui.Modifier modifier);
+    method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static androidx.compose.ui.layout.MeasurePolicy rememberBoxMeasurePolicy(androidx.compose.ui.Alignment alignment, boolean propagateMinConstraints);
+  }
+
+  @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface BoxScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
+  }
+
+  public final class BoxWithConstraintsKt {
+    method @androidx.compose.runtime.Composable public static void BoxWithConstraints(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxWithConstraintsScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Stable public interface BoxWithConstraintsScope extends androidx.compose.foundation.layout.BoxScope {
+    method public long getConstraints-msEJaDk();
+    method public float getMaxHeight-D9Ej5fM();
+    method public float getMaxWidth-D9Ej5fM();
+    method public float getMinHeight-D9Ej5fM();
+    method public float getMinWidth-D9Ej5fM();
+    property public abstract long constraints;
+    property public abstract float maxHeight;
+    property public abstract float maxWidth;
+    property public abstract float minHeight;
+    property public abstract float minWidth;
+  }
+
+  public final class ColumnKt {
+    method @androidx.compose.runtime.Composable public static inline void Column(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static androidx.compose.ui.layout.MeasurePolicy columnMeasurePolicy(androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, androidx.compose.ui.Alignment.Horizontal horizontalAlignment);
+    field @kotlin.PublishedApi internal static final androidx.compose.ui.layout.MeasurePolicy DefaultColumnMeasurePolicy;
+  }
+
+  @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface ColumnScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+  }
+
+  public final class IntrinsicKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+  }
+
+  public enum IntrinsicSize {
+    enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Max;
+    enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Min;
+  }
+
+  @kotlin.DslMarker public @interface LayoutScopeMarker {
+  }
+
+  public final class OffsetKt {
+    method public static androidx.compose.ui.Modifier absoluteOffset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absoluteOffset-S2lCeAQ(androidx.compose.ui.Modifier, optional float x, optional float y);
+    method public static androidx.compose.ui.Modifier offset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier offset-S2lCeAQ(androidx.compose.ui.Modifier, optional float x, optional float y);
+  }
+
+  public final class PaddingKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues-0680j_4(float all);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues-ZmiikuI(optional float start, optional float top, optional float end, optional float bottom);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues-ioHfwGI(float horizontal, float vertical);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absolutePadding-w2-DAAU(androidx.compose.ui.Modifier, optional float left, optional float top, optional float right, optional float bottom);
+    method @androidx.compose.runtime.Stable public static float calculateEndPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Stable public static float calculateStartPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.PaddingValues paddingValues);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding-S2lCeAQ(androidx.compose.ui.Modifier, optional float horizontal, optional float vertical);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding-w2-DAAU(androidx.compose.ui.Modifier, optional float start, optional float top, optional float end, optional float bottom);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding-wxomhCo(androidx.compose.ui.Modifier, float all);
+  }
+
+  @androidx.compose.runtime.Immutable public interface PaddingValues {
+    method @androidx.compose.runtime.Stable public float calculateBottomPadding-D9Ej5fM();
+    method @androidx.compose.runtime.Stable public float calculateLeftPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Stable public float calculateRightPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Stable public float calculateTopPadding-D9Ej5fM();
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PaddingValues.Absolute implements androidx.compose.foundation.layout.PaddingValues {
+    method public float calculateBottomPadding-D9Ej5fM();
+    method public float calculateLeftPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public float calculateRightPadding-D9Ej5fM(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public float calculateTopPadding-D9Ej5fM();
+  }
+
+  public final class RowColumnImplKt {
+  }
+
+  public final class RowKt {
+    method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static androidx.compose.ui.layout.MeasurePolicy rowMeasurePolicy(androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, androidx.compose.ui.Alignment.Vertical verticalAlignment);
+    field @kotlin.PublishedApi internal static final androidx.compose.ui.layout.MeasurePolicy DefaultRowMeasurePolicy;
+  }
+
+  @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface RowScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+  }
+
+  public final class SizeKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier defaultMinSize-S2lCeAQ(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height-wxomhCo(androidx.compose.ui.Modifier, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier heightIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight-wxomhCo(androidx.compose.ui.Modifier, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeightIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize-S2lCeAQ(androidx.compose.ui.Modifier, float width, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize-wxomhCo(androidx.compose.ui.Modifier, float size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSizeIn-w2-DAAU(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth-wxomhCo(androidx.compose.ui.Modifier, float width);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidthIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size-S2lCeAQ(androidx.compose.ui.Modifier, float width, float height);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size-wxomhCo(androidx.compose.ui.Modifier, float size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier sizeIn-w2-DAAU(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width-wxomhCo(androidx.compose.ui.Modifier, float width);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier widthIn-S2lCeAQ(androidx.compose.ui.Modifier, optional float min, optional float max);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentHeight(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Vertical align, optional boolean unbounded);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentSize(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment align, optional boolean unbounded);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentWidth(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Horizontal align, optional boolean unbounded);
+  }
+
+  public final class SpacerKt {
+    method @androidx.compose.runtime.Composable public static void Spacer(androidx.compose.ui.Modifier modifier);
+  }
+
+}
+

compose/foundation/foundation-layout/api/restricted_current.ignore

diff --git a/compose/foundation/foundation-layout/api/restricted_current.ignore b/compose/foundation/foundation-layout/api/restricted_current.ignore
new file mode 100644
index 0000000..3bc3a38
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/restricted_current.ignore
@@ -0,0 +1,15 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.foundation.layout.BoxScope.Companion:
+    Removed class androidx.compose.foundation.layout.BoxScope.Companion
+RemovedClass: androidx.compose.foundation.layout.ColumnScope.Companion:
+    Removed class androidx.compose.foundation.layout.ColumnScope.Companion
+RemovedClass: androidx.compose.foundation.layout.RowScope.Companion:
+    Removed class androidx.compose.foundation.layout.RowScope.Companion
+
+
+RemovedField: androidx.compose.foundation.layout.BoxScope#Companion:
+    Removed field androidx.compose.foundation.layout.BoxScope.Companion
+RemovedField: androidx.compose.foundation.layout.ColumnScope#Companion:
+    Removed field androidx.compose.foundation.layout.ColumnScope.Companion
+RemovedField: androidx.compose.foundation.layout.RowScope#Companion:
+    Removed field androidx.compose.foundation.layout.RowScope.Companion

compose/foundation/foundation-layout/api/restricted_current.txt

diff --git a/compose/foundation/foundation-layout/api/restricted_current.txt b/compose/foundation/foundation-layout/api/restricted_current.txt
index 84b4411..4c0fda5 100644
--- a/compose/foundation/foundation-layout/api/restricted_current.txt
+++ b/compose/foundation/foundation-layout/api/restricted_current.txt
@@ -80,12 +80,8 @@
   }
 
   @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface BoxScope {
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
-    field public static final androidx.compose.foundation.layout.BoxScope.Companion Companion;
-  }
-
-  public static final class BoxScope.Companion implements androidx.compose.foundation.layout.BoxScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
   }
 
   public final class BoxWithConstraintsKt {
@@ -112,14 +108,10 @@
   }
 
   @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface ColumnScope {
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
-    field public static final androidx.compose.foundation.layout.ColumnScope.Companion Companion;
-  }
-
-  public static final class ColumnScope.Companion implements androidx.compose.foundation.layout.ColumnScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
   }
 
   public final class IntrinsicKt {
@@ -181,15 +173,11 @@
   }
 
   @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface RowScope {
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
-    method @androidx.compose.runtime.Stable public default androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
-    field public static final androidx.compose.foundation.layout.RowScope.Companion Companion;
-  }
-
-  public static final class RowScope.Companion implements androidx.compose.foundation.layout.RowScope {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
   }
 
   public final class SizeKt {

compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/BoxTest.kt

diff --git a/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/BoxTest.kt b/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/BoxTest.kt
index c0a9995..0bf03ed 100644
--- a/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/BoxTest.kt
+++ b/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/BoxTest.kt
@@ -595,7 +595,7 @@
 
     @Test
     fun testAlignInspectableValue() {
-        val modifier = with(object : BoxScope {}) { Modifier.align(Alignment.BottomCenter) }
+        val modifier = with(BoxScopeInstance) { Modifier.align(Alignment.BottomCenter) }
             as InspectableValue
         assertThat(modifier.nameFallback).isEqualTo("align")
         assertThat(modifier.valueOverride).isEqualTo(Alignment.BottomCenter)
@@ -604,7 +604,7 @@
 
     @Test
     fun testMatchParentSizeInspectableValue() {
-        val modifier = with(object : BoxScope {}) { Modifier.matchParentSize() }
+        val modifier = with(BoxScopeInstance) { Modifier.matchParentSize() }
             as InspectableValue
         assertThat(modifier.nameFallback).isEqualTo("matchParentSize")
         assertThat(modifier.valueOverride).isNull()

compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/RowColumnTest.kt

diff --git a/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/RowColumnTest.kt b/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/RowColumnTest.kt
index 989ed4f..c8e9953 100644
--- a/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/RowColumnTest.kt
+++ b/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/RowColumnTest.kt
@@ -5414,7 +5414,7 @@
     // region InspectableValue tests for Row and Column
     @Test
     fun testRow_AlignInspectableValue() {
-        val modifier = with(object : RowScope {}) { Modifier.align(Alignment.Bottom) }
+        val modifier = with(RowScopeInstance) { Modifier.align(Alignment.Bottom) }
             as InspectableValue
         Truth.assertThat(modifier.nameFallback).isEqualTo("align")
         Truth.assertThat(modifier.valueOverride).isEqualTo(Alignment.Bottom)
@@ -5423,7 +5423,7 @@
 
     @Test
     fun testRow_AlignByInspectableValue() {
-        val modifier = with(object : RowScope {}) { Modifier.alignBy(FirstBaseline) }
+        val modifier = with(RowScopeInstance) { Modifier.alignBy(FirstBaseline) }
             as InspectableValue
         Truth.assertThat(modifier.nameFallback).isEqualTo("alignBy")
         Truth.assertThat(modifier.valueOverride).isEqualTo(FirstBaseline)
@@ -5432,7 +5432,7 @@
 
     @Test
     fun testRow_WeightInspectableValue() {
-        val modifier = with(object : RowScope {}) { Modifier.weight(2.0f, false) }
+        val modifier = with(RowScopeInstance) { Modifier.weight(2.0f, false) }
             as InspectableValue
         Truth.assertThat(modifier.nameFallback).isEqualTo("weight")
         Truth.assertThat(modifier.valueOverride).isEqualTo(2.0f)
@@ -5443,7 +5443,7 @@
     }
     @Test
     fun testColumn_AlignInspectableValue() {
-        val modifier = with(object : ColumnScope {}) { Modifier.align(Alignment.Start) }
+        val modifier = with(ColumnScopeInstance) { Modifier.align(Alignment.Start) }
             as InspectableValue
         Truth.assertThat(modifier.nameFallback).isEqualTo("align")
         Truth.assertThat(modifier.valueOverride).isEqualTo(Alignment.Start)
@@ -5452,7 +5452,7 @@
 
     @Test
     fun testColumn_AlignByInspectableValue() {
-        val modifier = with(object : ColumnScope {}) { Modifier.alignBy(TestVerticalLine) }
+        val modifier = with(ColumnScopeInstance) { Modifier.alignBy(TestVerticalLine) }
             as InspectableValue
         Truth.assertThat(modifier.nameFallback).isEqualTo("alignBy")
         Truth.assertThat(modifier.valueOverride).isEqualTo(TestVerticalLine)
@@ -5461,7 +5461,7 @@
 
     @Test
     fun testColumn_WeightInspectableValue() {
-        val modifier = with(object : ColumnScope {}) { Modifier.weight(2.0f, false) }
+        val modifier = with(ColumnScopeInstance) { Modifier.weight(2.0f, false) }
             as InspectableValue
         Truth.assertThat(modifier.nameFallback).isEqualTo("weight")
         Truth.assertThat(modifier.valueOverride).isEqualTo(2.0f)

compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Box.kt

diff --git a/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Box.kt b/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Box.kt
index 8bc4548..07cdbeb 100644
--- a/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Box.kt
+++ b/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Box.kt
@@ -66,7 +66,7 @@
 ) {
     val measurePolicy = rememberBoxMeasurePolicy(contentAlignment, propagateMinConstraints)
     Layout(
-        content = { BoxScope.content() },
+        content = { BoxScopeInstance.content() },
         measurePolicy = measurePolicy,
         modifier = modifier
     )
@@ -212,16 +212,7 @@
      * have priority over the [Box]'s `alignment` parameter.
      */
     @Stable
-    fun Modifier.align(alignment: Alignment) = this.then(
-        BoxChildData(
-            alignment = alignment,
-            matchParentSize = false,
-            inspectorInfo = debugInspectorInfo {
-                name = "align"
-                value = alignment
-            }
-        )
-    )
+    fun Modifier.align(alignment: Alignment): Modifier
 
     /**
      * Size the element to match the size of the [Box] after all other content elements have
@@ -236,15 +227,30 @@
      * available space.
      */
     @Stable
-    fun Modifier.matchParentSize() = this.then(
+    fun Modifier.matchParentSize(): Modifier
+}
+
+internal object BoxScopeInstance : BoxScope {
+    @Stable
+    override fun Modifier.align(alignment: Alignment) = this.then(
+        BoxChildData(
+            alignment = alignment,
+            matchParentSize = false,
+            inspectorInfo = debugInspectorInfo {
+                name = "align"
+                value = alignment
+            }
+        )
+    )
+
+    @Stable
+    override fun Modifier.matchParentSize() = this.then(
         BoxChildData(
             alignment = Alignment.Center,
             matchParentSize = true,
             inspectorInfo = debugInspectorInfo { name = "matchParentSize" }
         )
     )
-
-    companion object : BoxScope
 }
 
 @get:Suppress("ModifierFactoryReturnType", "ModifierFactoryExtensionFunction")

compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/BoxWithConstraints.kt

diff --git a/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/BoxWithConstraints.kt b/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/BoxWithConstraints.kt
index 3f2bf57..4a30d5e 100644
--- a/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/BoxWithConstraints.kt
+++ b/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/BoxWithConstraints.kt
@@ -103,7 +103,7 @@
 private data class BoxWithConstraintsScopeImpl(
     private val density: Density,
     override val constraints: Constraints
-) : BoxWithConstraintsScope {
+) : BoxWithConstraintsScope, BoxScope by BoxScopeInstance {
     override val minWidth: Dp
         get() = with(density) { constraints.minWidth.toDp() }
     override val maxWidth: Dp

compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Column.kt

diff --git a/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Column.kt b/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Column.kt
index aced672..6baf629f 100644
--- a/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Column.kt
+++ b/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Column.kt
@@ -71,7 +71,7 @@
 ) {
     val measurePolicy = columnMeasurePolicy(verticalArrangement, horizontalAlignment)
     Layout(
-        content = { ColumnScope.content() },
+        content = { ColumnScopeInstance.content() },
         measurePolicy = measurePolicy,
         modifier = modifier
     )
@@ -116,51 +116,6 @@
 @Immutable
 interface ColumnScope {
     /**
-     * Align the element horizontally within the [Column]. This alignment will have priority over
-     * the [Column]'s `horizontalAlignment` parameter.
-     *
-     * Example usage:
-     * @sample androidx.compose.foundation.layout.samples.SimpleAlignInColumn
-     */
-    @Stable
-    fun Modifier.align(alignment: Alignment.Horizontal) = this.then(
-        HorizontalAlignModifier(
-            horizontal = alignment,
-            inspectorInfo = debugInspectorInfo {
-                name = "align"
-                value = alignment
-            }
-        )
-    )
-
-    /**
-     * Position the element horizontally such that its [alignmentLine] aligns with sibling elements
-     * also configured to [alignBy]. [alignBy] is a form of [align],
-     * so both modifiers will not work together if specified for the same layout.
-     * Within a [Column], all components with [alignBy] will align horizontally using
-     * the specified [VerticalAlignmentLine]s or values provided using the other
-     * [alignBy] overload, forming a sibling group.
-     * At least one element of the sibling group will be placed as it had [Alignment.Start] align
-     * in [Column], and the alignment of the other siblings will be then determined such that
-     * the alignment lines coincide. Note that if only one element in a [Column] has the
-     * [alignBy] modifier specified the element will be positioned
-     * as if it had [Alignment.Start] align.
-     *
-     * Example usage:
-     * @sample androidx.compose.foundation.layout.samples.SimpleRelativeToSiblingsInColumn
-     */
-    @Stable
-    fun Modifier.alignBy(alignmentLine: VerticalAlignmentLine) = this.then(
-        SiblingsAlignedModifier.WithAlignmentLine(
-            alignmentLine = alignmentLine,
-            inspectorInfo = debugInspectorInfo {
-                name = "alignBy"
-                value = alignmentLine
-            }
-        )
-    )
-
-    /**
      * Size the element's height proportional to its [weight] relative to other weighted sibling
      * elements in the [Column]. The parent will divide the vertical space remaining after measuring
      * unweighted child elements and distribute it according to this weight.
@@ -179,21 +134,36 @@
         /*@FloatRange(from = 0.0, fromInclusive = false)*/
         weight: Float,
         fill: Boolean = true
-    ): Modifier {
-        require(weight > 0.0) { "invalid weight $weight; must be greater than zero" }
-        return this.then(
-            LayoutWeightImpl(
-                weight = weight,
-                fill = fill,
-                inspectorInfo = debugInspectorInfo {
-                    name = "weight"
-                    value = weight
-                    properties["weight"] = weight
-                    properties["fill"] = fill
-                }
-            )
-        )
-    }
+    ): Modifier
+
+    /**
+     * Align the element horizontally within the [Column]. This alignment will have priority over
+     * the [Column]'s `horizontalAlignment` parameter.
+     *
+     * Example usage:
+     * @sample androidx.compose.foundation.layout.samples.SimpleAlignInColumn
+     */
+    @Stable
+    fun Modifier.align(alignment: Alignment.Horizontal): Modifier
+
+    /**
+     * Position the element horizontally such that its [alignmentLine] aligns with sibling elements
+     * also configured to [alignBy]. [alignBy] is a form of [align],
+     * so both modifiers will not work together if specified for the same layout.
+     * Within a [Column], all components with [alignBy] will align horizontally using
+     * the specified [VerticalAlignmentLine]s or values provided using the other
+     * [alignBy] overload, forming a sibling group.
+     * At least one element of the sibling group will be placed as it had [Alignment.Start] align
+     * in [Column], and the alignment of the other siblings will be then determined such that
+     * the alignment lines coincide. Note that if only one element in a [Column] has the
+     * [alignBy] modifier specified the element will be positioned
+     * as if it had [Alignment.Start] align.
+     *
+     * Example usage:
+     * @sample androidx.compose.foundation.layout.samples.SimpleRelativeToSiblingsInColumn
+     */
+    @Stable
+    fun Modifier.alignBy(alignmentLine: VerticalAlignmentLine): Modifier
 
     /**
      * Position the element horizontally such that the alignment line for the content as
@@ -213,7 +183,51 @@
      * @sample androidx.compose.foundation.layout.samples.SimpleRelativeToSiblings
      */
     @Stable
-    fun Modifier.alignBy(alignmentLineBlock: (Measured) -> Int) = this.then(
+    fun Modifier.alignBy(alignmentLineBlock: (Measured) -> Int): Modifier
+}
+
+internal object ColumnScopeInstance : ColumnScope {
+    @Stable
+    override fun Modifier.weight(weight: Float, fill: Boolean): Modifier {
+        require(weight > 0.0) { "invalid weight $weight; must be greater than zero" }
+        return this.then(
+            LayoutWeightImpl(
+                weight = weight,
+                fill = fill,
+                inspectorInfo = debugInspectorInfo {
+                    name = "weight"
+                    value = weight
+                    properties["weight"] = weight
+                    properties["fill"] = fill
+                }
+            )
+        )
+    }
+
+    @Stable
+    override fun Modifier.align(alignment: Alignment.Horizontal) = this.then(
+        HorizontalAlignModifier(
+            horizontal = alignment,
+            inspectorInfo = debugInspectorInfo {
+                name = "align"
+                value = alignment
+            }
+        )
+    )
+
+    @Stable
+    override fun Modifier.alignBy(alignmentLine: VerticalAlignmentLine) = this.then(
+        SiblingsAlignedModifier.WithAlignmentLine(
+            alignmentLine = alignmentLine,
+            inspectorInfo = debugInspectorInfo {
+                name = "alignBy"
+                value = alignmentLine
+            }
+        )
+    )
+
+    @Stable
+    override fun Modifier.alignBy(alignmentLineBlock: (Measured) -> Int) = this.then(
         SiblingsAlignedModifier.WithAlignmentLineBlock(
             block = alignmentLineBlock,
             inspectorInfo = debugInspectorInfo {
@@ -222,6 +236,4 @@
             }
         )
     )
-
-    companion object : ColumnScope
 }

compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Row.kt

diff --git a/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Row.kt b/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Row.kt
index 0a840aa..320ac43 100644
--- a/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Row.kt
+++ b/compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Row.kt
@@ -72,7 +72,7 @@
 ) {
     val measurePolicy = rowMeasurePolicy(horizontalArrangement, verticalAlignment)
     Layout(
-        content = { RowScope.content() },
+        content = { RowScopeInstance.content() },
         measurePolicy = measurePolicy,
         modifier = modifier
     )
@@ -122,6 +122,25 @@
 @Immutable
 interface RowScope {
     /**
+     * Size the element's width proportional to its [weight] relative to other weighted sibling
+     * elements in the [Row]. The parent will divide the horizontal space remaining after measuring
+     * unweighted child elements and distribute it according to this weight.
+     * When [fill] is true, the element will be forced to occupy the whole width allocated to it.
+     * Otherwise, the element is allowed to be smaller - this will result in [Row] being smaller,
+     * as the unused allocated width will not be redistributed to other siblings.
+     *
+     * @param weight The proportional width to give to this element, as related to the total of
+     * all weighted siblings. Must be positive.
+     * @param fill When `true`, the element will occupy the whole width allocated.
+     */
+    @Stable
+    fun Modifier.weight(
+        /*@FloatRange(from = 0.0, fromInclusive = false)*/
+        weight: Float,
+        fill: Boolean = true
+    ): Modifier
+
+    /**
      * Align the element vertically within the [Row]. This alignment will have priority over the
      * [Row]'s `verticalAlignment` parameter.
      *
@@ -129,15 +148,7 @@
      * @sample androidx.compose.foundation.layout.samples.SimpleAlignInRow
      */
     @Stable
-    fun Modifier.align(alignment: Alignment.Vertical) = this.then(
-        VerticalAlignModifier(
-            vertical = alignment,
-            inspectorInfo = debugInspectorInfo {
-                name = "align"
-                value = alignment
-            }
-        )
-    )
+    fun Modifier.align(alignment: Alignment.Vertical): Modifier
 
     /**
      * Position the element vertically such that its [alignmentLine] aligns with sibling elements
@@ -160,15 +171,7 @@
      * @sample androidx.compose.foundation.layout.samples.SimpleAlignByInRow
      */
     @Stable
-    fun Modifier.alignBy(alignmentLine: HorizontalAlignmentLine) = this.then(
-        SiblingsAlignedModifier.WithAlignmentLine(
-            alignmentLine = alignmentLine,
-            inspectorInfo = debugInspectorInfo {
-                name = "alignBy"
-                value = alignmentLine
-            }
-        )
-    )
+    fun Modifier.alignBy(alignmentLine: HorizontalAlignmentLine): Modifier
 
     /**
      * Position the element vertically such that its first baseline aligns with sibling elements
@@ -183,40 +186,7 @@
      * @sample androidx.compose.foundation.layout.samples.SimpleAlignByInRow
      */
     @Stable
-    fun Modifier.alignByBaseline() = alignBy(FirstBaseline)
-
-    /**
-     * Size the element's width proportional to its [weight] relative to other weighted sibling
-     * elements in the [Row]. The parent will divide the horizontal space remaining after measuring
-     * unweighted child elements and distribute it according to this weight.
-     * When [fill] is true, the element will be forced to occupy the whole width allocated to it.
-     * Otherwise, the element is allowed to be smaller - this will result in [Row] being smaller,
-     * as the unused allocated width will not be redistributed to other siblings.
-     *
-     * @param weight The proportional width to give to this element, as related to the total of
-     * all weighted siblings. Must be positive.
-     * @param fill When `true`, the element will occupy the whole width allocated.
-     */
-    @Stable
-    fun Modifier.weight(
-        /*@FloatRange(from = 0.0, fromInclusive = false)*/
-        weight: Float,
-        fill: Boolean = true
-    ): Modifier {
-        require(weight > 0.0) { "invalid weight $weight; must be greater than zero" }
-        return this.then(
-            LayoutWeightImpl(
-                weight = weight,
-                fill = fill,
-                inspectorInfo = debugInspectorInfo {
-                    name = "weight"
-                    value = weight
-                    properties["weight"] = weight
-                    properties["fill"] = fill
-                }
-            )
-        )
-    }
+    fun Modifier.alignByBaseline(): Modifier
 
     /**
      * Position the element vertically such that the alignment line for the content as
@@ -236,7 +206,53 @@
      * @sample androidx.compose.foundation.layout.samples.SimpleAlignByInRow
      */
     @Stable
-    fun Modifier.alignBy(alignmentLineBlock: (Measured) -> Int) = this.then(
+    fun Modifier.alignBy(alignmentLineBlock: (Measured) -> Int): Modifier
+}
+
+internal object RowScopeInstance : RowScope {
+    @Stable
+    override fun Modifier.weight(weight: Float, fill: Boolean): Modifier {
+        require(weight > 0.0) { "invalid weight $weight; must be greater than zero" }
+        return this.then(
+            LayoutWeightImpl(
+                weight = weight,
+                fill = fill,
+                inspectorInfo = debugInspectorInfo {
+                    name = "weight"
+                    value = weight
+                    properties["weight"] = weight
+                    properties["fill"] = fill
+                }
+            )
+        )
+    }
+
+    @Stable
+    override fun Modifier.align(alignment: Alignment.Vertical) = this.then(
+        VerticalAlignModifier(
+            vertical = alignment,
+            inspectorInfo = debugInspectorInfo {
+                name = "align"
+                value = alignment
+            }
+        )
+    )
+
+    @Stable
+    override fun Modifier.alignBy(alignmentLine: HorizontalAlignmentLine) = this.then(
+        SiblingsAlignedModifier.WithAlignmentLine(
+            alignmentLine = alignmentLine,
+            inspectorInfo = debugInspectorInfo {
+                name = "alignBy"
+                value = alignmentLine
+            }
+        )
+    )
+
+    @Stable
+    override fun Modifier.alignByBaseline() = alignBy(FirstBaseline)
+
+    override fun Modifier.alignBy(alignmentLineBlock: (Measured) -> Int) = this.then(
         SiblingsAlignedModifier.WithAlignmentLineBlock(
             block = alignmentLineBlock,
             inspectorInfo = debugInspectorInfo {
@@ -245,6 +261,4 @@
             }
         )
     )
-
-    companion object : RowScope
 }

compose/foundation/foundation/api/1.0.0-beta04.txt

diff --git a/compose/foundation/foundation/api/1.0.0-beta04.txt b/compose/foundation/foundation/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..d469dcc
--- /dev/null
+++ b/compose/foundation/foundation/api/1.0.0-beta04.txt
@@ -0,0 +1,742 @@
+// Signature format: 4.0
+package androidx.compose.foundation {
+
+  public final class ActualJvmKt {
+  }
+
+  public final class BackgroundKt {
+    method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
+    method public static androidx.compose.ui.Modifier background-1xq40Q0(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
+  }
+
+  public final class BorderKt {
+    method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, androidx.compose.foundation.BorderStroke border, optional androidx.compose.ui.graphics.Shape shape);
+    method public static androidx.compose.ui.Modifier border-bMj1UE0(androidx.compose.ui.Modifier, float width, androidx.compose.ui.graphics.Brush brush, androidx.compose.ui.graphics.Shape shape);
+    method public static androidx.compose.ui.Modifier border-zRMYNwQ(androidx.compose.ui.Modifier, float width, long color, optional androidx.compose.ui.graphics.Shape shape);
+  }
+
+  @androidx.compose.runtime.Immutable public final class BorderStroke {
+    method public androidx.compose.foundation.BorderStroke copy-v_fYJzc(optional float width, optional androidx.compose.ui.graphics.Brush brush);
+    method public androidx.compose.ui.graphics.Brush getBrush();
+    method public float getWidth-D9Ej5fM();
+    property public final androidx.compose.ui.graphics.Brush brush;
+    property public final float width;
+  }
+
+  public final class BorderStrokeKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.BorderStroke BorderStroke-Qek64HU(float width, long color);
+  }
+
+  public final class CanvasKt {
+    method @androidx.compose.runtime.Composable public static void Canvas(androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+  }
+
+  public final class ClickableKt {
+    method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+  }
+
+  public final class DarkTheme_androidKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
+  }
+
+  public final class FocusableKt {
+    method public static androidx.compose.ui.Modifier focusable(androidx.compose.ui.Modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+  }
+
+  public final class ImageKt {
+    method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+  }
+
+  @androidx.compose.runtime.Stable public interface Indication {
+    method @androidx.compose.runtime.Composable public androidx.compose.foundation.IndicationInstance rememberUpdatedInstance(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+  }
+
+  public interface IndicationInstance {
+    method public void drawIndication(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+  }
+
+  public final class IndicationKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.Indication> getLocalIndication();
+    method public static androidx.compose.ui.Modifier indication(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.InteractionSource interactionSource, androidx.compose.foundation.Indication? indication);
+  }
+
+  public enum MutatePriority {
+    enum_constant public static final androidx.compose.foundation.MutatePriority Default;
+    enum_constant public static final androidx.compose.foundation.MutatePriority PreventUserInput;
+    enum_constant public static final androidx.compose.foundation.MutatePriority UserInput;
+  }
+
+  @androidx.compose.runtime.Stable public final class MutatorMutex {
+    ctor public MutatorMutex();
+    method public suspend <R> Object? mutate(optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+    method public suspend <T, R> Object? mutateWith(T? receiver, optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function2<? super T,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  public final class ProgressSemanticsKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier, float value, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier);
+  }
+
+  public final class ScrollKt {
+    method public static androidx.compose.ui.Modifier horizontalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.ScrollState rememberScrollState(optional int initial);
+    method public static androidx.compose.ui.Modifier verticalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+  }
+
+  @androidx.compose.runtime.Stable public final class ScrollState implements androidx.compose.foundation.gestures.ScrollableState {
+    ctor public ScrollState(int initial);
+    method public suspend Object? animateScrollTo(int value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public float dispatchRawDelta(float delta);
+    method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+    method public int getMaxValue();
+    method public int getValue();
+    method public boolean isScrollInProgress();
+    method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? scrollTo(int value, kotlin.coroutines.Continuation<? super java.lang.Float> p);
+    property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+    property public boolean isScrollInProgress;
+    property public final int maxValue;
+    property public final int value;
+    field public static final androidx.compose.foundation.ScrollState.Companion Companion;
+  }
+
+  public static final class ScrollState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> Saver;
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+}
+
+package androidx.compose.foundation.gestures {
+
+  public final class AndroidScrollable_androidKt {
+  }
+
+  public final class DragGestureDetectorKt {
+    method public static suspend Object? awaitDragOrCancellation-ijcpFGM(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitHorizontalDragOrCancellation-ijcpFGM(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitHorizontalTouchSlopOrCancellation-qFc19kk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitTouchSlopOrCancellation-qFc19kk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitVerticalDragOrCancellation-ijcpFGM(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitVerticalTouchSlopOrCancellation-qFc19kk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? detectDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? detectDragGesturesAfterLongPress(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? detectHorizontalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onHorizontalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? detectVerticalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onVerticalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? drag-Pd94rOk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+    method public static suspend Object? horizontalDrag-Pd94rOk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+    method public static suspend Object? verticalDrag-Pd94rOk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+  }
+
+  public interface DragScope {
+    method public void dragBy(float pixels);
+  }
+
+  public final class DraggableKt {
+    method public static androidx.compose.foundation.gestures.DraggableState DraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+    method public static androidx.compose.ui.Modifier draggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.DraggableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional boolean startDragImmediately, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStarted, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super java.lang.Float,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStopped, optional boolean reverseDirection);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.DraggableState rememberDraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+  }
+
+  public interface DraggableState {
+    method public void dispatchRawDelta(float delta);
+    method public suspend Object? drag(optional androidx.compose.foundation.MutatePriority dragPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.DragScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public interface FlingBehavior {
+    method public suspend Object? performFling(androidx.compose.foundation.gestures.ScrollScope, float initialVelocity, kotlin.coroutines.Continuation<? super java.lang.Float> p);
+  }
+
+  public final class ForEachGestureKt {
+    method public static suspend Object? forEachGesture(androidx.compose.ui.input.pointer.PointerInputScope, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public final class GestureCancellationException extends java.util.concurrent.CancellationException {
+    ctor public GestureCancellationException(optional String? message);
+  }
+
+  public enum Orientation {
+    enum_constant public static final androidx.compose.foundation.gestures.Orientation Horizontal;
+    enum_constant public static final androidx.compose.foundation.gestures.Orientation Vertical;
+  }
+
+  public interface PressGestureScope extends androidx.compose.ui.unit.Density {
+    method public suspend Object? awaitRelease(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? tryAwaitRelease(kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+  }
+
+  public final class ScrollExtensionsKt {
+    method public static suspend Object? animateScrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super java.lang.Float> p);
+    method public static suspend Object? scrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, kotlin.coroutines.Continuation<? super java.lang.Float> p);
+    method public static suspend Object? stopScroll(androidx.compose.foundation.gestures.ScrollableState, optional androidx.compose.foundation.MutatePriority scrollPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public interface ScrollScope {
+    method public float scrollBy(float pixels);
+  }
+
+  public final class ScrollableDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior();
+    field public static final androidx.compose.foundation.gestures.ScrollableDefaults INSTANCE;
+  }
+
+  public final class ScrollableKt {
+    method public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+  }
+
+  public interface ScrollableState {
+    method public float dispatchRawDelta(float delta);
+    method public boolean isScrollInProgress();
+    method public suspend Object? scroll(optional androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public abstract boolean isScrollInProgress;
+  }
+
+  public final class ScrollableStateKt {
+    method public static androidx.compose.foundation.gestures.ScrollableState ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.ScrollableState rememberScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+  }
+
+  public final class TapGestureDetectorKt {
+    method public static suspend Object? awaitFirstDown(androidx.compose.ui.input.pointer.AwaitPointerEventScope, optional boolean requireUnconsumed, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? detectTapGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onDoubleTap, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onLongPress, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.gestures.PressGestureScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onPress, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onTap, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? waitForUpOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+  }
+
+  public final class TransformGestureDetectorKt {
+    method public static long calculateCentroid(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+    method public static float calculateCentroidSize(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+    method public static long calculatePan(androidx.compose.ui.input.pointer.PointerEvent);
+    method public static float calculateRotation(androidx.compose.ui.input.pointer.PointerEvent);
+    method public static float calculateZoom(androidx.compose.ui.input.pointer.PointerEvent);
+    method public static suspend Object? detectTransformGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional boolean panZoomLock, kotlin.jvm.functions.Function4<? super androidx.compose.ui.geometry.Offset,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> onGesture, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public interface TransformScope {
+    method public void transformBy-ox2scHU(optional float zoomChange, optional long panChange, optional float rotationChange);
+  }
+
+  public final class TransformableKt {
+    method public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, optional boolean lockRotationOnZoomPan, optional boolean enabled);
+  }
+
+  public interface TransformableState {
+    method public boolean isTransformInProgress();
+    method public suspend Object? transform(optional androidx.compose.foundation.MutatePriority transformPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.TransformScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public abstract boolean isTransformInProgress;
+  }
+
+  public final class TransformableStateKt {
+    method public static androidx.compose.foundation.gestures.TransformableState TransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+    method public static suspend Object? animatePanBy-5602LSQ(androidx.compose.foundation.gestures.TransformableState, long offset, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? animateRotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? animateZoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? panBy-8hPFfiU(androidx.compose.foundation.gestures.TransformableState, long offset, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.TransformableState rememberTransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+    method public static suspend Object? rotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? stopTransformation(androidx.compose.foundation.gestures.TransformableState, optional androidx.compose.foundation.MutatePriority terminationPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? zoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+}
+
+package androidx.compose.foundation.interaction {
+
+  public interface DragInteraction extends androidx.compose.foundation.interaction.Interaction {
+  }
+
+  public static final class DragInteraction.Cancel implements androidx.compose.foundation.interaction.DragInteraction {
+    ctor public DragInteraction.Cancel(androidx.compose.foundation.interaction.DragInteraction.Start start);
+    method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+    property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+  }
+
+  public static final class DragInteraction.Start implements androidx.compose.foundation.interaction.DragInteraction {
+    ctor public DragInteraction.Start();
+  }
+
+  public static final class DragInteraction.Stop implements androidx.compose.foundation.interaction.DragInteraction {
+    ctor public DragInteraction.Stop(androidx.compose.foundation.interaction.DragInteraction.Start start);
+    method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+    property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+  }
+
+  public final class DragInteractionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsDraggedAsState(androidx.compose.foundation.interaction.InteractionSource);
+  }
+
+  public interface FocusInteraction extends androidx.compose.foundation.interaction.Interaction {
+  }
+
+  public static final class FocusInteraction.Focus implements androidx.compose.foundation.interaction.FocusInteraction {
+    ctor public FocusInteraction.Focus();
+  }
+
+  public static final class FocusInteraction.Unfocus implements androidx.compose.foundation.interaction.FocusInteraction {
+    ctor public FocusInteraction.Unfocus(androidx.compose.foundation.interaction.FocusInteraction.Focus focus);
+    method public androidx.compose.foundation.interaction.FocusInteraction.Focus getFocus();
+    property public final androidx.compose.foundation.interaction.FocusInteraction.Focus focus;
+  }
+
+  public final class FocusInteractionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsFocusedAsState(androidx.compose.foundation.interaction.InteractionSource);
+  }
+
+  public interface Interaction {
+  }
+
+  @androidx.compose.runtime.Stable public interface InteractionSource {
+    method public kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> getInteractions();
+    property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> interactions;
+  }
+
+  public final class InteractionSourceKt {
+    method public static androidx.compose.foundation.interaction.MutableInteractionSource MutableInteractionSource();
+  }
+
+  @androidx.compose.runtime.Stable public interface MutableInteractionSource extends androidx.compose.foundation.interaction.InteractionSource {
+    method public suspend Object? emit(androidx.compose.foundation.interaction.Interaction interaction, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public boolean tryEmit(androidx.compose.foundation.interaction.Interaction interaction);
+  }
+
+  public interface PressInteraction extends androidx.compose.foundation.interaction.Interaction {
+  }
+
+  public static final class PressInteraction.Cancel implements androidx.compose.foundation.interaction.PressInteraction {
+    ctor public PressInteraction.Cancel(androidx.compose.foundation.interaction.PressInteraction.Press press);
+    method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+    property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+  }
+
+  public static final class PressInteraction.Press implements androidx.compose.foundation.interaction.PressInteraction {
+    method public long getPressPosition-F1C5BW0();
+    property public final long pressPosition;
+  }
+
+  public static final class PressInteraction.Release implements androidx.compose.foundation.interaction.PressInteraction {
+    ctor public PressInteraction.Release(androidx.compose.foundation.interaction.PressInteraction.Press press);
+    method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+    property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+  }
+
+  public final class PressInteractionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsPressedAsState(androidx.compose.foundation.interaction.InteractionSource);
+  }
+
+}
+
+package androidx.compose.foundation.lazy {
+
+  public final class LazyDslKt {
+    method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void LazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+    method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+    method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+    method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+    method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+  }
+
+  public final class LazyGridKt {
+  }
+
+  @androidx.compose.foundation.lazy.LazyScopeMarker @androidx.compose.runtime.Stable public interface LazyItemScope {
+    method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+    method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+    method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+  }
+
+  public final class LazyListItemContentFactoryKt {
+  }
+
+  public interface LazyListItemInfo {
+    method public int getIndex();
+    method public Object getKey();
+    method public int getOffset();
+    method public int getSize();
+    property public abstract int index;
+    property public abstract Object key;
+    property public abstract int offset;
+    property public abstract int size;
+  }
+
+  public final class LazyListKt {
+  }
+
+  public interface LazyListLayoutInfo {
+    method public int getTotalItemsCount();
+    method public int getViewportEndOffset();
+    method public int getViewportStartOffset();
+    method public java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> getVisibleItemsInfo();
+    property public abstract int totalItemsCount;
+    property public abstract int viewportEndOffset;
+    property public abstract int viewportStartOffset;
+    property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
+  }
+
+  public final class LazyListMeasureKt {
+  }
+
+  @androidx.compose.foundation.lazy.LazyScopeMarker public interface LazyListScope {
+    method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+    method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+  }
+
+  public final class LazyListScrollingKt {
+  }
+
+  @androidx.compose.runtime.Stable public final class LazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+    ctor public LazyListState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
+    method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public float dispatchRawDelta(float delta);
+    method public int getFirstVisibleItemIndex();
+    method public int getFirstVisibleItemScrollOffset();
+    method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+    method public androidx.compose.foundation.lazy.LazyListLayoutInfo getLayoutInfo();
+    method public boolean isScrollInProgress();
+    method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final int firstVisibleItemIndex;
+    property public final int firstVisibleItemScrollOffset;
+    property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+    property public boolean isScrollInProgress;
+    property public final androidx.compose.foundation.lazy.LazyListLayoutInfo layoutInfo;
+    field public static final androidx.compose.foundation.lazy.LazyListState.Companion Companion;
+  }
+
+  public static final class LazyListState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> Saver;
+  }
+
+  public final class LazyListStateKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.LazyListState rememberLazyListState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
+  }
+
+  @kotlin.DslMarker public @interface LazyScopeMarker {
+  }
+
+  public final class Lazy_androidKt {
+  }
+
+}
+
+package androidx.compose.foundation.legacygestures {
+
+  public final class DragGestureFilterKt {
+  }
+
+}
+
+package androidx.compose.foundation.selection {
+
+  public final class SelectableGroupKt {
+    method public static androidx.compose.ui.Modifier selectableGroup(androidx.compose.ui.Modifier);
+  }
+
+  public final class SelectableKt {
+    method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+  }
+
+  public final class ToggleableKt {
+    method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+    method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+    method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+  }
+
+}
+
+package androidx.compose.foundation.shape {
+
+  public final class AbsoluteCutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+    method public androidx.compose.foundation.shape.AbsoluteCutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class AbsoluteCutCornerShapeKt {
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape-ZmiikuI(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+  }
+
+  public final class AbsoluteRoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+    method public androidx.compose.foundation.shape.AbsoluteRoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class AbsoluteRoundedCornerShapeKt {
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape-ZmiikuI(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+  }
+
+  public abstract class CornerBasedShape implements androidx.compose.ui.graphics.Shape {
+    ctor public CornerBasedShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public abstract androidx.compose.foundation.shape.CornerBasedShape copy(optional androidx.compose.foundation.shape.CornerSize topStart, optional androidx.compose.foundation.shape.CornerSize topEnd, optional androidx.compose.foundation.shape.CornerSize bottomEnd, optional androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public final androidx.compose.foundation.shape.CornerBasedShape copy(androidx.compose.foundation.shape.CornerSize all);
+    method public final androidx.compose.ui.graphics.Outline createOutline-9w1PWio(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+    method public abstract androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public final androidx.compose.foundation.shape.CornerSize getBottomEnd();
+    method public final androidx.compose.foundation.shape.CornerSize getBottomStart();
+    method public final androidx.compose.foundation.shape.CornerSize getTopEnd();
+    method public final androidx.compose.foundation.shape.CornerSize getTopStart();
+    property public final androidx.compose.foundation.shape.CornerSize bottomEnd;
+    property public final androidx.compose.foundation.shape.CornerSize bottomStart;
+    property public final androidx.compose.foundation.shape.CornerSize topEnd;
+    property public final androidx.compose.foundation.shape.CornerSize topStart;
+  }
+
+  @androidx.compose.runtime.Immutable public interface CornerSize {
+    method public float toPx-lwCvPpU(long shapeSize, androidx.compose.ui.unit.Density density);
+  }
+
+  public final class CornerSizeKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(float size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(int percent);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.CornerSize getZeroCornerSize();
+  }
+
+  public final class CutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public CutCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.foundation.shape.CutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class CutCornerShapeKt {
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(float size);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape-ZmiikuI(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+  }
+
+  public final class GenericShape implements androidx.compose.ui.graphics.Shape {
+    ctor public GenericShape(kotlin.jvm.functions.Function3<? super androidx.compose.ui.graphics.Path,? super androidx.compose.ui.geometry.Size,? super androidx.compose.ui.unit.LayoutDirection,kotlin.Unit> builder);
+    method public androidx.compose.ui.graphics.Outline createOutline-9w1PWio(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+  }
+
+  public final class RoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public RoundedCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.foundation.shape.RoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class RoundedCornerShapeKt {
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(float size);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape-ZmiikuI(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape getCircleShape();
+  }
+
+}
+
+package androidx.compose.foundation.text {
+
+  public final class BasicTextFieldKt {
+    method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+    method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+  }
+
+  public final class BasicTextKt {
+    method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines);
+    method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent);
+  }
+
+  public final class ClickableTextKt {
+    method @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional androidx.compose.ui.text.style.TextOverflow overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+  }
+
+  public final class CoreTextFieldKt {
+  }
+
+  public final class CoreTextKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class InlineTextContent {
+    ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+    method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
+    method public androidx.compose.ui.text.Placeholder getPlaceholder();
+    property public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> children;
+    property public final androidx.compose.ui.text.Placeholder placeholder;
+  }
+
+  public final class InlineTextContentKt {
+    method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, optional String alternateText);
+  }
+
+  public final class KeyMappingKt {
+  }
+
+  public final class KeyMapping_androidKt {
+  }
+
+  public interface KeyboardActionScope {
+    method public void defaultKeyboardAction(androidx.compose.ui.text.input.ImeAction imeAction);
+  }
+
+  public final class KeyboardActions {
+    ctor public KeyboardActions(optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend);
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnDone();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnGo();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnNext();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnPrevious();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSearch();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSend();
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend;
+    field public static final androidx.compose.foundation.text.KeyboardActions.Companion Companion;
+  }
+
+  public static final class KeyboardActions.Companion {
+    method public androidx.compose.foundation.text.KeyboardActions getDefault();
+    property public final androidx.compose.foundation.text.KeyboardActions Default;
+  }
+
+  public final class KeyboardActionsKt {
+    method public static androidx.compose.foundation.text.KeyboardActions KeyboardActions(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit> onAny);
+  }
+
+  @androidx.compose.runtime.Immutable public final class KeyboardOptions {
+    ctor public KeyboardOptions(optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public androidx.compose.foundation.text.KeyboardOptions copy(optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public boolean getAutoCorrect();
+    method public androidx.compose.ui.text.input.KeyboardCapitalization getCapitalization();
+    method public androidx.compose.ui.text.input.ImeAction getImeAction();
+    method public androidx.compose.ui.text.input.KeyboardType getKeyboardType();
+    property public final boolean autoCorrect;
+    property public final androidx.compose.ui.text.input.KeyboardCapitalization capitalization;
+    property public final androidx.compose.ui.text.input.ImeAction imeAction;
+    property public final androidx.compose.ui.text.input.KeyboardType keyboardType;
+    field public static final androidx.compose.foundation.text.KeyboardOptions.Companion Companion;
+  }
+
+  public static final class KeyboardOptions.Companion {
+    method public androidx.compose.foundation.text.KeyboardOptions getDefault();
+    property public final androidx.compose.foundation.text.KeyboardOptions Default;
+  }
+
+  public final class MaxLinesHeightModifierKt {
+  }
+
+  public final class StringHelpers_jvmKt {
+  }
+
+  public final class TextFieldCursorKt {
+  }
+
+  public final class TextFieldDelegateKt {
+  }
+
+  public final class TextFieldGestureModifiersKt {
+  }
+
+  public final class TextFieldKeyInputKt {
+  }
+
+  public final class TextFieldKeyInput_androidKt {
+  }
+
+  public final class TextFieldPressGestureFilterKt {
+  }
+
+  public final class TextFieldScrollKt {
+  }
+
+  public final class TextFieldSizeKt {
+  }
+
+  public final class TextLayoutResultProxyKt {
+  }
+
+  public final class TouchMode_androidKt {
+  }
+
+}
+
+package androidx.compose.foundation.text.selection {
+
+  public final class AndroidSelectionHandles_androidKt {
+  }
+
+  public final class MultiWidgetSelectionDelegateKt {
+  }
+
+  public final class SelectionContainerKt {
+    method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class SelectionHandlesKt {
+  }
+
+  public final class SelectionManagerKt {
+  }
+
+  public final class SelectionManager_androidKt {
+  }
+
+  public final class SelectionRegistrarKt {
+  }
+
+  public final class SimpleLayoutKt {
+  }
+
+  public final class TextFieldSelectionDelegateKt {
+  }
+
+  public final class TextFieldSelectionManagerKt {
+  }
+
+  public final class TextFieldSelectionManager_androidKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextSelectionColors {
+    method public long getBackgroundColor-0d7_KjU();
+    method public long getHandleColor-0d7_KjU();
+    property public final long backgroundColor;
+    property public final long handleColor;
+  }
+
+  public final class TextSelectionColorsKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> getLocalTextSelectionColors();
+  }
+
+  public final class TextSelectionDelegateKt {
+  }
+
+}
+
+package androidx.compose.ui.text {
+
+  public final class TextLayoutHelperKt {
+  }
+
+}
+

compose/foundation/foundation/api/current.ignore

diff --git a/compose/foundation/foundation/api/current.ignore b/compose/foundation/foundation/api/current.ignore
new file mode 100644
index 0000000..42f2adc
--- /dev/null
+++ b/compose/foundation/foundation/api/current.ignore
@@ -0,0 +1,5 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.foundation.legacygestures.PressIndicatorGestureFilterKt:
+    Removed class androidx.compose.foundation.legacygestures.PressIndicatorGestureFilterKt
+RemovedClass: androidx.compose.foundation.legacygestures.TapGestureFilterKt:
+    Removed class androidx.compose.foundation.legacygestures.TapGestureFilterKt

compose/foundation/foundation/api/current.txt

diff --git a/compose/foundation/foundation/api/current.txt b/compose/foundation/foundation/api/current.txt
index bff54f1..d469dcc 100644
--- a/compose/foundation/foundation/api/current.txt
+++ b/compose/foundation/foundation/api/current.txt
@@ -430,12 +430,6 @@
   public final class DragGestureFilterKt {
   }
 
-  public final class PressIndicatorGestureFilterKt {
-  }
-
-  public final class TapGestureFilterKt {
-  }
-
 }
 
 package androidx.compose.foundation.selection {

compose/foundation/foundation/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/foundation/foundation/api/public_plus_experimental_1.0.0-beta04.txt b/compose/foundation/foundation/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..9a8dc67
--- /dev/null
+++ b/compose/foundation/foundation/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,778 @@
+// Signature format: 4.0
+package androidx.compose.foundation {
+
+  public final class ActualJvmKt {
+  }
+
+  public final class BackgroundKt {
+    method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
+    method public static androidx.compose.ui.Modifier background-1xq40Q0(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
+  }
+
+  public final class BorderKt {
+    method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, androidx.compose.foundation.BorderStroke border, optional androidx.compose.ui.graphics.Shape shape);
+    method public static androidx.compose.ui.Modifier border-bMj1UE0(androidx.compose.ui.Modifier, float width, androidx.compose.ui.graphics.Brush brush, androidx.compose.ui.graphics.Shape shape);
+    method public static androidx.compose.ui.Modifier border-zRMYNwQ(androidx.compose.ui.Modifier, float width, long color, optional androidx.compose.ui.graphics.Shape shape);
+  }
+
+  @androidx.compose.runtime.Immutable public final class BorderStroke {
+    method public androidx.compose.foundation.BorderStroke copy-v_fYJzc(optional float width, optional androidx.compose.ui.graphics.Brush brush);
+    method public androidx.compose.ui.graphics.Brush getBrush();
+    method public float getWidth-D9Ej5fM();
+    property public final androidx.compose.ui.graphics.Brush brush;
+    property public final float width;
+  }
+
+  public final class BorderStrokeKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.BorderStroke BorderStroke-Qek64HU(float width, long color);
+  }
+
+  public final class CanvasKt {
+    method @androidx.compose.runtime.Composable public static void Canvas(androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+  }
+
+  public final class ClickableKt {
+    method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+  }
+
+  public final class DarkTheme_androidKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
+  }
+
+  @kotlin.RequiresOptIn(message="This foundation API is experimental and is likely to change or be removed in the " + "future.") public @interface ExperimentalFoundationApi {
+  }
+
+  public final class FocusableKt {
+    method public static androidx.compose.ui.Modifier focusable(androidx.compose.ui.Modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+  }
+
+  public final class ImageKt {
+    method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+  }
+
+  @androidx.compose.runtime.Stable public interface Indication {
+    method @androidx.compose.runtime.Composable public androidx.compose.foundation.IndicationInstance rememberUpdatedInstance(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+  }
+
+  public interface IndicationInstance {
+    method public void drawIndication(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+  }
+
+  public final class IndicationKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.Indication> getLocalIndication();
+    method public static androidx.compose.ui.Modifier indication(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.InteractionSource interactionSource, androidx.compose.foundation.Indication? indication);
+  }
+
+  @kotlin.RequiresOptIn(message="This API is internal to library.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface InternalFoundationApi {
+  }
+
+  public enum MutatePriority {
+    enum_constant public static final androidx.compose.foundation.MutatePriority Default;
+    enum_constant public static final androidx.compose.foundation.MutatePriority PreventUserInput;
+    enum_constant public static final androidx.compose.foundation.MutatePriority UserInput;
+  }
+
+  @androidx.compose.runtime.Stable public final class MutatorMutex {
+    ctor public MutatorMutex();
+    method public suspend <R> Object? mutate(optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+    method public suspend <T, R> Object? mutateWith(T? receiver, optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function2<? super T,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  public final class ProgressSemanticsKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier, float value, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier);
+  }
+
+  public final class ScrollKt {
+    method public static androidx.compose.ui.Modifier horizontalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.ScrollState rememberScrollState(optional int initial);
+    method public static androidx.compose.ui.Modifier verticalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+  }
+
+  @androidx.compose.runtime.Stable public final class ScrollState implements androidx.compose.foundation.gestures.ScrollableState {
+    ctor public ScrollState(int initial);
+    method public suspend Object? animateScrollTo(int value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public float dispatchRawDelta(float delta);
+    method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+    method public int getMaxValue();
+    method public int getValue();
+    method public boolean isScrollInProgress();
+    method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? scrollTo(int value, kotlin.coroutines.Continuation<? super java.lang.Float> p);
+    property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+    property public boolean isScrollInProgress;
+    property public final int maxValue;
+    property public final int value;
+    field public static final androidx.compose.foundation.ScrollState.Companion Companion;
+  }
+
+  public static final class ScrollState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> Saver;
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+}
+
+package androidx.compose.foundation.gestures {
+
+  public final class AndroidScrollable_androidKt {
+  }
+
+  public final class DragGestureDetectorKt {
+    method public static suspend Object? awaitDragOrCancellation-ijcpFGM(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitHorizontalDragOrCancellation-ijcpFGM(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitHorizontalTouchSlopOrCancellation-qFc19kk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitTouchSlopOrCancellation-qFc19kk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitVerticalDragOrCancellation-ijcpFGM(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitVerticalTouchSlopOrCancellation-qFc19kk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? detectDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? detectDragGesturesAfterLongPress(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? detectHorizontalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onHorizontalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? detectVerticalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onVerticalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? drag-Pd94rOk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+    method public static suspend Object? horizontalDrag-Pd94rOk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+    method public static suspend Object? verticalDrag-Pd94rOk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+  }
+
+  public interface DragScope {
+    method public void dragBy(float pixels);
+  }
+
+  public final class DraggableKt {
+    method public static androidx.compose.foundation.gestures.DraggableState DraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+    method public static androidx.compose.ui.Modifier draggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.DraggableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional boolean startDragImmediately, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStarted, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super java.lang.Float,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStopped, optional boolean reverseDirection);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.DraggableState rememberDraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+  }
+
+  public interface DraggableState {
+    method public void dispatchRawDelta(float delta);
+    method public suspend Object? drag(optional androidx.compose.foundation.MutatePriority dragPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.DragScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public interface FlingBehavior {
+    method public suspend Object? performFling(androidx.compose.foundation.gestures.ScrollScope, float initialVelocity, kotlin.coroutines.Continuation<? super java.lang.Float> p);
+  }
+
+  public final class ForEachGestureKt {
+    method public static suspend Object? forEachGesture(androidx.compose.ui.input.pointer.PointerInputScope, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public final class GestureCancellationException extends java.util.concurrent.CancellationException {
+    ctor public GestureCancellationException(optional String? message);
+  }
+
+  public enum Orientation {
+    enum_constant public static final androidx.compose.foundation.gestures.Orientation Horizontal;
+    enum_constant public static final androidx.compose.foundation.gestures.Orientation Vertical;
+  }
+
+  public interface PressGestureScope extends androidx.compose.ui.unit.Density {
+    method public suspend Object? awaitRelease(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? tryAwaitRelease(kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+  }
+
+  public final class ScrollExtensionsKt {
+    method public static suspend Object? animateScrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super java.lang.Float> p);
+    method public static suspend Object? scrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, kotlin.coroutines.Continuation<? super java.lang.Float> p);
+    method public static suspend Object? stopScroll(androidx.compose.foundation.gestures.ScrollableState, optional androidx.compose.foundation.MutatePriority scrollPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public interface ScrollScope {
+    method public float scrollBy(float pixels);
+  }
+
+  public final class ScrollableDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior();
+    field public static final androidx.compose.foundation.gestures.ScrollableDefaults INSTANCE;
+  }
+
+  public final class ScrollableKt {
+    method public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+  }
+
+  public interface ScrollableState {
+    method public float dispatchRawDelta(float delta);
+    method public boolean isScrollInProgress();
+    method public suspend Object? scroll(optional androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public abstract boolean isScrollInProgress;
+  }
+
+  public final class ScrollableStateKt {
+    method public static androidx.compose.foundation.gestures.ScrollableState ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.ScrollableState rememberScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+  }
+
+  public final class TapGestureDetectorKt {
+    method public static suspend Object? awaitFirstDown(androidx.compose.ui.input.pointer.AwaitPointerEventScope, optional boolean requireUnconsumed, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? detectTapGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onDoubleTap, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onLongPress, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.gestures.PressGestureScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onPress, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onTap, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? waitForUpOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+  }
+
+  public final class TransformGestureDetectorKt {
+    method public static long calculateCentroid(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+    method public static float calculateCentroidSize(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+    method public static long calculatePan(androidx.compose.ui.input.pointer.PointerEvent);
+    method public static float calculateRotation(androidx.compose.ui.input.pointer.PointerEvent);
+    method public static float calculateZoom(androidx.compose.ui.input.pointer.PointerEvent);
+    method public static suspend Object? detectTransformGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional boolean panZoomLock, kotlin.jvm.functions.Function4<? super androidx.compose.ui.geometry.Offset,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> onGesture, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public interface TransformScope {
+    method public void transformBy-ox2scHU(optional float zoomChange, optional long panChange, optional float rotationChange);
+  }
+
+  public final class TransformableKt {
+    method public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, optional boolean lockRotationOnZoomPan, optional boolean enabled);
+  }
+
+  public interface TransformableState {
+    method public boolean isTransformInProgress();
+    method public suspend Object? transform(optional androidx.compose.foundation.MutatePriority transformPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.TransformScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public abstract boolean isTransformInProgress;
+  }
+
+  public final class TransformableStateKt {
+    method public static androidx.compose.foundation.gestures.TransformableState TransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+    method public static suspend Object? animatePanBy-5602LSQ(androidx.compose.foundation.gestures.TransformableState, long offset, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? animateRotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? animateZoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? panBy-8hPFfiU(androidx.compose.foundation.gestures.TransformableState, long offset, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.TransformableState rememberTransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+    method public static suspend Object? rotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? stopTransformation(androidx.compose.foundation.gestures.TransformableState, optional androidx.compose.foundation.MutatePriority terminationPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? zoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+}
+
+package androidx.compose.foundation.interaction {
+
+  public interface DragInteraction extends androidx.compose.foundation.interaction.Interaction {
+  }
+
+  public static final class DragInteraction.Cancel implements androidx.compose.foundation.interaction.DragInteraction {
+    ctor public DragInteraction.Cancel(androidx.compose.foundation.interaction.DragInteraction.Start start);
+    method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+    property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+  }
+
+  public static final class DragInteraction.Start implements androidx.compose.foundation.interaction.DragInteraction {
+    ctor public DragInteraction.Start();
+  }
+
+  public static final class DragInteraction.Stop implements androidx.compose.foundation.interaction.DragInteraction {
+    ctor public DragInteraction.Stop(androidx.compose.foundation.interaction.DragInteraction.Start start);
+    method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+    property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+  }
+
+  public final class DragInteractionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsDraggedAsState(androidx.compose.foundation.interaction.InteractionSource);
+  }
+
+  public interface FocusInteraction extends androidx.compose.foundation.interaction.Interaction {
+  }
+
+  public static final class FocusInteraction.Focus implements androidx.compose.foundation.interaction.FocusInteraction {
+    ctor public FocusInteraction.Focus();
+  }
+
+  public static final class FocusInteraction.Unfocus implements androidx.compose.foundation.interaction.FocusInteraction {
+    ctor public FocusInteraction.Unfocus(androidx.compose.foundation.interaction.FocusInteraction.Focus focus);
+    method public androidx.compose.foundation.interaction.FocusInteraction.Focus getFocus();
+    property public final androidx.compose.foundation.interaction.FocusInteraction.Focus focus;
+  }
+
+  public final class FocusInteractionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsFocusedAsState(androidx.compose.foundation.interaction.InteractionSource);
+  }
+
+  public interface Interaction {
+  }
+
+  @androidx.compose.runtime.Stable public interface InteractionSource {
+    method public kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> getInteractions();
+    property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> interactions;
+  }
+
+  public final class InteractionSourceKt {
+    method public static androidx.compose.foundation.interaction.MutableInteractionSource MutableInteractionSource();
+  }
+
+  @androidx.compose.runtime.Stable public interface MutableInteractionSource extends androidx.compose.foundation.interaction.InteractionSource {
+    method public suspend Object? emit(androidx.compose.foundation.interaction.Interaction interaction, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public boolean tryEmit(androidx.compose.foundation.interaction.Interaction interaction);
+  }
+
+  public interface PressInteraction extends androidx.compose.foundation.interaction.Interaction {
+  }
+
+  public static final class PressInteraction.Cancel implements androidx.compose.foundation.interaction.PressInteraction {
+    ctor public PressInteraction.Cancel(androidx.compose.foundation.interaction.PressInteraction.Press press);
+    method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+    property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+  }
+
+  public static final class PressInteraction.Press implements androidx.compose.foundation.interaction.PressInteraction {
+    method public long getPressPosition-F1C5BW0();
+    property public final long pressPosition;
+  }
+
+  public static final class PressInteraction.Release implements androidx.compose.foundation.interaction.PressInteraction {
+    ctor public PressInteraction.Release(androidx.compose.foundation.interaction.PressInteraction.Press press);
+    method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+    property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+  }
+
+  public final class PressInteractionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsPressedAsState(androidx.compose.foundation.interaction.InteractionSource);
+  }
+
+}
+
+package androidx.compose.foundation.lazy {
+
+  @androidx.compose.foundation.ExperimentalFoundationApi public abstract sealed class GridCells {
+  }
+
+  @androidx.compose.foundation.ExperimentalFoundationApi public static final class GridCells.Adaptive extends androidx.compose.foundation.lazy.GridCells {
+    method public float getMinSize-D9Ej5fM();
+    property public final float minSize;
+  }
+
+  @androidx.compose.foundation.ExperimentalFoundationApi public static final class GridCells.Fixed extends androidx.compose.foundation.lazy.GridCells {
+    ctor public GridCells.Fixed(int count);
+    method public int getCount();
+    property public final int count;
+  }
+
+  public final class LazyDslKt {
+    method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void LazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+    method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+    method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+    method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+    method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+  }
+
+  public final class LazyGridKt {
+    method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyVerticalGrid(androidx.compose.foundation.lazy.GridCells cells, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyGridScope,kotlin.Unit> content);
+    method @androidx.compose.foundation.ExperimentalFoundationApi public static inline <T> void items(androidx.compose.foundation.lazy.LazyGridScope, java.util.List<? extends T> items, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+    method @androidx.compose.foundation.ExperimentalFoundationApi public static inline <T> void items(androidx.compose.foundation.lazy.LazyGridScope, T![] items, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+    method @androidx.compose.foundation.ExperimentalFoundationApi public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyGridScope, java.util.List<? extends T> items, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+    method @androidx.compose.foundation.ExperimentalFoundationApi public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyGridScope, T![] items, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+  }
+
+  @androidx.compose.foundation.ExperimentalFoundationApi public interface LazyGridScope {
+    method public void item(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+    method public void items(int count, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+  }
+
+  @androidx.compose.foundation.lazy.LazyScopeMarker @androidx.compose.runtime.Stable public interface LazyItemScope {
+    method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+    method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+    method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+  }
+
+  public final class LazyListItemContentFactoryKt {
+  }
+
+  public interface LazyListItemInfo {
+    method public int getIndex();
+    method public Object getKey();
+    method public int getOffset();
+    method public int getSize();
+    property public abstract int index;
+    property public abstract Object key;
+    property public abstract int offset;
+    property public abstract int size;
+  }
+
+  public final class LazyListKt {
+  }
+
+  public interface LazyListLayoutInfo {
+    method public int getTotalItemsCount();
+    method public int getViewportEndOffset();
+    method public int getViewportStartOffset();
+    method public java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> getVisibleItemsInfo();
+    property public abstract int totalItemsCount;
+    property public abstract int viewportEndOffset;
+    property public abstract int viewportStartOffset;
+    property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
+  }
+
+  public final class LazyListMeasureKt {
+  }
+
+  @androidx.compose.foundation.lazy.LazyScopeMarker public interface LazyListScope {
+    method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+    method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+    method @androidx.compose.foundation.ExperimentalFoundationApi public void stickyHeader(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+  }
+
+  public final class LazyListScrollingKt {
+  }
+
+  @androidx.compose.runtime.Stable public final class LazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+    ctor public LazyListState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
+    method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public float dispatchRawDelta(float delta);
+    method public int getFirstVisibleItemIndex();
+    method public int getFirstVisibleItemScrollOffset();
+    method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+    method public androidx.compose.foundation.lazy.LazyListLayoutInfo getLayoutInfo();
+    method public boolean isScrollInProgress();
+    method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final int firstVisibleItemIndex;
+    property public final int firstVisibleItemScrollOffset;
+    property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+    property public boolean isScrollInProgress;
+    property public final androidx.compose.foundation.lazy.LazyListLayoutInfo layoutInfo;
+    field public static final androidx.compose.foundation.lazy.LazyListState.Companion Companion;
+  }
+
+  public static final class LazyListState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> Saver;
+  }
+
+  public final class LazyListStateKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.LazyListState rememberLazyListState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
+  }
+
+  @kotlin.DslMarker public @interface LazyScopeMarker {
+  }
+
+  public final class Lazy_androidKt {
+  }
+
+}
+
+package androidx.compose.foundation.legacygestures {
+
+  public final class DragGestureFilterKt {
+  }
+
+}
+
+package androidx.compose.foundation.selection {
+
+  public final class SelectableGroupKt {
+    method public static androidx.compose.ui.Modifier selectableGroup(androidx.compose.ui.Modifier);
+  }
+
+  public final class SelectableKt {
+    method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+  }
+
+  public final class ToggleableKt {
+    method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+    method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+    method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+  }
+
+}
+
+package androidx.compose.foundation.shape {
+
+  public final class AbsoluteCutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+    method public androidx.compose.foundation.shape.AbsoluteCutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class AbsoluteCutCornerShapeKt {
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape-ZmiikuI(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+  }
+
+  public final class AbsoluteRoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+    method public androidx.compose.foundation.shape.AbsoluteRoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class AbsoluteRoundedCornerShapeKt {
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape-ZmiikuI(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+  }
+
+  public abstract class CornerBasedShape implements androidx.compose.ui.graphics.Shape {
+    ctor public CornerBasedShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public abstract androidx.compose.foundation.shape.CornerBasedShape copy(optional androidx.compose.foundation.shape.CornerSize topStart, optional androidx.compose.foundation.shape.CornerSize topEnd, optional androidx.compose.foundation.shape.CornerSize bottomEnd, optional androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public final androidx.compose.foundation.shape.CornerBasedShape copy(androidx.compose.foundation.shape.CornerSize all);
+    method public final androidx.compose.ui.graphics.Outline createOutline-9w1PWio(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+    method public abstract androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public final androidx.compose.foundation.shape.CornerSize getBottomEnd();
+    method public final androidx.compose.foundation.shape.CornerSize getBottomStart();
+    method public final androidx.compose.foundation.shape.CornerSize getTopEnd();
+    method public final androidx.compose.foundation.shape.CornerSize getTopStart();
+    property public final androidx.compose.foundation.shape.CornerSize bottomEnd;
+    property public final androidx.compose.foundation.shape.CornerSize bottomStart;
+    property public final androidx.compose.foundation.shape.CornerSize topEnd;
+    property public final androidx.compose.foundation.shape.CornerSize topStart;
+  }
+
+  @androidx.compose.runtime.Immutable public interface CornerSize {
+    method public float toPx-lwCvPpU(long shapeSize, androidx.compose.ui.unit.Density density);
+  }
+
+  public final class CornerSizeKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(float size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(int percent);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.CornerSize getZeroCornerSize();
+  }
+
+  public final class CutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public CutCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.foundation.shape.CutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class CutCornerShapeKt {
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(float size);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape-ZmiikuI(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+  }
+
+  public final class GenericShape implements androidx.compose.ui.graphics.Shape {
+    ctor public GenericShape(kotlin.jvm.functions.Function3<? super androidx.compose.ui.graphics.Path,? super androidx.compose.ui.geometry.Size,? super androidx.compose.ui.unit.LayoutDirection,kotlin.Unit> builder);
+    method public androidx.compose.ui.graphics.Outline createOutline-9w1PWio(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+  }
+
+  public final class RoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public RoundedCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.foundation.shape.RoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class RoundedCornerShapeKt {
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(float size);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape-ZmiikuI(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape getCircleShape();
+  }
+
+}
+
+package androidx.compose.foundation.text {
+
+  public final class BasicTextFieldKt {
+    method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+    method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+  }
+
+  public final class BasicTextKt {
+    method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines);
+    method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent);
+  }
+
+  public final class ClickableTextKt {
+    method @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional androidx.compose.ui.text.style.TextOverflow overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+  }
+
+  public final class CoreTextFieldKt {
+  }
+
+  public final class CoreTextKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class InlineTextContent {
+    ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+    method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
+    method public androidx.compose.ui.text.Placeholder getPlaceholder();
+    property public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> children;
+    property public final androidx.compose.ui.text.Placeholder placeholder;
+  }
+
+  public final class InlineTextContentKt {
+    method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, optional String alternateText);
+  }
+
+  @kotlin.RequiresOptIn(message="Internal/Unstable API for use only between foundation modules sharing " + "the same exact version, subject to change without notice.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface InternalFoundationTextApi {
+  }
+
+  public final class KeyMappingKt {
+  }
+
+  public final class KeyMapping_androidKt {
+  }
+
+  public interface KeyboardActionScope {
+    method public void defaultKeyboardAction(androidx.compose.ui.text.input.ImeAction imeAction);
+  }
+
+  public final class KeyboardActions {
+    ctor public KeyboardActions(optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend);
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnDone();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnGo();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnNext();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnPrevious();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSearch();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSend();
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend;
+    field public static final androidx.compose.foundation.text.KeyboardActions.Companion Companion;
+  }
+
+  public static final class KeyboardActions.Companion {
+    method public androidx.compose.foundation.text.KeyboardActions getDefault();
+    property public final androidx.compose.foundation.text.KeyboardActions Default;
+  }
+
+  public final class KeyboardActionsKt {
+    method public static androidx.compose.foundation.text.KeyboardActions KeyboardActions(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit> onAny);
+  }
+
+  @androidx.compose.runtime.Immutable public final class KeyboardOptions {
+    ctor public KeyboardOptions(optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public androidx.compose.foundation.text.KeyboardOptions copy(optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public boolean getAutoCorrect();
+    method public androidx.compose.ui.text.input.KeyboardCapitalization getCapitalization();
+    method public androidx.compose.ui.text.input.ImeAction getImeAction();
+    method public androidx.compose.ui.text.input.KeyboardType getKeyboardType();
+    property public final boolean autoCorrect;
+    property public final androidx.compose.ui.text.input.KeyboardCapitalization capitalization;
+    property public final androidx.compose.ui.text.input.ImeAction imeAction;
+    property public final androidx.compose.ui.text.input.KeyboardType keyboardType;
+    field public static final androidx.compose.foundation.text.KeyboardOptions.Companion Companion;
+  }
+
+  public static final class KeyboardOptions.Companion {
+    method public androidx.compose.foundation.text.KeyboardOptions getDefault();
+    property public final androidx.compose.foundation.text.KeyboardOptions Default;
+  }
+
+  public final class MaxLinesHeightModifierKt {
+  }
+
+  public final class StringHelpers_jvmKt {
+  }
+
+  public final class TextFieldCursorKt {
+  }
+
+  public final class TextFieldDelegateKt {
+  }
+
+  public final class TextFieldGestureModifiersKt {
+  }
+
+  public final class TextFieldKeyInputKt {
+  }
+
+  public final class TextFieldKeyInput_androidKt {
+  }
+
+  public final class TextFieldPressGestureFilterKt {
+  }
+
+  public final class TextFieldScrollKt {
+  }
+
+  public final class TextFieldSizeKt {
+  }
+
+  public final class TextLayoutResultProxyKt {
+  }
+
+  public final class TouchMode_androidKt {
+  }
+
+}
+
+package androidx.compose.foundation.text.selection {
+
+  public final class AndroidSelectionHandles_androidKt {
+  }
+
+  public final class MultiWidgetSelectionDelegateKt {
+  }
+
+  public final class SelectionContainerKt {
+    method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class SelectionHandlesKt {
+  }
+
+  public final class SelectionManagerKt {
+  }
+
+  public final class SelectionManager_androidKt {
+  }
+
+  public final class SelectionRegistrarKt {
+  }
+
+  public final class SimpleLayoutKt {
+  }
+
+  public final class TextFieldSelectionDelegateKt {
+  }
+
+  public final class TextFieldSelectionManagerKt {
+  }
+
+  public final class TextFieldSelectionManager_androidKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextSelectionColors {
+    method public long getBackgroundColor-0d7_KjU();
+    method public long getHandleColor-0d7_KjU();
+    property public final long backgroundColor;
+    property public final long handleColor;
+  }
+
+  public final class TextSelectionColorsKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> getLocalTextSelectionColors();
+  }
+
+  public final class TextSelectionDelegateKt {
+  }
+
+}
+
+package androidx.compose.ui.text {
+
+  public final class TextLayoutHelperKt {
+  }
+
+}
+

compose/foundation/foundation/api/public_plus_experimental_current.txt

diff --git a/compose/foundation/foundation/api/public_plus_experimental_current.txt b/compose/foundation/foundation/api/public_plus_experimental_current.txt
index d9e6a73..9a8dc67 100644
--- a/compose/foundation/foundation/api/public_plus_experimental_current.txt
+++ b/compose/foundation/foundation/api/public_plus_experimental_current.txt
@@ -463,12 +463,6 @@
   public final class DragGestureFilterKt {
   }
 
-  public final class PressIndicatorGestureFilterKt {
-  }
-
-  public final class TapGestureFilterKt {
-  }
-
 }
 
 package androidx.compose.foundation.selection {

compose/foundation/foundation/api/res-1.0.0-beta04.txt

diff --git a/serialization/serialization/api/res-current.txt b/compose/foundation/foundation/api/res-1.0.0-beta04.txt
similarity index 100%
copy from serialization/serialization/api/res-current.txt
copy to compose/foundation/foundation/api/res-1.0.0-beta04.txt

compose/foundation/foundation/api/restricted_1.0.0-beta04.txt

diff --git a/compose/foundation/foundation/api/restricted_1.0.0-beta04.txt b/compose/foundation/foundation/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..d469dcc
--- /dev/null
+++ b/compose/foundation/foundation/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,742 @@
+// Signature format: 4.0
+package androidx.compose.foundation {
+
+  public final class ActualJvmKt {
+  }
+
+  public final class BackgroundKt {
+    method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
+    method public static androidx.compose.ui.Modifier background-1xq40Q0(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
+  }
+
+  public final class BorderKt {
+    method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, androidx.compose.foundation.BorderStroke border, optional androidx.compose.ui.graphics.Shape shape);
+    method public static androidx.compose.ui.Modifier border-bMj1UE0(androidx.compose.ui.Modifier, float width, androidx.compose.ui.graphics.Brush brush, androidx.compose.ui.graphics.Shape shape);
+    method public static androidx.compose.ui.Modifier border-zRMYNwQ(androidx.compose.ui.Modifier, float width, long color, optional androidx.compose.ui.graphics.Shape shape);
+  }
+
+  @androidx.compose.runtime.Immutable public final class BorderStroke {
+    method public androidx.compose.foundation.BorderStroke copy-v_fYJzc(optional float width, optional androidx.compose.ui.graphics.Brush brush);
+    method public androidx.compose.ui.graphics.Brush getBrush();
+    method public float getWidth-D9Ej5fM();
+    property public final androidx.compose.ui.graphics.Brush brush;
+    property public final float width;
+  }
+
+  public final class BorderStrokeKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.BorderStroke BorderStroke-Qek64HU(float width, long color);
+  }
+
+  public final class CanvasKt {
+    method @androidx.compose.runtime.Composable public static void Canvas(androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+  }
+
+  public final class ClickableKt {
+    method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+  }
+
+  public final class DarkTheme_androidKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
+  }
+
+  public final class FocusableKt {
+    method public static androidx.compose.ui.Modifier focusable(androidx.compose.ui.Modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+  }
+
+  public final class ImageKt {
+    method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+  }
+
+  @androidx.compose.runtime.Stable public interface Indication {
+    method @androidx.compose.runtime.Composable public androidx.compose.foundation.IndicationInstance rememberUpdatedInstance(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+  }
+
+  public interface IndicationInstance {
+    method public void drawIndication(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+  }
+
+  public final class IndicationKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.Indication> getLocalIndication();
+    method public static androidx.compose.ui.Modifier indication(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.InteractionSource interactionSource, androidx.compose.foundation.Indication? indication);
+  }
+
+  public enum MutatePriority {
+    enum_constant public static final androidx.compose.foundation.MutatePriority Default;
+    enum_constant public static final androidx.compose.foundation.MutatePriority PreventUserInput;
+    enum_constant public static final androidx.compose.foundation.MutatePriority UserInput;
+  }
+
+  @androidx.compose.runtime.Stable public final class MutatorMutex {
+    ctor public MutatorMutex();
+    method public suspend <R> Object? mutate(optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+    method public suspend <T, R> Object? mutateWith(T? receiver, optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function2<? super T,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  public final class ProgressSemanticsKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier, float value, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier);
+  }
+
+  public final class ScrollKt {
+    method public static androidx.compose.ui.Modifier horizontalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.ScrollState rememberScrollState(optional int initial);
+    method public static androidx.compose.ui.Modifier verticalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+  }
+
+  @androidx.compose.runtime.Stable public final class ScrollState implements androidx.compose.foundation.gestures.ScrollableState {
+    ctor public ScrollState(int initial);
+    method public suspend Object? animateScrollTo(int value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public float dispatchRawDelta(float delta);
+    method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+    method public int getMaxValue();
+    method public int getValue();
+    method public boolean isScrollInProgress();
+    method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? scrollTo(int value, kotlin.coroutines.Continuation<? super java.lang.Float> p);
+    property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+    property public boolean isScrollInProgress;
+    property public final int maxValue;
+    property public final int value;
+    field public static final androidx.compose.foundation.ScrollState.Companion Companion;
+  }
+
+  public static final class ScrollState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> Saver;
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+}
+
+package androidx.compose.foundation.gestures {
+
+  public final class AndroidScrollable_androidKt {
+  }
+
+  public final class DragGestureDetectorKt {
+    method public static suspend Object? awaitDragOrCancellation-ijcpFGM(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitHorizontalDragOrCancellation-ijcpFGM(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitHorizontalTouchSlopOrCancellation-qFc19kk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitTouchSlopOrCancellation-qFc19kk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitVerticalDragOrCancellation-ijcpFGM(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? awaitVerticalTouchSlopOrCancellation-qFc19kk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? detectDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? detectDragGesturesAfterLongPress(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? detectHorizontalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onHorizontalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? detectVerticalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onVerticalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? drag-Pd94rOk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+    method public static suspend Object? horizontalDrag-Pd94rOk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+    method public static suspend Object? verticalDrag-Pd94rOk(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+  }
+
+  public interface DragScope {
+    method public void dragBy(float pixels);
+  }
+
+  public final class DraggableKt {
+    method public static androidx.compose.foundation.gestures.DraggableState DraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+    method public static androidx.compose.ui.Modifier draggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.DraggableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional boolean startDragImmediately, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStarted, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super java.lang.Float,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStopped, optional boolean reverseDirection);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.DraggableState rememberDraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+  }
+
+  public interface DraggableState {
+    method public void dispatchRawDelta(float delta);
+    method public suspend Object? drag(optional androidx.compose.foundation.MutatePriority dragPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.DragScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public interface FlingBehavior {
+    method public suspend Object? performFling(androidx.compose.foundation.gestures.ScrollScope, float initialVelocity, kotlin.coroutines.Continuation<? super java.lang.Float> p);
+  }
+
+  public final class ForEachGestureKt {
+    method public static suspend Object? forEachGesture(androidx.compose.ui.input.pointer.PointerInputScope, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public final class GestureCancellationException extends java.util.concurrent.CancellationException {
+    ctor public GestureCancellationException(optional String? message);
+  }
+
+  public enum Orientation {
+    enum_constant public static final androidx.compose.foundation.gestures.Orientation Horizontal;
+    enum_constant public static final androidx.compose.foundation.gestures.Orientation Vertical;
+  }
+
+  public interface PressGestureScope extends androidx.compose.ui.unit.Density {
+    method public suspend Object? awaitRelease(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? tryAwaitRelease(kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
+  }
+
+  public final class ScrollExtensionsKt {
+    method public static suspend Object? animateScrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super java.lang.Float> p);
+    method public static suspend Object? scrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, kotlin.coroutines.Continuation<? super java.lang.Float> p);
+    method public static suspend Object? stopScroll(androidx.compose.foundation.gestures.ScrollableState, optional androidx.compose.foundation.MutatePriority scrollPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public interface ScrollScope {
+    method public float scrollBy(float pixels);
+  }
+
+  public final class ScrollableDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior();
+    field public static final androidx.compose.foundation.gestures.ScrollableDefaults INSTANCE;
+  }
+
+  public final class ScrollableKt {
+    method public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+  }
+
+  public interface ScrollableState {
+    method public float dispatchRawDelta(float delta);
+    method public boolean isScrollInProgress();
+    method public suspend Object? scroll(optional androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public abstract boolean isScrollInProgress;
+  }
+
+  public final class ScrollableStateKt {
+    method public static androidx.compose.foundation.gestures.ScrollableState ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.ScrollableState rememberScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+  }
+
+  public final class TapGestureDetectorKt {
+    method public static suspend Object? awaitFirstDown(androidx.compose.ui.input.pointer.AwaitPointerEventScope, optional boolean requireUnconsumed, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+    method public static suspend Object? detectTapGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onDoubleTap, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onLongPress, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.gestures.PressGestureScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onPress, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onTap, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? waitForUpOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange> p);
+  }
+
+  public final class TransformGestureDetectorKt {
+    method public static long calculateCentroid(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+    method public static float calculateCentroidSize(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+    method public static long calculatePan(androidx.compose.ui.input.pointer.PointerEvent);
+    method public static float calculateRotation(androidx.compose.ui.input.pointer.PointerEvent);
+    method public static float calculateZoom(androidx.compose.ui.input.pointer.PointerEvent);
+    method public static suspend Object? detectTransformGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional boolean panZoomLock, kotlin.jvm.functions.Function4<? super androidx.compose.ui.geometry.Offset,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> onGesture, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+  public interface TransformScope {
+    method public void transformBy-ox2scHU(optional float zoomChange, optional long panChange, optional float rotationChange);
+  }
+
+  public final class TransformableKt {
+    method public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, optional boolean lockRotationOnZoomPan, optional boolean enabled);
+  }
+
+  public interface TransformableState {
+    method public boolean isTransformInProgress();
+    method public suspend Object? transform(optional androidx.compose.foundation.MutatePriority transformPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.TransformScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public abstract boolean isTransformInProgress;
+  }
+
+  public final class TransformableStateKt {
+    method public static androidx.compose.foundation.gestures.TransformableState TransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+    method public static suspend Object? animatePanBy-5602LSQ(androidx.compose.foundation.gestures.TransformableState, long offset, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? animateRotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? animateZoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? panBy-8hPFfiU(androidx.compose.foundation.gestures.TransformableState, long offset, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.TransformableState rememberTransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+    method public static suspend Object? rotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? stopTransformation(androidx.compose.foundation.gestures.TransformableState, optional androidx.compose.foundation.MutatePriority terminationPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public static suspend Object? zoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+  }
+
+}
+
+package androidx.compose.foundation.interaction {
+
+  public interface DragInteraction extends androidx.compose.foundation.interaction.Interaction {
+  }
+
+  public static final class DragInteraction.Cancel implements androidx.compose.foundation.interaction.DragInteraction {
+    ctor public DragInteraction.Cancel(androidx.compose.foundation.interaction.DragInteraction.Start start);
+    method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+    property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+  }
+
+  public static final class DragInteraction.Start implements androidx.compose.foundation.interaction.DragInteraction {
+    ctor public DragInteraction.Start();
+  }
+
+  public static final class DragInteraction.Stop implements androidx.compose.foundation.interaction.DragInteraction {
+    ctor public DragInteraction.Stop(androidx.compose.foundation.interaction.DragInteraction.Start start);
+    method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+    property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+  }
+
+  public final class DragInteractionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsDraggedAsState(androidx.compose.foundation.interaction.InteractionSource);
+  }
+
+  public interface FocusInteraction extends androidx.compose.foundation.interaction.Interaction {
+  }
+
+  public static final class FocusInteraction.Focus implements androidx.compose.foundation.interaction.FocusInteraction {
+    ctor public FocusInteraction.Focus();
+  }
+
+  public static final class FocusInteraction.Unfocus implements androidx.compose.foundation.interaction.FocusInteraction {
+    ctor public FocusInteraction.Unfocus(androidx.compose.foundation.interaction.FocusInteraction.Focus focus);
+    method public androidx.compose.foundation.interaction.FocusInteraction.Focus getFocus();
+    property public final androidx.compose.foundation.interaction.FocusInteraction.Focus focus;
+  }
+
+  public final class FocusInteractionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsFocusedAsState(androidx.compose.foundation.interaction.InteractionSource);
+  }
+
+  public interface Interaction {
+  }
+
+  @androidx.compose.runtime.Stable public interface InteractionSource {
+    method public kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> getInteractions();
+    property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> interactions;
+  }
+
+  public final class InteractionSourceKt {
+    method public static androidx.compose.foundation.interaction.MutableInteractionSource MutableInteractionSource();
+  }
+
+  @androidx.compose.runtime.Stable public interface MutableInteractionSource extends androidx.compose.foundation.interaction.InteractionSource {
+    method public suspend Object? emit(androidx.compose.foundation.interaction.Interaction interaction, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public boolean tryEmit(androidx.compose.foundation.interaction.Interaction interaction);
+  }
+
+  public interface PressInteraction extends androidx.compose.foundation.interaction.Interaction {
+  }
+
+  public static final class PressInteraction.Cancel implements androidx.compose.foundation.interaction.PressInteraction {
+    ctor public PressInteraction.Cancel(androidx.compose.foundation.interaction.PressInteraction.Press press);
+    method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+    property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+  }
+
+  public static final class PressInteraction.Press implements androidx.compose.foundation.interaction.PressInteraction {
+    method public long getPressPosition-F1C5BW0();
+    property public final long pressPosition;
+  }
+
+  public static final class PressInteraction.Release implements androidx.compose.foundation.interaction.PressInteraction {
+    ctor public PressInteraction.Release(androidx.compose.foundation.interaction.PressInteraction.Press press);
+    method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+    property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+  }
+
+  public final class PressInteractionKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsPressedAsState(androidx.compose.foundation.interaction.InteractionSource);
+  }
+
+}
+
+package androidx.compose.foundation.lazy {
+
+  public final class LazyDslKt {
+    method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void LazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+    method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+    method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+    method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+    method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+  }
+
+  public final class LazyGridKt {
+  }
+
+  @androidx.compose.foundation.lazy.LazyScopeMarker @androidx.compose.runtime.Stable public interface LazyItemScope {
+    method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+    method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+    method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+  }
+
+  public final class LazyListItemContentFactoryKt {
+  }
+
+  public interface LazyListItemInfo {
+    method public int getIndex();
+    method public Object getKey();
+    method public int getOffset();
+    method public int getSize();
+    property public abstract int index;
+    property public abstract Object key;
+    property public abstract int offset;
+    property public abstract int size;
+  }
+
+  public final class LazyListKt {
+  }
+
+  public interface LazyListLayoutInfo {
+    method public int getTotalItemsCount();
+    method public int getViewportEndOffset();
+    method public int getViewportStartOffset();
+    method public java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> getVisibleItemsInfo();
+    property public abstract int totalItemsCount;
+    property public abstract int viewportEndOffset;
+    property public abstract int viewportStartOffset;
+    property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
+  }
+
+  public final class LazyListMeasureKt {
+  }
+
+  @androidx.compose.foundation.lazy.LazyScopeMarker public interface LazyListScope {
+    method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+    method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+  }
+
+  public final class LazyListScrollingKt {
+  }
+
+  @androidx.compose.runtime.Stable public final class LazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+    ctor public LazyListState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
+    method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public float dispatchRawDelta(float delta);
+    method public int getFirstVisibleItemIndex();
+    method public int getFirstVisibleItemScrollOffset();
+    method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+    method public androidx.compose.foundation.lazy.LazyListLayoutInfo getLayoutInfo();
+    method public boolean isScrollInProgress();
+    method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final int firstVisibleItemIndex;
+    property public final int firstVisibleItemScrollOffset;
+    property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+    property public boolean isScrollInProgress;
+    property public final androidx.compose.foundation.lazy.LazyListLayoutInfo layoutInfo;
+    field public static final androidx.compose.foundation.lazy.LazyListState.Companion Companion;
+  }
+
+  public static final class LazyListState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> Saver;
+  }
+
+  public final class LazyListStateKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.LazyListState rememberLazyListState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
+  }
+
+  @kotlin.DslMarker public @interface LazyScopeMarker {
+  }
+
+  public final class Lazy_androidKt {
+  }
+
+}
+
+package androidx.compose.foundation.legacygestures {
+
+  public final class DragGestureFilterKt {
+  }
+
+}
+
+package androidx.compose.foundation.selection {
+
+  public final class SelectableGroupKt {
+    method public static androidx.compose.ui.Modifier selectableGroup(androidx.compose.ui.Modifier);
+  }
+
+  public final class SelectableKt {
+    method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+  }
+
+  public final class ToggleableKt {
+    method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+    method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+    method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+    method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+  }
+
+}
+
+package androidx.compose.foundation.shape {
+
+  public final class AbsoluteCutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+    method public androidx.compose.foundation.shape.AbsoluteCutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class AbsoluteCutCornerShapeKt {
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape-ZmiikuI(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+  }
+
+  public final class AbsoluteRoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+    method public androidx.compose.foundation.shape.AbsoluteRoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class AbsoluteRoundedCornerShapeKt {
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape-ZmiikuI(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+  }
+
+  public abstract class CornerBasedShape implements androidx.compose.ui.graphics.Shape {
+    ctor public CornerBasedShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public abstract androidx.compose.foundation.shape.CornerBasedShape copy(optional androidx.compose.foundation.shape.CornerSize topStart, optional androidx.compose.foundation.shape.CornerSize topEnd, optional androidx.compose.foundation.shape.CornerSize bottomEnd, optional androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public final androidx.compose.foundation.shape.CornerBasedShape copy(androidx.compose.foundation.shape.CornerSize all);
+    method public final androidx.compose.ui.graphics.Outline createOutline-9w1PWio(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+    method public abstract androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public final androidx.compose.foundation.shape.CornerSize getBottomEnd();
+    method public final androidx.compose.foundation.shape.CornerSize getBottomStart();
+    method public final androidx.compose.foundation.shape.CornerSize getTopEnd();
+    method public final androidx.compose.foundation.shape.CornerSize getTopStart();
+    property public final androidx.compose.foundation.shape.CornerSize bottomEnd;
+    property public final androidx.compose.foundation.shape.CornerSize bottomStart;
+    property public final androidx.compose.foundation.shape.CornerSize topEnd;
+    property public final androidx.compose.foundation.shape.CornerSize topStart;
+  }
+
+  @androidx.compose.runtime.Immutable public interface CornerSize {
+    method public float toPx-lwCvPpU(long shapeSize, androidx.compose.ui.unit.Density density);
+  }
+
+  public final class CornerSizeKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(float size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(int percent);
+    method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.CornerSize getZeroCornerSize();
+  }
+
+  public final class CutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public CutCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.foundation.shape.CutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class CutCornerShapeKt {
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(float size);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape-ZmiikuI(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+  }
+
+  public final class GenericShape implements androidx.compose.ui.graphics.Shape {
+    ctor public GenericShape(kotlin.jvm.functions.Function3<? super androidx.compose.ui.graphics.Path,? super androidx.compose.ui.geometry.Size,? super androidx.compose.ui.unit.LayoutDirection,kotlin.Unit> builder);
+    method public androidx.compose.ui.graphics.Outline createOutline-9w1PWio(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+  }
+
+  public final class RoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+    ctor public RoundedCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.foundation.shape.RoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+    method public androidx.compose.ui.graphics.Outline createOutline-ljnXCgI(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  public final class RoundedCornerShapeKt {
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(float size);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(int percent);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape-0680j_4(float size);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape-ZmiikuI(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+    method public static androidx.compose.foundation.shape.RoundedCornerShape getCircleShape();
+  }
+
+}
+
+package androidx.compose.foundation.text {
+
+  public final class BasicTextFieldKt {
+    method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+    method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+  }
+
+  public final class BasicTextKt {
+    method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines);
+    method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent);
+  }
+
+  public final class ClickableTextKt {
+    method @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional androidx.compose.ui.text.style.TextOverflow overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+  }
+
+  public final class CoreTextFieldKt {
+  }
+
+  public final class CoreTextKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class InlineTextContent {
+    ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+    method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
+    method public androidx.compose.ui.text.Placeholder getPlaceholder();
+    property public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> children;
+    property public final androidx.compose.ui.text.Placeholder placeholder;
+  }
+
+  public final class InlineTextContentKt {
+    method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, optional String alternateText);
+  }
+
+  public final class KeyMappingKt {
+  }
+
+  public final class KeyMapping_androidKt {
+  }
+
+  public interface KeyboardActionScope {
+    method public void defaultKeyboardAction(androidx.compose.ui.text.input.ImeAction imeAction);
+  }
+
+  public final class KeyboardActions {
+    ctor public KeyboardActions(optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend);
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnDone();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnGo();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnNext();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnPrevious();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSearch();
+    method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSend();
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch;
+    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend;
+    field public static final androidx.compose.foundation.text.KeyboardActions.Companion Companion;
+  }
+
+  public static final class KeyboardActions.Companion {
+    method public androidx.compose.foundation.text.KeyboardActions getDefault();
+    property public final androidx.compose.foundation.text.KeyboardActions Default;
+  }
+
+  public final class KeyboardActionsKt {
+    method public static androidx.compose.foundation.text.KeyboardActions KeyboardActions(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit> onAny);
+  }
+
+  @androidx.compose.runtime.Immutable public final class KeyboardOptions {
+    ctor public KeyboardOptions(optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public androidx.compose.foundation.text.KeyboardOptions copy(optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public boolean getAutoCorrect();
+    method public androidx.compose.ui.text.input.KeyboardCapitalization getCapitalization();
+    method public androidx.compose.ui.text.input.ImeAction getImeAction();
+    method public androidx.compose.ui.text.input.KeyboardType getKeyboardType();
+    property public final boolean autoCorrect;
+    property public final androidx.compose.ui.text.input.KeyboardCapitalization capitalization;
+    property public final androidx.compose.ui.text.input.ImeAction imeAction;
+    property public final androidx.compose.ui.text.input.KeyboardType keyboardType;
+    field public static final androidx.compose.foundation.text.KeyboardOptions.Companion Companion;
+  }
+
+  public static final class KeyboardOptions.Companion {
+    method public androidx.compose.foundation.text.KeyboardOptions getDefault();
+    property public final androidx.compose.foundation.text.KeyboardOptions Default;
+  }
+
+  public final class MaxLinesHeightModifierKt {
+  }
+
+  public final class StringHelpers_jvmKt {
+  }
+
+  public final class TextFieldCursorKt {
+  }
+
+  public final class TextFieldDelegateKt {
+  }
+
+  public final class TextFieldGestureModifiersKt {
+  }
+
+  public final class TextFieldKeyInputKt {
+  }
+
+  public final class TextFieldKeyInput_androidKt {
+  }
+
+  public final class TextFieldPressGestureFilterKt {
+  }
+
+  public final class TextFieldScrollKt {
+  }
+
+  public final class TextFieldSizeKt {
+  }
+
+  public final class TextLayoutResultProxyKt {
+  }
+
+  public final class TouchMode_androidKt {
+  }
+
+}
+
+package androidx.compose.foundation.text.selection {
+
+  public final class AndroidSelectionHandles_androidKt {
+  }
+
+  public final class MultiWidgetSelectionDelegateKt {
+  }
+
+  public final class SelectionContainerKt {
+    method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class SelectionHandlesKt {
+  }
+
+  public final class SelectionManagerKt {
+  }
+
+  public final class SelectionManager_androidKt {
+  }
+
+  public final class SelectionRegistrarKt {
+  }
+
+  public final class SimpleLayoutKt {
+  }
+
+  public final class TextFieldSelectionDelegateKt {
+  }
+
+  public final class TextFieldSelectionManagerKt {
+  }
+
+  public final class TextFieldSelectionManager_androidKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextSelectionColors {
+    method public long getBackgroundColor-0d7_KjU();
+    method public long getHandleColor-0d7_KjU();
+    property public final long backgroundColor;
+    property public final long handleColor;
+  }
+
+  public final class TextSelectionColorsKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> getLocalTextSelectionColors();
+  }
+
+  public final class TextSelectionDelegateKt {
+  }
+
+}
+
+package androidx.compose.ui.text {
+
+  public final class TextLayoutHelperKt {
+  }
+
+}
+

compose/foundation/foundation/api/restricted_current.ignore

diff --git a/compose/foundation/foundation/api/restricted_current.ignore b/compose/foundation/foundation/api/restricted_current.ignore
new file mode 100644
index 0000000..42f2adc
--- /dev/null
+++ b/compose/foundation/foundation/api/restricted_current.ignore
@@ -0,0 +1,5 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.foundation.legacygestures.PressIndicatorGestureFilterKt:
+    Removed class androidx.compose.foundation.legacygestures.PressIndicatorGestureFilterKt
+RemovedClass: androidx.compose.foundation.legacygestures.TapGestureFilterKt:
+    Removed class androidx.compose.foundation.legacygestures.TapGestureFilterKt

compose/foundation/foundation/api/restricted_current.txt

diff --git a/compose/foundation/foundation/api/restricted_current.txt b/compose/foundation/foundation/api/restricted_current.txt
index bff54f1..d469dcc 100644
--- a/compose/foundation/foundation/api/restricted_current.txt
+++ b/compose/foundation/foundation/api/restricted_current.txt
@@ -430,12 +430,6 @@
   public final class DragGestureFilterKt {
   }
 
-  public final class PressIndicatorGestureFilterKt {
-  }
-
-  public final class TapGestureFilterKt {
-  }
-
 }
 
 package androidx.compose.foundation.selection {

compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/lazy/LazyListScrollingBenchmark.kt

diff --git a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/lazy/LazyListScrollingBenchmark.kt b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/lazy/LazyListScrollingBenchmark.kt
new file mode 100644
index 0000000..a3e36fe
--- /dev/null
+++ b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/lazy/LazyListScrollingBenchmark.kt
@@ -0,0 +1,355 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.benchmark.lazy
+
+import android.os.Build
+import android.view.MotionEvent
+import android.view.View
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.scrollBy
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.requiredSize
+import androidx.compose.foundation.layout.requiredWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.assertNoPendingChanges
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.doFramesUntilNoChangesPending
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.unit.dp
+import androidx.test.filters.LargeTest
+import androidx.test.filters.SdkSuppress
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+
+@LargeTest
+@RunWith(Parameterized::class)
+class LazyListScrollingBenchmark(
+    private val testCase: LazyListScrollingTestCase
+) {
+    @get:Rule
+    val benchmarkRule = ComposeBenchmarkRule()
+
+    @Test
+    fun scrollProgrammatically_noNewItems() {
+        benchmarkRule.toggleStateBenchmark {
+            ListRemeasureTestCase(
+                addNewItemOnToggle = false,
+                content = testCase.content,
+                isVertical = testCase.isVertical
+            )
+        }
+    }
+
+    @Test
+    fun scrollProgrammatically_newItemComposed() {
+        benchmarkRule.toggleStateBenchmark {
+            ListRemeasureTestCase(
+                addNewItemOnToggle = true,
+                content = testCase.content,
+                isVertical = testCase.isVertical
+            )
+        }
+    }
+
+    @Test
+    fun scrollViaPointerInput_noNewItems() {
+        benchmarkRule.toggleStateBenchmark {
+            ListRemeasureTestCase(
+                addNewItemOnToggle = false,
+                content = testCase.content,
+                isVertical = testCase.isVertical,
+                usePointerInput = true
+            )
+        }
+    }
+
+    @Test
+    fun scrollViaPointerInput_newItemComposed() {
+        benchmarkRule.toggleStateBenchmark {
+            ListRemeasureTestCase(
+                addNewItemOnToggle = true,
+                content = testCase.content,
+                isVertical = testCase.isVertical,
+                usePointerInput = true
+            )
+        }
+    }
+
+    // this test makes sense only when run on the Android version which supports RenderNodes
+    // as this tests how efficiently we move RenderNodes.
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
+    @Test
+    fun drawAfterScroll_noNewItems() {
+        benchmarkRule.toggleStateBenchmarkDraw {
+            ListRemeasureTestCase(
+                addNewItemOnToggle = false,
+                content = testCase.content,
+                isVertical = testCase.isVertical
+            )
+        }
+    }
+
+    // this test makes sense only when run on the Android version which supports RenderNodes
+    // as this tests how efficiently we move RenderNodes.
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
+    @Test
+    fun drawAfterScroll_newItemComposed() {
+        benchmarkRule.toggleStateBenchmarkDraw {
+            ListRemeasureTestCase(
+                addNewItemOnToggle = true,
+                content = testCase.content,
+                isVertical = testCase.isVertical
+            )
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters(name = "{0}")
+        fun initParameters(): Array<LazyListScrollingTestCase> =
+            arrayOf(
+                LazyColumn,
+                LazyRow
+            )
+    }
+}
+
+class LazyListScrollingTestCase(
+    private val name: String,
+    val isVertical: Boolean,
+    val content: @Composable ListRemeasureTestCase.(LazyListState) -> Unit
+) {
+    override fun toString(): String {
+        return name
+    }
+}
+
+private val LazyColumn = LazyListScrollingTestCase(
+    "LazyColumn",
+    isVertical = true
+) { state ->
+    LazyColumn(state = state, modifier = Modifier.requiredHeight(400.dp).fillMaxWidth()) {
+        item {
+            FirstLargeItem()
+        }
+        items(items) {
+            RegularItem()
+        }
+    }
+}
+
+private val LazyRow = LazyListScrollingTestCase(
+    "LazyRow",
+    isVertical = false
+) { state ->
+    LazyRow(state = state, modifier = Modifier.requiredWidth(400.dp).fillMaxHeight()) {
+        item {
+            FirstLargeItem()
+        }
+        items(items) {
+            RegularItem()
+        }
+    }
+}
+
+// TODO(b/169852102 use existing public constructs instead)
+private fun ComposeBenchmarkRule.toggleStateBenchmark(
+    caseFactory: () -> ListRemeasureTestCase
+) {
+    runBenchmarkFor(caseFactory) {
+        doFramesUntilNoChangesPending()
+
+        measureRepeated {
+            runWithTimingDisabled {
+                getTestCase().beforeToggle()
+                assertNoPendingChanges()
+            }
+            getTestCase().toggle()
+            runWithTimingDisabled {
+                assertNoPendingChanges()
+                getTestCase().afterToggle()
+            }
+        }
+    }
+}
+
+// TODO(b/169852102 use existing public constructs instead)
+private fun ComposeBenchmarkRule.toggleStateBenchmarkDraw(
+    caseFactory: () -> ListRemeasureTestCase
+) {
+    runBenchmarkFor(caseFactory) {
+        doFrame()
+
+        measureRepeated {
+            runWithTimingDisabled {
+                // reset the state and draw
+                getTestCase().beforeToggle()
+                measure()
+                layout()
+                drawPrepare()
+                draw()
+                drawFinish()
+                // toggle and prepare measuring draw
+                getTestCase().toggle()
+                measure()
+                layout()
+                drawPrepare()
+            }
+            draw()
+            runWithTimingDisabled {
+                getTestCase().afterToggle()
+                drawFinish()
+            }
+        }
+    }
+}
+
+class ListRemeasureTestCase(
+    val addNewItemOnToggle: Boolean,
+    val content: @Composable ListRemeasureTestCase.(LazyListState) -> Unit,
+    val isVertical: Boolean,
+    val usePointerInput: Boolean = false
+) : ComposeTestCase {
+
+    val items = List(100) { ListItem(it) }
+
+    private lateinit var listState: LazyListState
+    private lateinit var view: View
+    private var touchSlop: Float = 0f
+    private var scrollBy: Int = 0
+
+    @Composable
+    fun FirstLargeItem() {
+        Box(Modifier.requiredSize(30.dp))
+    }
+
+    @Composable
+    override fun Content() {
+        scrollBy = if (addNewItemOnToggle) {
+            with(LocalDensity.current) { 15.dp.roundToPx() }
+        } else {
+            5
+        }
+        view = LocalView.current
+        touchSlop = LocalViewConfiguration.current.touchSlop
+        listState = rememberLazyListState()
+        content(listState)
+    }
+
+    @Composable
+    fun RegularItem() {
+        Box(Modifier.requiredSize(20.dp).background(Color.Red, RoundedCornerShape(8.dp)))
+    }
+
+    fun beforeToggle() {
+        runBlocking {
+            listState.scrollToItem(0, 0)
+        }
+        if (usePointerInput) {
+            val size = if (isVertical) view.measuredHeight else view.measuredWidth
+            sendEvent(MotionEvent.ACTION_DOWN, size / 2f)
+            sendEvent(MotionEvent.ACTION_MOVE, touchSlop)
+        }
+        assertEquals(0, listState.firstVisibleItemIndex)
+        assertEquals(0, listState.firstVisibleItemScrollOffset)
+    }
+
+    fun toggle() {
+        if (usePointerInput) {
+            sendEvent(MotionEvent.ACTION_MOVE, -scrollBy.toFloat())
+        } else {
+            runBlocking {
+                listState.scrollBy(scrollBy.toFloat())
+            }
+        }
+    }
+
+    fun afterToggle() {
+        assertEquals(0, listState.firstVisibleItemIndex)
+        assertEquals(scrollBy, listState.firstVisibleItemScrollOffset)
+        if (usePointerInput) {
+            sendEvent(MotionEvent.ACTION_UP, 0f)
+        }
+    }
+
+    private var time = 0L
+    private var lastCoord: Float? = null
+
+    private fun sendEvent(
+        action: Int,
+        delta: Float
+    ) {
+        time += 10L
+
+        val coord = delta + (lastCoord ?: 0f)
+
+        if (action == MotionEvent.ACTION_UP) {
+            lastCoord = null
+        } else {
+            lastCoord = coord
+        }
+
+        val locationOnScreen = IntArray(2) { 0 }
+        view.getLocationOnScreen(locationOnScreen)
+
+        val motionEvent = MotionEvent.obtain(
+            0,
+            time,
+            action,
+            1,
+            arrayOf(MotionEvent.PointerProperties()),
+            arrayOf(
+                MotionEvent.PointerCoords().apply {
+                    this.x = locationOnScreen[0] + if (!isVertical) coord else 1f
+                    this.y = locationOnScreen[1] + if (isVertical) coord else 1f
+                }
+            ),
+            0,
+            0,
+            0f,
+            0f,
+            0,
+            0,
+            0,
+            0
+        ).apply {
+            offsetLocation(-locationOnScreen[0].toFloat(), -locationOnScreen[1].toFloat())
+        }
+
+        view.dispatchTouchEvent(motionEvent)
+    }
+}
+
+data class ListItem(val index: Int)

compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/selection/SelectionContainerBenchmark.kt

diff --git a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/selection/SelectionContainerBenchmark.kt b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/selection/SelectionContainerBenchmark.kt
new file mode 100644
index 0000000..599098f
--- /dev/null
+++ b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/selection/SelectionContainerBenchmark.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.benchmark.text.selection
+
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.test.filters.SmallTest
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+
+@SmallTest
+@RunWith(Parameterized::class)
+class SelectionContainerBenchmark(private val childrenCount: Int) {
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters(
+            name = "childrenCount={0}"
+        )
+        fun initParameters() = arrayOf(1, 10, 20)
+    }
+
+    @get:Rule
+    val benchmarkRule = ComposeBenchmarkRule()
+    private val caseFactory = { SelectionContainerTestCase(childrenCount) }
+
+    @Test
+    fun first_compose() {
+        benchmarkRule.benchmarkFirstCompose(caseFactory)
+    }
+
+    @Test
+    fun first_measure() {
+        benchmarkRule.benchmarkFirstMeasure(caseFactory)
+    }
+
+    @Test
+    fun first_layout() {
+        benchmarkRule.benchmarkFirstLayout(caseFactory)
+    }
+
+    @Test
+    fun first_draw() {
+        benchmarkRule.benchmarkFirstDraw(caseFactory)
+    }
+
+    @Test
+    fun layout() {
+        benchmarkRule.benchmarkLayoutPerf(caseFactory)
+    }
+
+    @Test
+    fun draw() {
+        benchmarkRule.benchmarkDrawPerf(caseFactory)
+    }
+}
\ No newline at end of file

compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/selection/SelectionContainerTestCase.kt

diff --git a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/selection/SelectionContainerTestCase.kt b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/selection/SelectionContainerTestCase.kt
new file mode 100644
index 0000000..e94b226
--- /dev/null
+++ b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/selection/SelectionContainerTestCase.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.benchmark.text.selection
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.sp
+
+class SelectionContainerTestCase(private val childrenCount: Int) : ComposeTestCase {
+    @Composable
+    override fun Content() {
+        SelectionContainer {
+            Column {
+                repeat(childrenCount) {
+                    Text(
+                        text = "Hello World Hello World Hello W",
+                        style = TextStyle(fontSize = 20.sp)
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/CapitalizationAutoCorrectDemo.kt

diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/CapitalizationAutoCorrectDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/CapitalizationAutoCorrectDemo.kt
index 56f1900..816b805 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/CapitalizationAutoCorrectDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/CapitalizationAutoCorrectDemo.kt
@@ -97,7 +97,7 @@
         modifier = demoTextFieldModifiers.defaultMinSize(100.dp),
         value = state,
         keyboardOptions = data.keyboardOptions,
-        keyboardActions = KeyboardActions { keyboardController?.hideSoftwareKeyboard() },
+        keyboardActions = KeyboardActions { keyboardController?.hide() },
         onValueChange = { state = it },
         textStyle = TextStyle(fontSize = fontSize8),
         cursorBrush = SolidColor(Color.Red)

compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeInputField.kt

diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeInputField.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeInputField.kt
index e908c57..edc57c1 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeInputField.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeInputField.kt
@@ -92,7 +92,7 @@
             keyboardType = keyboardType,
             imeAction = imeAction
         ),
-        keyboardActions = KeyboardActions { keyboardController?.hideSoftwareKeyboard() },
+        keyboardActions = KeyboardActions { keyboardController?.hide() },
         onValueChange = { state.value = it },
         textStyle = TextStyle(fontSize = fontSize8),
     )

compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeText.kt

diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeText.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeText.kt
index 426b2a0..c0e7425 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeText.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeText.kt
@@ -44,6 +44,10 @@
 import androidx.compose.ui.text.samples.TextDecorationCombinedSample
 import androidx.compose.ui.text.samples.TextDecorationLineThroughSample
 import androidx.compose.ui.text.samples.TextDecorationUnderlineSample
+import androidx.compose.ui.text.samples.TextOverflowClipSample
+import androidx.compose.ui.text.samples.TextOverflowEllipsisSample
+import androidx.compose.ui.text.samples.TextOverflowVisibleFixedSizeSample
+import androidx.compose.ui.text.samples.TextOverflowVisibleMinHeightSample
 import androidx.compose.ui.text.samples.TextStyleSample
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withStyle
@@ -129,6 +133,11 @@
             TagLine(tag = "complex paragraph styling")
             TextDemoParagraphStyling()
         }
+
+        item {
+            TagLine(tag = "textOverflow: Clip, Ellipsis, Visible")
+            TextDemoTextOverflow()
+        }
     }
 }
 
@@ -519,3 +528,15 @@
     ParagraphStyleSample()
     ParagraphStyleAnnotatedStringsSample()
 }
+
+@Composable
+fun TextDemoTextOverflow() {
+    SecondTagLine(tag = "overflow = TextOverflow.Clip")
+    TextOverflowClipSample()
+    SecondTagLine(tag = "overflow = TextOverflow.Ellipsis")
+    TextOverflowEllipsisSample()
+    SecondTagLine(tag = "overflow = TextOverflow.Visible with fixed size")
+    TextOverflowVisibleFixedSizeSample()
+    SecondTagLine(tag = "overflow = TextOverflow.Visible with fixed width and min height")
+    TextOverflowVisibleMinHeightSample()
+}
\ No newline at end of file

compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/KeyboardSingleLineDemo.kt

diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/KeyboardSingleLineDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/KeyboardSingleLineDemo.kt
index 24cd4c9..0113667 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/KeyboardSingleLineDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/KeyboardSingleLineDemo.kt
@@ -125,7 +125,7 @@
         modifier = demoTextFieldModifiers.defaultMinSize(100.dp),
         value = state.value,
         keyboardOptions = data.keyboardOptions,
-        keyboardActions = KeyboardActions { keyboardController?.hideSoftwareKeyboard() },
+        keyboardActions = KeyboardActions { keyboardController?.hide() },
         singleLine = data.singleLine,
         onValueChange = { state.value = it },
         textStyle = TextStyle(fontSize = fontSize8),

compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTest.kt

diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTest.kt
index b53e3ce..f3e0470 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTest.kt
@@ -41,6 +41,7 @@
 import androidx.compose.ui.test.click
 import androidx.compose.ui.test.doubleClick
 import androidx.compose.ui.test.down
+import androidx.compose.ui.test.cancel
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.longClick
 import androidx.compose.ui.test.onNodeWithTag
@@ -467,6 +468,57 @@
     }
 
     @Test
+    fun clickableTest_interactionSource_cancelledGesture() {
+        val interactionSource = MutableInteractionSource()
+
+        var scope: CoroutineScope? = null
+
+        rule.setContent {
+            scope = rememberCoroutineScope()
+            Box {
+                BasicText(
+                    "ClickableText",
+                    modifier = Modifier
+                        .testTag("myClickable")
+                        .combinedClickable(
+                            interactionSource = interactionSource,
+                            indication = null
+                        ) {}
+                )
+            }
+        }
+
+        val interactions = mutableListOf<Interaction>()
+
+        scope!!.launch {
+            interactionSource.interactions.collect { interactions.add(it) }
+        }
+
+        rule.runOnIdle {
+            assertThat(interactions).isEmpty()
+        }
+
+        rule.onNodeWithTag("myClickable")
+            .performGesture { down(center) }
+
+        rule.runOnIdle {
+            assertThat(interactions).hasSize(1)
+            assertThat(interactions.first()).isInstanceOf(PressInteraction.Press::class.java)
+        }
+
+        rule.onNodeWithTag("myClickable")
+            .performGesture { cancel() }
+
+        rule.runOnIdle {
+            assertThat(interactions).hasSize(2)
+            assertThat(interactions.first()).isInstanceOf(PressInteraction.Press::class.java)
+            assertThat(interactions[1]).isInstanceOf(PressInteraction.Cancel::class.java)
+            assertThat((interactions[1] as PressInteraction.Cancel).press)
+                .isEqualTo(interactions[0])
+        }
+    }
+
+    @Test
     fun clickableTest_interactionSource_resetWhenDisposed() {
         val interactionSource = MutableInteractionSource()
         var emitClickableText by mutableStateOf(true)

compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/LazyListLayoutInfoTest.kt

diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/LazyListLayoutInfoTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/LazyListLayoutInfoTest.kt
index 9f259df..b24e18c 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/LazyListLayoutInfoTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/LazyListLayoutInfoTest.kt
@@ -21,6 +21,7 @@
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -126,14 +127,14 @@
         }
     }
 
+    @Composable
+    fun ObservingFun(state: LazyListState, currentInfo: StableRef<LazyListLayoutInfo?>) {
+        currentInfo.value = state.layoutInfo
+    }
     @Test
     fun visibleItemsAreObservableWhenWeScroll() {
         lateinit var state: LazyListState
-        var currentInfo: LazyListLayoutInfo? = null
-        @Composable
-        fun observingFun() {
-            currentInfo = state.layoutInfo
-        }
+        val currentInfo = StableRef<LazyListLayoutInfo?>(null)
         rule.setContent {
             LazyColumn(
                 state = rememberLazyListState().also { state = it },
@@ -144,20 +145,20 @@
                     Box(Modifier.requiredSize(itemSizeDp))
                 }
             }
-            observingFun()
+            ObservingFun(state, currentInfo)
         }
 
         rule.runOnIdle {
             // empty it here and scrolling should invoke observingFun again
-            currentInfo = null
+            currentInfo.value = null
             runBlocking {
                 state.scrollToItem(1, 0)
             }
         }
 
         rule.runOnIdle {
-            assertThat(currentInfo).isNotNull()
-            currentInfo!!.assertVisibleItems(count = 4, startIndex = 1)
+            assertThat(currentInfo.value).isNotNull()
+            currentInfo.value!!.assertVisibleItems(count = 4, startIndex = 1)
         }
     }
 
@@ -291,3 +292,6 @@
         }
     }
 }
+
+@Stable
+class StableRef<T>(var value: T)

compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextPreparedSelectionTest.kt

diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextPreparedSelectionTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextPreparedSelectionTest.kt
new file mode 100644
index 0000000..18eb7ed
--- /dev/null
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextPreparedSelectionTest.kt
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.text
+
+import androidx.compose.foundation.text.selection.BaseTextPreparedSelection
+import androidx.compose.foundation.text.selection.TextFieldPreparedSelection
+import androidx.compose.foundation.text.selection.TextPreparedSelection
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.test.R
+import androidx.compose.ui.text.font.toFontFamily
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import com.google.common.truth.Truth
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class TextPreparedSelectionTest {
+    @get:Rule
+    val rule = createComposeRule()
+
+    @Test
+    fun textSelection_leftRightMovements() {
+        selectionTest("abc") {
+            it.moveCursorRight()
+            expectedSelection(cursorAt('b'))
+            it.moveCursorRight()
+            expectedSelection(cursorAt('c'))
+            it.moveCursorRight()
+            expectedSelection(cursorAfter('c'))
+            it.moveCursorRight()
+            expectedSelection(cursorAfter('c'))
+            it.moveCursorLeft()
+            expectedSelection(cursorAt('c'))
+        }
+    }
+
+    @Test
+    fun textSelection_byWordMovements() {
+        selectionTest("abc def\n\ngi") {
+            it.moveCursorRightByWord()
+            expectedSelection(cursorAfter('c'))
+            it.moveCursorRightByWord()
+            expectedSelection(cursorAfter('f'))
+            it.moveCursorLeftByWord()
+            expectedSelection(cursorAt('d'))
+            it.moveCursorRightByWord()
+            expectedSelection(cursorAfter('f'))
+            it.moveCursorRightByWord()
+            expectedSelection(cursorAfter('i'))
+        }
+    }
+
+    @Test
+    fun textSelection_lineMovements() {
+        selectionTest("ab\ncde\n\ngi", initSelection = TextRange(1)) {
+            it.moveCursorDownByLine()
+            expectedSelection(cursorAt('d'))
+            it.moveCursorDownByLine()
+            // at empty line
+            expectedSelection(TextRange(7))
+            it.moveCursorDownByLine()
+            // cursor should be at "cached" x-position
+            expectedSelection(cursorAt('i'))
+            it.moveCursorDownByLine()
+            expectedSelection(cursorAfter('i'))
+            it.moveCursorUpByLine()
+            it.moveCursorUpByLine()
+            // and again, it should be recovered at "cached" x-position
+            expectedSelection(cursorAt('d'))
+            it.moveCursorLeft()
+            it.moveCursorUpByLine()
+            // after horizontal move, "cached" x-position should be reset
+            expectedSelection(cursorAt('a'))
+        }
+    }
+
+    private inner class SelectionScope<T : BaseTextPreparedSelection<T>>(
+        val prepared: BaseTextPreparedSelection<T>
+    ) {
+        fun expectedText(text: String) {
+            rule.runOnIdle {
+                Truth.assertThat(prepared.text).isEqualTo(text)
+            }
+        }
+
+        fun expectedSelection(selection: TextRange) {
+            rule.runOnIdle {
+                Truth.assertThat(prepared.selection).isEqualTo(selection)
+            }
+        }
+
+        fun cursorAt(char: Char) =
+            TextRange(prepared.text.indexOf(char))
+
+        fun cursorAfter(char: Char) =
+            TextRange(prepared.text.indexOf(char) + 1)
+    }
+
+    private fun selectionTest(
+        initText: String = "",
+        initSelection: TextRange = TextRange(0),
+        test: SelectionScope<TextPreparedSelection>.(TextPreparedSelection) -> Unit
+    ) {
+        var textLayout: TextLayoutResult? = null
+        rule.setContent {
+            BasicText(
+                text = initText,
+                style = TextStyle(
+                    fontFamily = Font(
+                        R.font.sample_font,
+                        FontWeight.Normal,
+                        FontStyle.Normal
+                    ).toFontFamily()
+                ),
+                onTextLayout = { textLayout = it }
+            )
+        }
+
+        val prepared = TextPreparedSelection(
+            originalText = AnnotatedString(initText),
+            originalSelection = initSelection,
+            layoutResult = textLayout!!
+        )
+
+        test(SelectionScope(prepared), prepared)
+    }
+
+    private fun textFieldSelectionTest(
+        initText: String = "",
+        initSelection: TextRange = TextRange(0),
+        test: SelectionScope<TextFieldPreparedSelection>.(TextFieldPreparedSelection) -> Unit
+    ) {
+        var textLayout: TextLayoutResult? = null
+        rule.setContent {
+            BasicText(
+                text = initText,
+                style = TextStyle(
+                    fontFamily = Font(
+                        R.font.sample_font,
+                        FontWeight.Normal,
+                        FontStyle.Normal
+                    ).toFontFamily()
+                ),
+                onTextLayout = { textLayout = it }
+            )
+        }
+
+        val prepared = TextFieldPreparedSelection(
+            currentValue = TextFieldValue(initText, initSelection),
+            layoutResultProxy = TextLayoutResultProxy(textLayout!!)
+        )
+
+        test(SelectionScope(prepared), prepared)
+    }
+}

compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/textfield/HardwareKeyboardTest.kt

diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/textfield/HardwareKeyboardTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/textfield/HardwareKeyboardTest.kt
index db16b94..a55c0cf 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/textfield/HardwareKeyboardTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/textfield/HardwareKeyboardTest.kt
@@ -21,6 +21,7 @@
 import android.view.KeyEvent.META_SHIFT_ON
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.MutableState
@@ -36,8 +37,16 @@
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.performKeyPress
 import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.test.R
+import androidx.compose.ui.text.font.toFontFamily
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.TextInputService
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import com.google.common.truth.Truth
@@ -89,6 +98,17 @@
     }
 
     @Test
+    fun textField_linesNavigation_cache() {
+        keysSequenceTest(initText = "hello\n\nworld") {
+            Key.DirectionRight.downAndUp()
+            Key.DirectionDown.downAndUp()
+            Key.DirectionDown.downAndUp()
+            Key.Zero.downAndUp()
+            expectedText("hello\n\nw0orld")
+        }
+    }
+
+    @Test
     fun textField_newLine() {
         keysSequenceTest(initText = "hello") {
             Key.Enter.downAndUp()
@@ -228,6 +248,17 @@
         }
     }
 
+    @Test
+    fun textField_pageNavigation() {
+        keysSequenceTest(
+            initText = "1\n2\n3\n4\n5",
+            modifier = Modifier.requiredSize(30.dp)
+        ) {
+            Key.PageDown.downAndUp()
+            expectedSelection(TextRange(4))
+        }
+    }
+
     private inner class SequenceScope(
         val state: MutableState<TextFieldValue>,
         val nodeGetter: () -> SemanticsNodeInteraction
@@ -260,6 +291,7 @@
 
     private fun keysSequenceTest(
         initText: String = "",
+        modifier: Modifier = Modifier.fillMaxSize(),
         sequence: SequenceScope.() -> Unit
     ) {
         val inputService = TextInputService(mock())
@@ -272,7 +304,15 @@
             ) {
                 BasicTextField(
                     value = state.value,
-                    modifier = Modifier.fillMaxSize().focusRequester(focusFequester),
+                    textStyle = TextStyle(
+                        fontFamily = Font(
+                            R.font.sample_font,
+                            FontWeight.Normal,
+                            FontStyle.Normal
+                        ).toFontFamily(),
+                        fontSize = 10.sp
+                    ),
+                    modifier = modifier.focusRequester(focusFequester),
                     onValueChange = {
                         state.value = it
                     }

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt
index 95c6335..04c9bddb 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt
@@ -16,19 +16,20 @@
 
 package androidx.compose.foundation
 
+import androidx.compose.foundation.gestures.PressGestureScope
+import androidx.compose.foundation.gestures.detectTapAndPress
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.PressInteraction
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
-import androidx.compose.foundation.legacygestures.pressIndicatorGestureFilter
-import androidx.compose.foundation.legacygestures.tapGestureFilter
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.debugInspectorInfo
 import androidx.compose.ui.semantics.Role
@@ -37,7 +38,6 @@
 import androidx.compose.ui.semantics.onLongClick
 import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
-import kotlinx.coroutines.launch
 
 /**
  * Configure component to receive clicks via input or accessibility "click" event.
@@ -109,7 +109,6 @@
  * to describe the element or do customizations
  * @param onClick will be called when user clicks on the element
  */
-@Suppress("DEPRECATION")
 fun Modifier.clickable(
     interactionSource: MutableInteractionSource,
     indication: Indication?,
@@ -119,59 +118,24 @@
     onClick: () -> Unit
 ) = composed(
     factory = {
-        val scope = rememberCoroutineScope()
+        val onClickState = rememberUpdatedState(onClick)
         val pressedInteraction = remember { mutableStateOf<PressInteraction.Press?>(null) }
-        val interactionUpdate =
-            if (enabled) {
-                Modifier.pressIndicatorGestureFilter(
-                    onStart = {
-                        scope.launch {
-                            // Remove any old interactions if we didn't fire stop / cancel properly
-                            pressedInteraction.value?.let { oldValue ->
-                                val interaction = PressInteraction.Cancel(oldValue)
-                                interactionSource.emit(interaction)
-                                pressedInteraction.value = null
-                            }
-                            val interaction = PressInteraction.Press(it)
-                            interactionSource.emit(interaction)
-                            pressedInteraction.value = interaction
-                        }
+        val gesture = if (enabled) {
+            PressedInteractionSourceDisposableEffect(interactionSource, pressedInteraction)
+            Modifier.pointerInput(interactionSource) {
+                detectTapAndPress(
+                    onPress = { offset ->
+                        handlePressInteraction(offset, interactionSource, pressedInteraction)
                     },
-                    onStop = {
-                        scope.launch {
-                            pressedInteraction.value?.let {
-                                val interaction = PressInteraction.Release(it)
-                                interactionSource.emit(interaction)
-                                pressedInteraction.value = null
-                            }
-                        }
-                    },
-                    onCancel = {
-                        scope.launch {
-                            pressedInteraction.value?.let {
-                                val interaction = PressInteraction.Cancel(it)
-                                interactionSource.emit(interaction)
-                                pressedInteraction.value = null
-                            }
-                        }
-                    }
+                    onTap = { onClickState.value.invoke() }
                 )
-            } else {
-                Modifier
             }
-        val tap = if (enabled) tapGestureFilter(onTap = { onClick() }) else Modifier
-        DisposableEffect(interactionSource) {
-            onDispose {
-                pressedInteraction.value?.let { oldValue ->
-                    val interaction = PressInteraction.Cancel(oldValue)
-                    interactionSource.tryEmit(interaction)
-                    pressedInteraction.value = null
-                }
-            }
+        } else {
+            Modifier
         }
         Modifier
             .genericClickableWithoutGesture(
-                gestureModifiers = Modifier.then(interactionUpdate).then(tap),
+                gestureModifiers = gesture,
                 interactionSource = interactionSource,
                 indication = indication,
                 enabled = enabled,
@@ -292,12 +256,11 @@
     onClick: () -> Unit
 ) = composed(
     factory = {
-        val scope = rememberCoroutineScope()
         val onClickState = rememberUpdatedState(onClick)
-        val interactionSourceState = rememberUpdatedState(interactionSource)
         val pressedInteraction = remember { mutableStateOf<PressInteraction.Press?>(null) }
         val gesture = if (enabled) {
-            Modifier.pointerInput(onDoubleClick, onLongClick) {
+            PressedInteractionSourceDisposableEffect(interactionSource, pressedInteraction)
+            Modifier.pointerInput(onDoubleClick, onLongClick, interactionSource) {
                 detectTapGestures(
                     onDoubleTap = if (onDoubleClick != null) {
                         { onDoubleClick() }
@@ -309,26 +272,8 @@
                     } else {
                         null
                     },
-                    onPress = {
-                        scope.launch {
-                            // Remove any old interactions if we didn't fire stop / cancel properly
-                            pressedInteraction.value?.let { oldValue ->
-                                val interaction = PressInteraction.Cancel(oldValue)
-                                interactionSourceState.value.emit(interaction)
-                                pressedInteraction.value = null
-                            }
-                            val interaction = PressInteraction.Press(it)
-                            interactionSourceState.value.emit(interaction)
-                            pressedInteraction.value = interaction
-                        }
-                        tryAwaitRelease()
-                        scope.launch {
-                            pressedInteraction.value?.let { oldValue ->
-                                val interaction = PressInteraction.Release(oldValue)
-                                interactionSourceState.value.emit(interaction)
-                                pressedInteraction.value = null
-                            }
-                        }
+                    onPress = { offset ->
+                        handlePressInteraction(offset, interactionSource, pressedInteraction)
                     },
                     onTap = { onClickState.value.invoke() }
                 )
@@ -336,17 +281,6 @@
         } else {
             Modifier
         }
-        DisposableEffect(interactionSource) {
-            onDispose {
-                scope.launch {
-                    pressedInteraction.value?.let { oldValue ->
-                        val interaction = PressInteraction.Cancel(oldValue)
-                        interactionSourceState.value.emit(interaction)
-                        pressedInteraction.value = null
-                    }
-                }
-            }
-        }
         Modifier
             .genericClickableWithoutGesture(
                 gestureModifiers = gesture,
@@ -375,6 +309,41 @@
 )
 
 @Composable
+internal fun PressedInteractionSourceDisposableEffect(
+    interactionSource: MutableInteractionSource,
+    pressedInteraction: MutableState<PressInteraction.Press?>
+) {
+    DisposableEffect(interactionSource) {
+        onDispose {
+            pressedInteraction.value?.let { oldValue ->
+                val interaction = PressInteraction.Cancel(oldValue)
+                interactionSource.tryEmit(interaction)
+                pressedInteraction.value = null
+            }
+        }
+    }
+}
+
+internal suspend fun PressGestureScope.handlePressInteraction(
+    pressPoint: Offset,
+    interactionSource: MutableInteractionSource,
+    pressedInteraction: MutableState<PressInteraction.Press?>
+) {
+    val pressInteraction = PressInteraction.Press(pressPoint)
+    interactionSource.emit(pressInteraction)
+    pressedInteraction.value = pressInteraction
+    val success = tryAwaitRelease()
+    val endInteraction =
+        if (success) {
+            PressInteraction.Release(pressInteraction)
+        } else {
+            PressInteraction.Cancel(pressInteraction)
+        }
+    interactionSource.emit(endInteraction)
+    pressedInteraction.value = null
+}
+
+@Composable
 @Suppress("ComposableModifierFactory")
 internal fun Modifier.genericClickableWithoutGesture(
     gestureModifiers: Modifier,

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/ForEachGesture.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/ForEachGesture.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/ForEachGesture.kt
index d05b451c..c2e33b6d6 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/ForEachGesture.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/ForEachGesture.kt
@@ -19,15 +19,14 @@
 import androidx.compose.ui.input.pointer.PointerEventPass
 import androidx.compose.ui.input.pointer.PointerInputScope
 import androidx.compose.ui.util.fastAny
-import kotlinx.coroutines.InternalCoroutinesApi
-import kotlinx.coroutines.NonCancellable.isActive
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.isActive
 import kotlin.coroutines.cancellation.CancellationException
 
 /**
  * A gesture was canceled and cannot continue, likely because another gesture has taken
  * over the pointer input stream.
  */
-@OptIn(ExperimentalStdlibApi::class)
 class GestureCancellationException(message: String? = null) : CancellationException(message)
 
 /**
@@ -35,9 +34,9 @@
  * it will wait until all pointers are raised before another gesture is detected, or it
  * exits if [isActive] is `false`.
  */
-@OptIn(InternalCoroutinesApi::class, ExperimentalStdlibApi::class)
 suspend fun PointerInputScope.forEachGesture(block: suspend PointerInputScope.() -> Unit) {
-    while (isActive) {
+    val currentContext = currentCoroutineContext()
+    while (currentContext.isActive) {
         try {
             block()
 
@@ -45,7 +44,7 @@
             awaitAllPointersUp()
         } catch (e: CancellationException) {
             // The gesture was canceled. Wait for all fingers to be "up" before looping again.
-            if (isActive) {
+            if (currentContext.isActive) {
                 awaitAllPointersUp()
                 throw e
             }

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/TapGestureDetector.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/TapGestureDetector.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/TapGestureDetector.kt
index 6235252..7739b9b 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/TapGestureDetector.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/TapGestureDetector.kt
@@ -16,26 +16,38 @@
 
 package androidx.compose.foundation.gestures
 
+import androidx.compose.foundation.gestures.TapGestureEvent.AllUp
+import androidx.compose.foundation.gestures.TapGestureEvent.Cancel
+import androidx.compose.foundation.gestures.TapGestureEvent.Down
+import androidx.compose.foundation.gestures.TapGestureEvent.Up
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.pointer.AwaitPointerEventScope
 import androidx.compose.ui.input.pointer.PointerEvent
 import androidx.compose.ui.input.pointer.PointerEventPass
 import androidx.compose.ui.input.pointer.PointerInputChange
 import androidx.compose.ui.input.pointer.PointerInputScope
-import androidx.compose.ui.input.pointer.positionChangeConsumed
 import androidx.compose.ui.input.pointer.changedToDown
 import androidx.compose.ui.input.pointer.changedToDownIgnoreConsumed
 import androidx.compose.ui.input.pointer.changedToUp
 import androidx.compose.ui.input.pointer.consumeAllChanges
 import androidx.compose.ui.input.pointer.consumeDownChange
 import androidx.compose.ui.input.pointer.isOutOfBounds
+import androidx.compose.ui.input.pointer.positionChangeConsumed
 import androidx.compose.ui.platform.ViewConfiguration
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.util.fastAll
 import androidx.compose.ui.util.fastAny
 import androidx.compose.ui.util.fastForEach
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.ReceiveChannel
+import kotlinx.coroutines.channels.SendChannel
 import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.withTimeout
@@ -87,59 +99,57 @@
     onLongPress: ((Offset) -> Unit)? = null,
     onPress: suspend PressGestureScope.(Offset) -> Unit = NoPressGesture,
     onTap: ((Offset) -> Unit)? = null
-) {
-    val pressScope = PressGestureScopeImpl(this)
-    forEachGesture {
-        coroutineScope {
+) = coroutineScope {
+    // special signal to indicate to the sending side that it needs to consume(!) all the events
+    // until all the pointers will be up
+    val consumeAllUntilUpSignal = mutableStateOf(false)
+    // special signal to indicate to the sending side that it shouldn't intercept and consume
+    // cancel/up events as we're only require down events
+    val consumeOnlyDownsSignal = mutableStateOf(false)
+    val channel = Channel<TapGestureEvent>(capacity = Channel.UNLIMITED)
+    val pressScope = PressGestureScopeImpl(this@detectTapGestures)
+
+    launch {
+        while (isActive) {
             pressScope.reset()
-            val down = awaitPointerEventScope {
-                awaitFirstDown().also {
-                    it.consumeDownChange()
-                }
-            }
-            if (onPress !== NoPressGesture) {
-                launch { pressScope.onPress(down.position) }
-            }
-
-            val longPressTimeout =
-                if (onLongPress == null) {
-                    Int.MAX_VALUE.toLong()
-                } else {
-                    viewConfiguration.longPressTimeoutMillis
-                }
-
-            var up: PointerInputChange? = null
+            consumeAllUntilUpSignal.value = false
+            val down = awaitChannelDown(consumeOnlyDownsSignal, channel)
+            if (onPress !== NoPressGesture) launch { pressScope.onPress(down.position) }
+            val longPressTimeout = onLongPress?.let { viewConfiguration.longPressTimeoutMillis }
+            var upOrCancel: TapGestureEvent? = null
             try {
                 // wait for first tap up or long press
-                up = withTimeout(longPressTimeout) {
-                    awaitPointerEventScope {
-                        waitForUpOrCancellation()?.also { it.consumeDownChange() }
-                    }
+                upOrCancel = withNullableTimeout(this, longPressTimeout) {
+                    awaitChannelUpOrCancel(channel)
                 }
-                if (up == null) {
+                if (upOrCancel is Cancel) {
                     pressScope.cancel() // tap-up was canceled
                 } else {
                     pressScope.release()
                 }
             } catch (_: TimeoutCancellationException) {
                 onLongPress?.invoke(down.position)
-                consumeAllEventsUntilUp()
+                awaitChannelAllUp(consumeAllUntilUpSignal, channel)
                 pressScope.release()
             }
 
-            if (up != null) {
+            if (upOrCancel != null && upOrCancel is Up) {
                 // tap was successful.
                 if (onDoubleTap == null) {
-                    onTap?.invoke(up.position) // no need to check for double-tap.
+                    onTap?.invoke(upOrCancel.position) // no need to check for double-tap.
                 } else {
                     // check for second tap
-                    val secondDown = detectSecondTapDown(up.uptimeMillis)
+                    val secondDown = awaitChannelSecondDown(
+                        channel,
+                        consumeOnlyDownsSignal,
+                        viewConfiguration,
+                        upOrCancel
+                    )
 
                     if (secondDown == null) {
-                        onTap?.invoke(up.position) // no valid second tap started
+                        onTap?.invoke(upOrCancel.position) // no valid second tap started
                     } else {
                         // Second tap down detected
-                        secondDown.consumeDownChange()
                         pressScope.reset()
                         if (onPress !== NoPressGesture) {
                             launch { pressScope.onPress(secondDown.position) }
@@ -147,27 +157,24 @@
 
                         try {
                             // Might have a long second press as the second tap
-                            withTimeout(longPressTimeout) {
-                                awaitPointerEventScope {
-                                    val secondUp = waitForUpOrCancellation()
-                                    if (secondUp == null) {
-                                        pressScope.cancel()
-                                        onTap?.invoke(up.position)
-                                    } else {
-                                        secondUp.consumeDownChange()
-                                        pressScope.release()
-                                        onDoubleTap(secondUp.position)
-                                    }
+                            withNullableTimeout(this, longPressTimeout) {
+                                val secondUp = awaitChannelUpOrCancel(channel)
+                                if (secondUp is Up) {
+                                    pressScope.release()
+                                    onDoubleTap(secondUp.position)
+                                } else {
+                                    pressScope.cancel()
+                                    onTap?.invoke(upOrCancel.position)
                                 }
                             }
                         } catch (e: TimeoutCancellationException) {
                             // The first tap was valid, but the second tap is a long press.
                             // notify for the first tap
-                            onTap?.invoke(up.position)
+                            onTap?.invoke(upOrCancel.position)
 
                             // notify for the long press
                             onLongPress?.invoke(secondDown.position)
-                            consumeAllEventsUntilUp()
+                            awaitChannelAllUp(consumeAllUntilUpSignal, channel)
                             pressScope.release()
                         }
                     }
@@ -175,6 +182,202 @@
             }
         }
     }
+    forEachGesture {
+        awaitPointerEventScope {
+            translatePointerEventsToChannel(
+                this@coroutineScope,
+                channel,
+                consumeOnlyDownsSignal,
+                consumeAllUntilUpSignal
+            )
+        }
+    }
+}
+
+private suspend fun <T> withNullableTimeout(
+    scope: CoroutineScope,
+    timeout: Long?,
+    block: suspend CoroutineScope.() -> T
+): T {
+    return if (timeout != null) {
+        withTimeout(timeout, block)
+    } else {
+        with(scope) {
+            block()
+        }
+    }
+}
+
+/**
+ * Await down from the channel and return it when it happens
+ */
+private suspend fun awaitChannelDown(
+    onlyDownsSignal: MutableState<Boolean>,
+    channel: ReceiveChannel<TapGestureEvent>
+): Down {
+    onlyDownsSignal.value = true
+    var event = channel.receive()
+    while (event !is Down) {
+        event = channel.receive()
+    }
+    onlyDownsSignal.value = false
+    return event
+}
+
+/**
+ * Reads input for second tap down event from the [channel]. If the second tap is within
+ * [ViewConfiguration.doubleTapMinTimeMillis] of [firstUp] uptime, the event is discarded. If the
+ * second down is not detected within [ViewConfiguration.doubleTapTimeoutMillis] of [firstUp],
+ * `null` is returned. Otherwise, the down event is returned.
+ */
+private suspend fun awaitChannelSecondDown(
+    channel: ReceiveChannel<TapGestureEvent>,
+    onlyDownsSignal: MutableState<Boolean>,
+    viewConfiguration: ViewConfiguration,
+    firstUp: Up
+): Down? {
+    return withTimeoutOrNull(viewConfiguration.doubleTapTimeoutMillis) {
+        val minUptime = firstUp.uptimeMillis + viewConfiguration.doubleTapMinTimeMillis
+        var change: Down
+        // The second tap doesn't count if it happens before DoubleTapMinTime of the first tap
+        do {
+            change = awaitChannelDown(onlyDownsSignal, channel)
+        } while (change.uptimeMillis < minUptime)
+        change
+    }
+}
+
+/**
+ * Special case to wait for all ups after long press has been fired. This sets a state value to
+ * true, indicating to the channel producer to consume all events until it will send an [AllUp]
+ * event. When all up happens and producer itself flips the value back to false, this method
+ * returns.
+ */
+private suspend fun awaitChannelAllUp(
+    consumeAllSignal: MutableState<Boolean>,
+    channel: ReceiveChannel<TapGestureEvent>
+) {
+    consumeAllSignal.value = true
+    var event = channel.receive()
+    while (event != AllUp) {
+        event = channel.receive()
+    }
+}
+
+/**
+ * Await up or cancel event from the channel and return either [Up] or [Cancel]
+ */
+private suspend fun awaitChannelUpOrCancel(
+    channel: ReceiveChannel<TapGestureEvent>
+): TapGestureEvent {
+    var event = channel.receive()
+    while (event !is Up && event !is Cancel) {
+        event = channel.receive()
+    }
+    return event
+}
+
+private sealed class TapGestureEvent {
+    class Down(val position: Offset, val uptimeMillis: Long) : TapGestureEvent()
+    class Up(val position: Offset, val uptimeMillis: Long) : TapGestureEvent()
+
+    // special case, the notification sent when we were consuming all previous events before all
+    // the pointers are up. AllUp means that we can restart the cycle after long press fired
+    object AllUp : TapGestureEvent()
+    object Cancel : TapGestureEvent()
+}
+
+/**
+ * Method to await domain specific [TapGestureEvent] from the [AwaitPointerEventScope] and send
+ * them to the specified [channel].
+ *
+ * Note: [consumeAllUntilUp] is a switch for a special case which happens when the long press has
+ * been fired, after which we want to block all the events until all fingers are up. This methods
+ * stars to consume all the events when [consumeAllUntilUp] is `true` and when all pointers are
+ * up it flips the [consumeAllUntilUp] itself, so it can suspend on the [AwaitPointerEventScope
+ * .awaitPointerEvent] again.
+ */
+private suspend fun AwaitPointerEventScope.translatePointerEventsToChannel(
+    scope: CoroutineScope,
+    channel: SendChannel<TapGestureEvent>,
+    detectDownsOnly: State<Boolean>,
+    consumeAllUntilUp: MutableState<Boolean>
+) {
+    while (scope.isActive) {
+        // operate normally, scan all downs / ups / cancels and push them to the channel
+        val event = awaitPointerEvent()
+        if (consumeAllUntilUp.value) {
+            event.changes.fastForEach { it.consumeAllChanges() }
+            // check the signal if we just need to consume everything on the initial pass for
+            // cases when the long press has fired and we block everything before all pointers
+            // are up
+            if (!allPointersUp()) {
+                do {
+                    val initialEvent = awaitPointerEvent(PointerEventPass.Initial)
+                    initialEvent.changes.fastForEach { it.consumeAllChanges() }
+                } while (initialEvent.changes.fastAny { it.pressed })
+                // wait for the main pass of the initial event we already have eaten above
+                awaitPointerEvent()
+            }
+            channel.offer(AllUp)
+            consumeAllUntilUp.value = false
+        } else if (event.changes.fastAll { it.changedToDown() }) {
+            val change = event.changes[0]
+            change.consumeDownChange()
+            channel.offer(Down(change.position, change.uptimeMillis))
+        } else if (!detectDownsOnly.value) {
+            if (event.changes.fastAll { it.changedToUp() }) {
+                // All pointers are up
+                val change = event.changes[0]
+                change.consumeDownChange()
+                channel.offer(Up(change.position, change.uptimeMillis))
+            } else if (
+                event.changes.fastAny { it.consumed.downChange || it.isOutOfBounds(size) }
+            ) {
+                channel.offer(Cancel)
+            } else {
+                // Check for cancel by position consumption. We can look on the Final pass of the
+                // existing pointer event because it comes after the Main pass we checked above.
+                val consumeCheck = awaitPointerEvent(PointerEventPass.Final)
+                if (consumeCheck.changes.fastAny { it.positionChangeConsumed() }) {
+                    channel.offer(Cancel)
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Shortcut for cases when we only need to get press/click logic, as for cases without long press
+ * and double click we don't require channelling or any other complications.
+ */
+internal suspend fun PointerInputScope.detectTapAndPress(
+    onPress: suspend PressGestureScope.(Offset) -> Unit = NoPressGesture,
+    onTap: ((Offset) -> Unit)? = null
+) {
+    val pressScope = PressGestureScopeImpl(this)
+    forEachGesture {
+        coroutineScope {
+            pressScope.reset()
+            awaitPointerEventScope {
+
+                val down = awaitFirstDown().also { it.consumeDownChange() }
+
+                if (onPress !== NoPressGesture) {
+                    launch { pressScope.onPress(down.position) }
+                }
+
+                val up = waitForUpOrCancellation()
+                if (up == null) {
+                    pressScope.cancel() // tap-up was canceled
+                } else {
+                    up.consumeDownChange()
+                    pressScope.release()
+                    onTap?.invoke(up.position)
+                }
+            }
+        }
+    }
 }
 
 /**
@@ -224,42 +427,6 @@
 }
 
 /**
- * Consumes all event changes in the [PointerEventPass.Initial] until all pointers are up.
- */
-private suspend fun PointerInputScope.consumeAllEventsUntilUp() {
-    awaitPointerEventScope {
-        if (!allPointersUp()) {
-            do {
-                val event = awaitPointerEvent(PointerEventPass.Initial)
-                event.changes.fastForEach { it.consumeAllChanges() }
-            } while (event.changes.fastAny { it.pressed })
-        }
-    }
-}
-
-/**
- * Reads input for second tap down event. If the second tap is within
- * [ViewConfiguration.doubleTapMinTimeMillis] of [upTime], the event is discarded. If the second
- * down is not detected within [ViewConfiguration.doubleTapTimeoutMillis] of [upTime], `null` is
- * returned. Otherwise, the down event is returned.
- */
-private suspend fun PointerInputScope.detectSecondTapDown(
-    upTime: Long
-): PointerInputChange? {
-    return withTimeoutOrNull(viewConfiguration.doubleTapTimeoutMillis) {
-        awaitPointerEventScope {
-            val minUptime = upTime + viewConfiguration.doubleTapMinTimeMillis
-            var change: PointerInputChange
-            // The second tap doesn't count if it happens before DoubleTapMinTime of the first tap
-            do {
-                change = awaitFirstDown()
-            } while (change.uptimeMillis < minUptime)
-            change
-        }
-    }
-}
-
-/**
  * [detectTapGestures]'s implementation of [PressGestureScope].
  */
 private class PressGestureScopeImpl(

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/legacygestures/PressIndicatorGestureFilter.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/legacygestures/PressIndicatorGestureFilter.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/legacygestures/PressIndicatorGestureFilter.kt
deleted file mode 100644
index ccf2dbf..0000000
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/legacygestures/PressIndicatorGestureFilter.kt
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.foundation.legacygestures
-
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.pointer.PointerEvent
-import androidx.compose.ui.input.pointer.PointerEventPass
-import androidx.compose.ui.input.pointer.PointerInputChange
-import androidx.compose.ui.input.pointer.PointerInputFilter
-import androidx.compose.ui.input.pointer.PointerInputModifier
-import androidx.compose.ui.input.pointer.positionChangeConsumed
-import androidx.compose.ui.input.pointer.changedToDown
-import androidx.compose.ui.input.pointer.changedToUpIgnoreConsumed
-import androidx.compose.ui.input.pointer.consumeDownChange
-import androidx.compose.ui.platform.debugInspectorInfo
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.util.fastAll
-import androidx.compose.ui.util.fastAny
-import androidx.compose.ui.util.fastForEach
-
-/**
- * This gesture detector has callbacks for when a press gesture starts and ends for the purposes of
- * displaying visual feedback for those two states.
- *
- * More specifically:
- * - It will call [onStart] if the first pointer down it receives during the
- * [PointerEventPass.Main] pass is not consumed.
- * - It will call [onStop] if [onStart] has been called and the last [PointerInputChange] it
- * receives during the [PointerEventPass.Main] pass has an up change, consumed or not, indicating
- * the press gesture indication should end.
- * - It will call [onCancel] if movement has been consumed by the time of the
- * [PointerEventPass.Final] pass, indicating that the press gesture indication should end because
- * something moved.
- *
- * This gesture detector always consumes the down change during the [PointerEventPass.Main] pass.
- */
-// TODO(b/139020678): Probably has shared functionality with other press based detectors.
-@Deprecated(
-    "Gesture filters are deprecated. Use Modifier.clickable or Modifier.pointerInput and " +
-        "detectTapGestures instead",
-    replaceWith = ReplaceWith(
-        """
-            pointerInput {
-                detectTapGestures(onPress = {
-                    onStart?.invoke(it)
-                    val success = tryAwaitRelease()
-                    if (success) {
-                       onStop?.invoke()
-                    } else {
-                       onCancel?.invoke()
-                    }
-                })
-            }""",
-        "androidx.compose.ui.input.pointer.pointerInput",
-        "androidx.compose.foundation.gestures.detectTapGestures"
-    )
-)
-internal fun Modifier.pressIndicatorGestureFilter(
-    onStart: ((Offset) -> Unit)? = null,
-    onStop: (() -> Unit)? = null,
-    onCancel: (() -> Unit)? = null,
-    enabled: Boolean = true
-): Modifier = composed(
-    inspectorInfo = debugInspectorInfo {
-        name = "pressIndicatorGestureFilter"
-        properties["onStart"] = onStart
-        properties["onStop"] = onStop
-        properties["onCancel"] = onCancel
-        properties["enabled"] = enabled
-    }
-) {
-    val filter = remember { PressIndicatorGestureFilter() }
-    filter.onStart = onStart
-    filter.onStop = onStop
-    filter.onCancel = onCancel
-    filter.setEnabled(enabled)
-    PressPointerInputModifierImpl(filter)
-}
-
-internal class PressIndicatorGestureFilter : PointerInputFilter() {
-    /**
-     * Called if the first pointer's down change was not consumed by the time this gesture
-     * filter receives it in the [PointerEventPass.Main] pass.
-     *
-     * This callback should be used to indicate that the press state should be shown.  An [Offset]
-     * is provided to indicate where the first pointer made contact with this gesrure detector.
-     */
-    var onStart: ((Offset) -> Unit)? = null
-
-    /**
-     * Called if onStart was attempted to be called (it may have been null), no pointer movement
-     * was consumed, and the last pointer went up (consumed or not).
-     *
-     * This should be used for removing visual feedback that indicates that the press has ended with
-     * a completed press released gesture.
-     */
-    var onStop: (() -> Unit)? = null
-
-    /**
-     * Called if onStart was attempted to be called (it may have been null), and either:
-     * 1. Pointer movement was consumed by the time [PointerEventPass.Final] reaches this
-     * gesture filter.
-     * 2. [setEnabled] is called with false.
-     * 3. This [PointerInputFilter] is removed from the hierarchy, or it has no descendants
-     * to define it's position or size.
-     * 4. The Compose root is notified that it will no longer receive input, and thus onStop
-     * will never be reached (For example, the Android View that hosts compose receives
-     * MotionEvent.ACTION_CANCEL).
-     *
-     * This should be used for removing visual feedback that indicates that the press gesture was
-     * cancelled.
-     */
-    var onCancel: (() -> Unit)? = null
-
-    private var state = State.Idle
-
-    /**
-     * Sets whether this [PointerInputFilter] is enabled.  True by default.
-     *
-     * When enabled, this [PointerInputFilter] will act normally.
-     *
-     * When disabled, this [PointerInputFilter] will not process any input.  No aspects
-     * of any [PointerInputChange]s will be consumed and no callbacks will be called.
-     *
-     * If the last callback that was attempted to be called was [onStart] ([onStart] may have
-     * been false) and [enabled] is false, [onCancel] will be called.
-     */
-    // TODO(shepshapard): Remove 'setEnabled'.  It serves no purpose anymore.
-    fun setEnabled(enabled: Boolean) {
-        if (state == State.Started) {
-            // If the state is Started and we were passed true, we don't want to change it to
-            // Enabled.
-            // If the state is Started and we were passed false, we can set to Disabled and
-            // call the cancel callback.
-            if (!enabled) {
-                state = State.Disabled
-                onCancel?.invoke()
-            }
-        } else {
-            // If the state is anything but Started, just set the state according to the value
-            // we were passed.
-            state =
-                if (enabled) {
-                    State.Idle
-                } else {
-                    State.Disabled
-                }
-        }
-    }
-
-    override fun onPointerEvent(
-        pointerEvent: PointerEvent,
-        pass: PointerEventPass,
-        bounds: IntSize
-    ) {
-        val changes = pointerEvent.changes
-
-        if (pass == PointerEventPass.Initial && state == State.Started) {
-            changes.fastForEach {
-                if (it.changedToDown()) {
-                    it.consumeDownChange()
-                }
-            }
-        }
-
-        if (pass == PointerEventPass.Main) {
-
-            if (state == State.Idle && changes.fastAll { it.changedToDown() }) {
-                // If we have not yet started and all of the changes changed to down, we are
-                // starting.
-                state = State.Started
-                onStart?.invoke(changes.first().position)
-            } else if (state == State.Started) {
-                if (changes.fastAll { it.changedToUpIgnoreConsumed() }) {
-                    // If we have started and all of the changes changed to up, we are stopping.
-                    state = State.Idle
-                    onStop?.invoke()
-                } else if (!changes.anyPointersInBounds(bounds)) {
-                    // If all of the down pointers are currently out of bounds, we should cancel
-                    // as this indicates that the user does not which to trigger a press based
-                    // event.
-                    state = State.Idle
-                    onCancel?.invoke()
-                }
-            }
-
-            if (state == State.Started) {
-                changes.fastForEach {
-                    it.consumeDownChange()
-                }
-            }
-        }
-
-        if (
-            pass == PointerEventPass.Final &&
-            state == State.Started &&
-            changes.fastAny { it.positionChangeConsumed() }
-        ) {
-            // On the final pass, if we have started and any of the changes had consumed
-            // position changes, we cancel.
-            state = State.Idle
-            onCancel?.invoke()
-        }
-    }
-
-    // TODO(shepshapard): This continues to be very confusing to use.  Have to come up with a better
-//  way of easily expressing this.
-    /**
-     * Utility method that determines if any pointers are currently in [bounds].
-     *
-     * A pointer is considered in bounds if it is currently down and it's current
-     * position is within the provided [bounds]
-     *
-     * @return True if at least one pointer is in bounds.
-     */
-    private fun List<PointerInputChange>.anyPointersInBounds(bounds: IntSize) =
-        fastAny {
-            it.pressed &&
-                it.position.x >= 0 &&
-                it.position.x < bounds.width &&
-                it.position.y >= 0 &&
-                it.position.y < bounds.height
-        }
-
-    override fun onCancel() {
-        if (state == State.Started) {
-            state = State.Idle
-            onCancel?.invoke()
-        }
-    }
-
-    private enum class State {
-        Disabled, Idle, Started
-    }
-}
-
-private data class PressPointerInputModifierImpl(
-    override val pointerInputFilter: PointerInputFilter
-) : PointerInputModifier

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/legacygestures/TapGestureFilter.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/legacygestures/TapGestureFilter.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/legacygestures/TapGestureFilter.kt
deleted file mode 100644
index 06e73d2..0000000
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/legacygestures/TapGestureFilter.kt
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.foundation.legacygestures
-
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.pointer.PointerEvent
-import androidx.compose.ui.input.pointer.PointerEventPass
-import androidx.compose.ui.input.pointer.PointerId
-import androidx.compose.ui.input.pointer.PointerInputChange
-import androidx.compose.ui.input.pointer.PointerInputFilter
-import androidx.compose.ui.input.pointer.PointerInputModifier
-import androidx.compose.ui.input.pointer.positionChangeConsumed
-import androidx.compose.ui.input.pointer.changedToDown
-import androidx.compose.ui.input.pointer.changedToUp
-import androidx.compose.ui.input.pointer.changedToUpIgnoreConsumed
-import androidx.compose.ui.input.pointer.consumeDownChange
-import androidx.compose.ui.platform.debugInspectorInfo
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.util.fastAll
-import androidx.compose.ui.util.fastAny
-import androidx.compose.ui.util.fastForEach
-
-/**
- * This gesture detector fires a callback when a traditional press is being released.  This is
- * generally the same thing as "onTap" or "onClick".
- *
- * [onTap] is called with the position of the last pointer to go "up".
- *
- * More specifically, it will call [onTap] if:
- * - All of the first [PointerInputChange]s it receives during the [PointerEventPass.Main] pass
- *   have unconsumed down changes, thus representing new set of pointers, none of which have had
- *   their down events consumed.
- * - The last [PointerInputChange] it receives during the [PointerEventPass.Main] pass has
- *   an unconsumed up change.
- * - While it has at least one pointer touching it, no [PointerInputChange] has had any
- *   movement consumed (as that would indicate that something in the heirarchy moved and this a
- *   press should be cancelled.
- *
- *   @param onTap Called when a tap has occurred.
- */
-// TODO(b/139020678): Probably has shared functionality with other press based detectors.
-@Deprecated(
-    "Gesture filters are deprecated. Use Modifier.clickable or Modifier.pointerInput and " +
-        "detectTapGestures instead",
-    replaceWith = ReplaceWith(
-        """pointerInput { detectTapGestures(onTap = onTap)}""",
-        "androidx.compose.ui.input.pointer.pointerInput",
-        "androidx.compose.foundation.gestures.detectTapGestures"
-    )
-)
-internal fun Modifier.tapGestureFilter(
-    onTap: (Offset) -> Unit
-): Modifier = composed(
-    inspectorInfo = debugInspectorInfo {
-        name = "tapGestureFilter"
-        this.properties["onTap"] = onTap
-    }
-) {
-    val filter = remember { TapGestureFilter() }
-    filter.onTap = onTap
-    TapPointerInputModifierImpl(filter)
-}
-
-internal class TapGestureFilter : PointerInputFilter() {
-    /**
-     * Called to indicate that a press gesture has successfully completed.
-     *
-     * This should be used to fire a state changing event as if a button was pressed.
-     */
-    lateinit var onTap: (Offset) -> Unit
-
-    /**
-     * Whether or not to consume changes.
-     */
-    var consumeChanges: Boolean = true
-
-    /**
-     * True when we are primed to call [onTap] and may be consuming all down changes.
-     */
-    private var primed = false
-
-    private var downPointers: MutableSet<PointerId> = mutableSetOf()
-    private var upBlockedPointers: MutableSet<PointerId> = mutableSetOf()
-    private var lastPxPosition: Offset? = null
-
-    override fun onPointerEvent(
-        pointerEvent: PointerEvent,
-        pass: PointerEventPass,
-        bounds: IntSize
-    ) {
-        val changes = pointerEvent.changes
-
-        if (pass == PointerEventPass.Main) {
-
-            if (primed &&
-                changes.fastAll { it.changedToUp() }
-            ) {
-                val pointerPxPosition: Offset = changes[0].previousPosition
-                if (changes.fastAny { !upBlockedPointers.contains(it.id) }) {
-                    // If we are primed, all pointers went up, and at least one of the pointers is
-                    // not blocked, we can fire, reset, and consume all of the up events.
-                    reset()
-                    onTap.invoke(pointerPxPosition)
-                    if (consumeChanges) {
-                        changes.fastForEach {
-                            it.consumeDownChange()
-                        }
-                    }
-                    return
-                } else {
-                    lastPxPosition = pointerPxPosition
-                }
-            }
-
-            if (changes.fastAll { it.changedToDown() }) {
-                // Reset in case we were incorrectly left waiting on a delayUp message.
-                reset()
-                // If all of the changes are down, can become primed.
-                primed = true
-            }
-
-            if (primed) {
-                changes.fastForEach {
-                    if (it.changedToDown()) {
-                        downPointers.add(it.id)
-                    }
-                    if (it.changedToUpIgnoreConsumed()) {
-                        downPointers.remove(it.id)
-                    }
-                }
-            }
-        }
-
-        if (pass == PointerEventPass.Final && primed) {
-
-            val anyPositionChangeConsumed = changes.fastAny { it.positionChangeConsumed() }
-
-            val noPointersInBounds =
-                upBlockedPointers.isEmpty() && !changes.anyPointersInBounds(bounds)
-
-            if (anyPositionChangeConsumed || noPointersInBounds) {
-                // If we are on the final pass, we are primed, and either we aren't blocked and
-                // all pointers are out of bounds.
-                reset()
-            }
-        }
-    }
-
-    // TODO(shepshapard): This continues to be very confusing to use.  Have to come up with a better
-//  way of easily expressing this.
-    /**
-     * Utility method that determines if any pointers are currently in [bounds].
-     *
-     * A pointer is considered in bounds if it is currently down and it's current
-     * position is within the provided [bounds]
-     *
-     * @return True if at least one pointer is in bounds.
-     */
-    private fun List<PointerInputChange>.anyPointersInBounds(bounds: IntSize) =
-        fastAny {
-            it.pressed &&
-                it.position.x >= 0 &&
-                it.position.x < bounds.width &&
-                it.position.y >= 0 &&
-                it.position.y < bounds.height
-        }
-
-    override fun onCancel() {
-        reset()
-    }
-
-    private fun reset() {
-        primed = false
-        upBlockedPointers.clear()
-        downPointers.clear()
-        lastPxPosition = null
-    }
-}
-
-private data class TapPointerInputModifierImpl(
-    override val pointerInputFilter: PointerInputFilter
-) : PointerInputModifier
\ No newline at end of file

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/selection/Toggleable.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/selection/Toggleable.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/selection/Toggleable.kt
index 9e500518..fb7ce95 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/selection/Toggleable.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/selection/Toggleable.kt
@@ -17,19 +17,20 @@
 package androidx.compose.foundation.selection
 
 import androidx.compose.foundation.Indication
-import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.PressedInteractionSourceDisposableEffect
 import androidx.compose.foundation.LocalIndication
-import androidx.compose.foundation.interaction.PressInteraction
 import androidx.compose.foundation.Strings
+import androidx.compose.foundation.gestures.detectTapAndPress
+import androidx.compose.foundation.handlePressInteraction
 import androidx.compose.foundation.indication
-import androidx.compose.runtime.DisposableEffect
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.PressInteraction
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
-import androidx.compose.foundation.legacygestures.pressIndicatorGestureFilter
-import androidx.compose.foundation.legacygestures.tapGestureFilter
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.debugInspectorInfo
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.disabled
@@ -42,7 +43,6 @@
 import androidx.compose.ui.state.ToggleableState.Indeterminate
 import androidx.compose.ui.state.ToggleableState.Off
 import androidx.compose.ui.state.ToggleableState.On
-import kotlinx.coroutines.launch
 
 /**
  * Configure component to make it toggleable via input and accessibility events
@@ -233,7 +233,7 @@
     }
 )
 
-@Suppress("ModifierInspectorInfo", "DEPRECATION")
+@Suppress("ModifierInspectorInfo")
 private fun Modifier.toggleableImpl(
     state: ToggleableState,
     enabled: Boolean,
@@ -242,7 +242,6 @@
     indication: Indication?,
     onClick: () -> Unit
 ): Modifier = composed {
-    val scope = rememberCoroutineScope()
     val pressedInteraction = remember { mutableStateOf<PressInteraction.Press?>(null) }
     // TODO(pavlis): Handle multiple states for Semantics
     val semantics = Modifier.semantics(mergeDescendants = true) {
@@ -261,58 +260,22 @@
             disabled()
         }
     }
-    val interactionUpdate =
-        if (enabled) {
-            Modifier.pressIndicatorGestureFilter(
-                onStart = {
-                    scope.launch {
-                        // Remove any old interactions if we didn't fire stop / cancel properly
-                        pressedInteraction.value?.let { oldValue ->
-                            val interaction = PressInteraction.Cancel(oldValue)
-                            interactionSource.emit(interaction)
-                            pressedInteraction.value = null
-                        }
-                        val interaction = PressInteraction.Press(it)
-                        interactionSource.emit(interaction)
-                        pressedInteraction.value = interaction
-                    }
+    val onClickState = rememberUpdatedState(onClick)
+    val gestures = if (enabled) {
+        PressedInteractionSourceDisposableEffect(interactionSource, pressedInteraction)
+        Modifier.pointerInput(interactionSource) {
+            detectTapAndPress(
+                onPress = { offset ->
+                    handlePressInteraction(offset, interactionSource, pressedInteraction)
                 },
-                onStop = {
-                    scope.launch {
-                        pressedInteraction.value?.let {
-                            val interaction = PressInteraction.Release(it)
-                            interactionSource.emit(interaction)
-                            pressedInteraction.value = null
-                        }
-                    }
-                },
-                onCancel = {
-                    scope.launch {
-                        pressedInteraction.value?.let {
-                            val interaction = PressInteraction.Cancel(it)
-                            interactionSource.emit(interaction)
-                            pressedInteraction.value = null
-                        }
-                    }
-                }
+                onTap = { onClickState.value.invoke() }
             )
-        } else {
-            Modifier
         }
-    val click = if (enabled) Modifier.tapGestureFilter { onClick() } else Modifier
-
-    DisposableEffect(interactionSource) {
-        onDispose {
-            pressedInteraction.value?.let { oldValue ->
-                val interaction = PressInteraction.Cancel(oldValue)
-                interactionSource.tryEmit(interaction)
-                pressedInteraction.value = null
-            }
-        }
+    } else {
+        Modifier
     }
     this
         .then(semantics)
         .indication(interactionSource, indication)
-        .then(interactionUpdate)
-        .then(click)
+        .then(gestures)
 }
\ No newline at end of file

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt
index bc38313..8a68d4f 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt
@@ -227,7 +227,7 @@
         if (selectionRegistrar.hasSelection(state.selectableId)) {
             val newGlobalPosition = it.positionInWindow()
             if (newGlobalPosition != state.previousGlobalPosition) {
-                selectionRegistrar?.notifyPositionChange()
+                selectionRegistrar?.notifyPositionChange(state.selectableId)
             }
             state.previousGlobalPosition = newGlobalPosition
         }
@@ -343,12 +343,13 @@
     val commit: DisposableEffectScope.() -> DisposableEffectResult = {
         // if no SelectionContainer is added as parent selectionRegistrar will be null
         selectionRegistrar?.let { selectionRegistrar ->
-            val selectable = MultiWidgetSelectionDelegate(
-                state.selectableId,
-                coordinatesCallback = { state.layoutCoordinates },
-                layoutResultCallback = { state.layoutResult }
+            state.selectable = selectionRegistrar.subscribe(
+                MultiWidgetSelectionDelegate(
+                    selectableId = state.selectableId,
+                    coordinatesCallback = { state.layoutCoordinates },
+                    layoutResultCallback = { state.layoutResult }
+                )
             )
-            selectionRegistrar.subscribe(selectable)
         }
         onDispose {
             state.selectable?.let { selectionRegistrar?.unsubscribe(it) }

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
index 58f75c4..e86679f 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:Suppress("DEPRECATION_ERROR")
 
 package androidx.compose.foundation.text
 
-import androidx.compose.foundation.interaction.Interaction
 import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.interaction.Interaction
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.text.selection.LocalTextSelectionColors
@@ -269,9 +268,11 @@
         if (!it.isFocused) manager.deselect()
     }
 
-    val focusRequestTapModifier = Modifier.focusRequestTapModifier(
-        enabled = enabled,
-        onTap = { offset ->
+    val selectionModifier =
+        Modifier.longPressDragGestureFilter(manager.touchSelectionObserver, enabled)
+
+    val pointerModifier = if (isInTouchMode) {
+        Modifier.tapPressTextFieldModifier(interactionSource, enabled) { offset ->
             tapToFocus(state, focusRequester, !readOnly)
             if (state.hasFocus) {
                 if (!state.selectionIsOn) {
@@ -288,16 +289,7 @@
                     manager.deselect(offset)
                 }
             }
-        }
-    )
-
-    val selectionModifier =
-        Modifier.longPressDragGestureFilter(manager.touchSelectionObserver, enabled)
-
-    val pointerModifier = if (isInTouchMode) {
-        Modifier.pressGestureFilter(interactionSource = interactionSource, enabled = enabled)
-            .then(selectionModifier)
-            .then(focusRequestTapModifier)
+        }.then(selectionModifier)
     } else {
         Modifier.mouseDragGestureDetector(manager::mouseSelectionDetector, enabled = enabled)
     }

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/KeyboardActions.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/KeyboardActions.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/KeyboardActions.kt
index 822bd71..871e49a 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/KeyboardActions.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/KeyboardActions.kt
@@ -40,7 +40,7 @@
      * indicates that the default implementation should be executed. The default implementation
      * moves focus to the next item in the focus traversal order.
      *
-     * @see [Modifier.focusOrder()][androidx.compose.ui.focus.focusOrder] for more details on how
+     * See [Modifier.focusOrder()][androidx.compose.ui.focus.focusOrder] for more details on how
      * to specify a custom focus order if needed.
      */
     val onNext: (KeyboardActionScope.() -> Unit)? = null,
@@ -50,7 +50,7 @@
      * indicates that the default implementation should be executed. The default implementation
      * moves focus to the previous item in the focus traversal order.
      *
-     * @see [Modifier.focusOrder()][androidx.compose.ui.focus.focusOrder] for more details on how
+     * See [Modifier.focusOrder()][androidx.compose.ui.focus.focusOrder] for more details on how
      * to specify a custom focus order if needed.
      */
     val onPrevious: (KeyboardActionScope.() -> Unit)? = null,

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldGestureModifiers.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldGestureModifiers.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldGestureModifiers.kt
index b1f6e32..4a535d4 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldGestureModifiers.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldGestureModifiers.kt
@@ -18,19 +18,17 @@
 
 package androidx.compose.foundation.text
 
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.focusable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.legacygestures.DragObserver
+import androidx.compose.foundation.legacygestures.LongPressDragObserver
+import androidx.compose.foundation.legacygestures.dragGestureFilter
+import androidx.compose.foundation.legacygestures.longPressDragGestureFilter
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.FocusState
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.foundation.legacygestures.DragObserver
-import androidx.compose.foundation.legacygestures.LongPressDragObserver
-import androidx.compose.foundation.legacygestures.dragGestureFilter
-import androidx.compose.foundation.legacygestures.longPressDragGestureFilter
-import androidx.compose.foundation.legacygestures.tapGestureFilter
 import androidx.compose.ui.input.pointer.PointerInputScope
 import androidx.compose.ui.input.pointer.pointerInput
 
@@ -40,9 +38,6 @@
     enabled: Boolean
 ) = if (enabled) this.then(longPressDragGestureFilter(observer)) else this
 
-internal fun Modifier.focusRequestTapModifier(onTap: (Offset) -> Unit, enabled: Boolean) =
-    if (enabled) this.tapGestureFilter(onTap) else this
-
 // Focus modifiers
 internal fun Modifier.textFieldFocusModifier(
     enabled: Boolean,

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldKeyInput.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldKeyInput.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldKeyInput.kt
index b792da1..9281ab6 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldKeyInput.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldKeyInput.kt
@@ -18,7 +18,10 @@
 
 import androidx.compose.foundation.text.selection.TextFieldPreparedSelection
 import androidx.compose.foundation.text.selection.TextFieldSelectionManager
+import androidx.compose.foundation.text.selection.TextPreparedSelectionState
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
 import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.input.key.KeyEventType
 import androidx.compose.ui.input.key.onKeyEvent
@@ -47,6 +50,7 @@
     val value: TextFieldValue = TextFieldValue(),
     val editable: Boolean = true,
     val singleLine: Boolean = false,
+    val preparedSelectionState: TextPreparedSelectionState,
     val offsetMapping: OffsetMapping = OffsetMapping.Identity,
     private val keyMapping: KeyMapping = platformDefaultKeyMapping,
 ) {
@@ -67,6 +71,7 @@
         typedCommand(event)?.let {
             return if (editable) {
                 it.apply()
+                preparedSelectionState.resetCachedX()
                 true
             } else {
                 false
@@ -165,7 +170,8 @@
         val preparedSelection = TextFieldPreparedSelection(
             currentValue = value,
             offsetMapping = offsetMapping,
-            layoutResultProxy = state.layoutResult
+            layoutResultProxy = state.layoutResult,
+            state = preparedSelectionState
         )
         block(preparedSelection)
         if (preparedSelection.selection != value.selection ||
@@ -176,6 +182,7 @@
     }
 }
 
+@Suppress("ModifierInspectorInfo")
 internal fun Modifier.textFieldKeyInput(
     state: TextFieldState,
     manager: TextFieldSelectionManager,
@@ -183,14 +190,16 @@
     editable: Boolean,
     singleLine: Boolean,
     offsetMapping: OffsetMapping
-): Modifier {
+) = composed {
+    val preparedSelectionState = remember { TextPreparedSelectionState() }
     val processor = TextFieldKeyInput(
         state = state,
         selectionManager = manager,
         value = value,
         editable = editable,
         singleLine = singleLine,
-        offsetMapping = offsetMapping
+        offsetMapping = offsetMapping,
+        preparedSelectionState = preparedSelectionState
     )
-    return Modifier.onKeyEvent(processor::process)
+    Modifier.onKeyEvent(processor::process)
 }
\ No newline at end of file

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldPressGestureFilter.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldPressGestureFilter.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldPressGestureFilter.kt
index 493e81c..24af865 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldPressGestureFilter.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldPressGestureFilter.kt
@@ -16,27 +16,32 @@
 
 package androidx.compose.foundation.text
 
+import androidx.compose.foundation.gestures.detectTapAndPress
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.PressInteraction
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.pointer.pointerInput
 import kotlinx.coroutines.launch
-import androidx.compose.foundation.legacygestures.pressIndicatorGestureFilter
 
 /**
- * Required for the press [MutableInteractionSource] consistency for TextField.
+ * Required for the press and tap [MutableInteractionSource] consistency for TextField.
  */
-@Suppress("ModifierInspectorInfo", "DEPRECATION")
-internal fun Modifier.pressGestureFilter(
+@Suppress("ModifierInspectorInfo")
+internal fun Modifier.tapPressTextFieldModifier(
     interactionSource: MutableInteractionSource?,
-    enabled: Boolean = true
+    enabled: Boolean = true,
+    onTap: (Offset) -> Unit
 ): Modifier = if (enabled) composed {
     val scope = rememberCoroutineScope()
     val pressedInteraction = remember { mutableStateOf<PressInteraction.Press?>(null) }
+    val onTapState = rememberUpdatedState(onTap)
     DisposableEffect(interactionSource) {
         onDispose {
             pressedInteraction.value?.let { oldValue ->
@@ -46,37 +51,35 @@
             }
         }
     }
-    pressIndicatorGestureFilter(
-        onStart = {
-            scope.launch {
-                // Remove any old interactions if we didn't fire stop / cancel properly
-                pressedInteraction.value?.let { oldValue ->
-                    val interaction = PressInteraction.Cancel(oldValue)
+    Modifier.pointerInput(interactionSource) {
+        detectTapAndPress(
+            onPress = {
+                scope.launch {
+                    // Remove any old interactions if we didn't fire stop / cancel properly
+                    pressedInteraction.value?.let { oldValue ->
+                        val interaction = PressInteraction.Cancel(oldValue)
+                        interactionSource?.emit(interaction)
+                        pressedInteraction.value = null
+                    }
+                    val interaction = PressInteraction.Press(it)
                     interactionSource?.emit(interaction)
-                    pressedInteraction.value = null
+                    pressedInteraction.value = interaction
                 }
-                val interaction = PressInteraction.Press(it)
-                interactionSource?.emit(interaction)
-                pressedInteraction.value = interaction
-            }
-        },
-        onStop = {
-            scope.launch {
-                pressedInteraction.value?.let {
-                    val interaction = PressInteraction.Release(it)
-                    interactionSource?.emit(interaction)
-                    pressedInteraction.value = null
+                val success = tryAwaitRelease()
+                scope.launch {
+                    pressedInteraction.value?.let { oldValue ->
+                        val interaction =
+                            if (success) {
+                                PressInteraction.Release(oldValue)
+                            } else {
+                                PressInteraction.Cancel(oldValue)
+                            }
+                        interactionSource?.emit(interaction)
+                        pressedInteraction.value = null
+                    }
                 }
-            }
-        },
-        onCancel = {
-            scope.launch {
-                pressedInteraction.value?.let {
-                    val interaction = PressInteraction.Cancel(it)
-                    interactionSource?.emit(interaction)
-                    pressedInteraction.value = null
-                }
-            }
-        }
-    )
+            },
+            onTap = { onTapState.value.invoke(it) }
+        )
+    }
 } else this

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionManager.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionManager.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionManager.kt
index 53acc0b..70dc9ec 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionManager.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionManager.kt
@@ -40,6 +40,7 @@
 import androidx.compose.ui.layout.LayoutCoordinates
 import androidx.compose.ui.layout.boundsInWindow
 import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.platform.TextToolbar
 import androidx.compose.ui.platform.TextToolbarStatus
@@ -121,13 +122,16 @@
             }
         }
 
+    private var previousPosition: Offset? = null
     /**
      * Layout Coordinates of the selection container.
      */
     var containerLayoutCoordinates: LayoutCoordinates? = null
         set(value) {
             field = value
-            if (hasFocus) {
+            val positionInWindow = value?.positionInWindow()
+            if (hasFocus && previousPosition != positionInWindow) {
+                previousPosition = positionInWindow
                 updateHandleOffsets()
                 updateSelectionToolbarPosition()
             }
@@ -170,9 +174,14 @@
         private set
 
     init {
-        selectionRegistrar.onPositionChangeCallback = {
-            updateHandleOffsets()
-            updateSelectionToolbarPosition()
+        selectionRegistrar.onPositionChangeCallback = { selectableId ->
+            if (
+                selectableId == selection?.start?.selectableId ||
+                selectableId == selection?.end?.selectableId
+            ) {
+                updateHandleOffsets()
+                updateSelectionToolbarPosition()
+            }
         }
 
         selectionRegistrar.onSelectionUpdateStartCallback = { layoutCoordinates, startPosition ->

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrar.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrar.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrar.kt
index 5d6fdab..25ae682 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrar.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrar.kt
@@ -55,7 +55,7 @@
      * When the Global Position of a subscribed [Selectable] changes, this method
      * is called.
      */
-    fun notifyPositionChange()
+    fun notifyPositionChange(selectableId: Long)
 
     /**
      * Call this method to notify the [SelectionContainer] that the selection has been initiated.

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt
index 3cda909..f43c89f 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt
@@ -59,7 +59,7 @@
     /**
      * The callback to be invoked when the position change was triggered.
      */
-    internal var onPositionChangeCallback: (() -> Unit)? = null
+    internal var onPositionChangeCallback: ((Long) -> Unit)? = null
 
     /**
      * The callback to be invoked when the selection is initiated.
@@ -150,11 +150,11 @@
         return selectables
     }
 
-    override fun notifyPositionChange() {
+    override fun notifyPositionChange(selectableId: Long) {
         // Set the variable sorted to be false, when the global position of a registered
         // selectable changes.
         sorted = false
-        onPositionChangeCallback?.invoke()
+        onPositionChangeCallback?.invoke(selectableId)
     }
 
     override fun notifySelectionUpdateStart(

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextPreparedSelection.kt

diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextPreparedSelection.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextPreparedSelection.kt
index 68d1712..a73a617 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextPreparedSelection.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextPreparedSelection.kt
@@ -30,6 +30,16 @@
 import kotlin.math.max
 import kotlin.math.min
 
+internal class TextPreparedSelectionState {
+    // it's set at the start of vertical navigation and used as the preferred value to set a new
+    // cursor position.
+    var cachedX: Float? = null
+
+    fun resetCachedX() {
+        cachedX = null
+    }
+}
+
 /**
  * This utility class implements many selection-related operations on text (including basic
  * cursor movements and deletions) and combines them, taking into account how the text was
@@ -47,25 +57,29 @@
     val originalText: AnnotatedString,
     val originalSelection: TextRange,
     val layoutResult: TextLayoutResult?,
-    val offsetMapping: OffsetMapping
+    val offsetMapping: OffsetMapping,
+    val state: TextPreparedSelectionState
 ) {
     var selection = originalSelection
 
     var annotatedString = originalText
-    protected val text
+    internal val text
         get() = annotatedString.text
 
     @Suppress("UNCHECKED_CAST")
-    inline fun <U> U.apply(block: U.() -> Unit): T {
+    protected inline fun <U> U.apply(resetCachedX: Boolean = true, block: U.() -> Unit): T {
+        if (resetCachedX) {
+            state.resetCachedX()
+        }
         block()
         return this as T
     }
 
-    fun setCursor(offset: Int) = apply {
+    protected fun setCursor(offset: Int) {
         setSelection(offset, offset)
     }
 
-    fun setSelection(start: Int, end: Int) = apply {
+    protected fun setSelection(start: Int, end: Int) {
         selection = TextRange(start, end)
     }
 
@@ -175,11 +189,11 @@
         setCursor(getParagraphEnd())
     }
 
-    fun moveCursorUpByLine() = apply {
+    fun moveCursorUpByLine() = apply(false) {
         layoutResult?.jumpByLinesOffset(-1)?.let { setCursor(it) }
     }
 
-    fun moveCursorDownByLine() = apply {
+    fun moveCursorDownByLine() = apply(false) {
         layoutResult?.jumpByLinesOffset(1)?.let { setCursor(it) }
     }
 
@@ -208,11 +222,16 @@
     }
 
     // it selects a text from the original selection start to a current selection end
-    fun selectMovement() = apply {
+    fun selectMovement() = apply(false) {
         selection = TextRange(originalSelection.start, selection.end)
     }
 
-    // delete currently selected text and update [selection] and [annotatedString]
+    /**
+     * delete currently selected text and update [selection] and [annotatedString]
+     *
+     * it supposed to be the last operation, it doesn't relayout text by itself, so any
+     * subsequent calls could give wrong results
+     */
     fun deleteSelected() = apply {
         val maxChars = text.length
         val beforeSelection =
@@ -273,22 +292,26 @@
     private fun TextLayoutResult.jumpByLinesOffset(linesAmount: Int): Int {
         val currentOffset = transformedEndOffset()
 
-        val newLine = getLineForOffset(currentOffset) + linesAmount
+        if (state.cachedX == null) {
+            state.cachedX = getCursorRect(currentOffset).left
+        }
+
+        val targetLine = getLineForOffset(currentOffset) + linesAmount
         when {
-            newLine < 0 -> {
+            targetLine < 0 -> {
                 return 0
             }
-            newLine >= lineCount -> {
+            targetLine >= lineCount -> {
                 return text.length
             }
         }
 
-        val y = getLineBottom(newLine) - 1
-        val x = getCursorRect(currentOffset).left.also {
-            if ((isLtr() && it >= getLineRight(newLine)) ||
-                (!isLtr() && it <= getLineLeft(newLine))
+        val y = getLineBottom(targetLine) - 1
+        val x = state.cachedX!!.also {
+            if ((isLtr() && it >= getLineRight(targetLine)) ||
+                (!isLtr() && it <= getLineLeft(targetLine))
             ) {
-                return getLineEnd(newLine, true)
+                return getLineEnd(targetLine, true)
             }
         }
 
@@ -300,19 +323,19 @@
     }
 
     private fun transformedEndOffset(): Int {
-        return offsetMapping.originalToTransformed(originalSelection.end)
+        return offsetMapping.originalToTransformed(selection.end)
     }
 
     private fun transformedMinOffset(): Int {
-        return offsetMapping.originalToTransformed(originalSelection.min)
+        return offsetMapping.originalToTransformed(selection.min)
     }
 
     private fun transformedMaxOffset(): Int {
-        return offsetMapping.originalToTransformed(originalSelection.max)
+        return offsetMapping.originalToTransformed(selection.max)
     }
 
     private fun charOffset(offset: Int) =
-        offset.coerceAtMost(originalText.length - 1)
+        offset.coerceAtMost(text.length - 1)
 
     private fun getParagraphStart(): Int {
         var index = selection.min
@@ -343,15 +366,31 @@
     }
 }
 
+internal class TextPreparedSelection(
+    originalText: AnnotatedString,
+    originalSelection: TextRange,
+    layoutResult: TextLayoutResult? = null,
+    offsetMapping: OffsetMapping = OffsetMapping.Identity,
+    state: TextPreparedSelectionState = TextPreparedSelectionState()
+) : BaseTextPreparedSelection<TextPreparedSelection>(
+    originalText = originalText,
+    originalSelection = originalSelection,
+    layoutResult = layoutResult,
+    offsetMapping = offsetMapping,
+    state = state
+)
+
 internal class TextFieldPreparedSelection(
     val currentValue: TextFieldValue,
     offsetMapping: OffsetMapping = OffsetMapping.Identity,
-    val layoutResultProxy: TextLayoutResultProxy?
+    val layoutResultProxy: TextLayoutResultProxy?,
+    state: TextPreparedSelectionState = TextPreparedSelectionState()
 ) : BaseTextPreparedSelection<TextFieldPreparedSelection>(
     originalText = currentValue.annotatedString,
     originalSelection = currentValue.selection,
     offsetMapping = offsetMapping,
-    layoutResult = layoutResultProxy?.value
+    layoutResult = layoutResultProxy?.value,
+    state = state
 ) {
     val value
         get() = currentValue.copy(
@@ -367,11 +406,11 @@
         }
     }
 
-    fun moveCursorUpByPage() = apply {
+    fun moveCursorUpByPage() = apply(false) {
         layoutResultProxy?.jumpByPagesOffset(-1)?.let { setCursor(it) }
     }
 
-    fun moveCursorDownByPage() = apply {
+    fun moveCursorDownByPage() = apply(false) {
         layoutResultProxy?.jumpByPagesOffset(1)?.let { setCursor(it) }
     }
 

compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/Scrollbar.desktop.kt

diff --git a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/Scrollbar.desktop.kt b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/Scrollbar.desktop.kt
index eab10ec..b720e23 100644
--- a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/Scrollbar.desktop.kt
+++ b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/Scrollbar.desktop.kt
@@ -34,12 +34,13 @@
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.foundation.legacygestures.DragObserver
-import androidx.compose.foundation.legacygestures.pressIndicatorGestureFilter
 import androidx.compose.foundation.legacygestures.rawDragGestureFilter
 import androidx.compose.foundation.interaction.DragInteraction
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.gestures.detectTapAndPress
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.Shape
@@ -278,7 +279,6 @@
     )
 }
 
-@Suppress("DEPRECATION") // press gesture filter
 private fun Modifier.scrollOnPressOutsideSlider(
     isVertical: Boolean,
     sliderAdapter: SliderAdapter,
@@ -309,12 +309,16 @@
             }
         }
     }
-
-    pressIndicatorGestureFilter(
-        onStart = { targetOffset = it },
-        onStop = { targetOffset = null },
-        onCancel = { targetOffset = null }
-    )
+    Modifier.pointerInput(Unit) {
+        detectTapAndPress(
+            onPress = { offset ->
+                targetOffset = offset
+                tryAwaitRelease()
+                targetOffset = null
+            },
+            onTap = {}
+        )
+    }
 }
 
 /**
@@ -546,4 +550,4 @@
  * The time that must elapse before a tap gesture sends onTapDown, if there's
  * any doubt that the gesture is a tap.
  */
-private const val PressTimeoutMillis: Long = 100L
\ No newline at end of file
+private const val PressTimeoutMillis: Long = 100L

compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/gestures/TapGestureDetectorTest.kt

diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/gestures/TapGestureDetectorTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/gestures/TapGestureDetectorTest.kt
index 8f068f1..058acdd 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/gestures/TapGestureDetectorTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/gestures/TapGestureDetectorTest.kt
@@ -62,6 +62,22 @@
         )
     }
 
+    private val utilWithShortcut = SuspendingGestureTestUtil {
+        detectTapAndPress(
+            onPress = {
+                pressed = true
+                if (tryAwaitRelease()) {
+                    released = true
+                } else {
+                    canceled = true
+                }
+            },
+            onTap = {
+                tapped = true
+            }
+        )
+    }
+
     private val allGestures = SuspendingGestureTestUtil {
         detectTapGestures(
             onPress = {
@@ -113,6 +129,26 @@
      * Clicking in the region should result in the callback being invoked.
      */
     @Test
+    fun normalTap_withShortcut() = utilWithShortcut.executeInComposition {
+        val down = down(5f, 5f)
+        assertTrue(down.consumed.downChange)
+
+        assertTrue(pressed)
+        assertFalse(tapped)
+        assertFalse(released)
+
+        val up = down.up(50)
+        assertTrue(up.consumed.downChange)
+
+        assertTrue(tapped)
+        assertTrue(released)
+        assertFalse(canceled)
+    }
+
+    /**
+     * Clicking in the region should result in the callback being invoked.
+     */
+    @Test
     fun normalTapWithAllGestures() = allGestures.executeInComposition {
         val down = down(5f, 5f)
         assertTrue(down.consumed.downChange)
@@ -206,6 +242,23 @@
      * the callback not being invoked
      */
     @Test
+    fun tapMiss_withShortcut() = utilWithShortcut.executeInComposition {
+        val up = down(5f, 5f)
+            .moveTo(15f, 15f)
+            .up()
+
+        assertTrue(pressed)
+        assertTrue(canceled)
+        assertFalse(released)
+        assertFalse(tapped)
+        assertFalse(up.consumed.downChange)
+    }
+
+    /**
+     * Pressing in the region, sliding out and then lifting should result in
+     * the callback not being invoked
+     */
+    @Test
     fun longPressMiss() = allGestures.executeInComposition {
         val pointer = down(5f, 5f)
             .moveTo(15f, 15f)
@@ -271,6 +324,24 @@
     }
 
     /**
+     * Pressing in the region, sliding out, then back in, then lifting
+     * should result the gesture being canceled.
+     */
+    @Test
+    fun tapOutAndIn_withShortcut() = utilWithShortcut.executeInComposition {
+        val up = down(5f, 5f)
+            .moveTo(15f, 15f)
+            .moveTo(6f, 6f)
+            .up()
+
+        assertFalse(tapped)
+        assertFalse(up.consumed.downChange)
+        assertTrue(pressed)
+        assertFalse(released)
+        assertTrue(canceled)
+    }
+
+    /**
      * After a first tap, a second tap should also be detected.
      */
     @Test
@@ -296,6 +367,31 @@
     }
 
     /**
+     * After a first tap, a second tap should also be detected.
+     */
+    @Test
+    fun secondTap_withShortcut() = utilWithShortcut.executeInComposition {
+        down(5f, 5f)
+            .up()
+
+        assertTrue(pressed)
+        assertTrue(released)
+        assertFalse(canceled)
+
+        tapped = false
+        pressed = false
+        released = false
+
+        val up2 = down(4f, 4f)
+            .up()
+        assertTrue(tapped)
+        assertTrue(up2.consumed.downChange)
+        assertTrue(pressed)
+        assertTrue(released)
+        assertFalse(canceled)
+    }
+
+    /**
      * Clicking in the region with the up already consumed should result in the callback not
      * being invoked.
      */
@@ -316,6 +412,26 @@
     }
 
     /**
+     * Clicking in the region with the up already consumed should result in the callback not
+     * being invoked.
+     */
+    @Test
+    fun consumedUpTap_withShortcut() = utilWithShortcut.executeInComposition {
+        val down = down(5f, 5f)
+
+        assertFalse(tapped)
+        assertTrue(pressed)
+
+        down.up {
+            consumeDownChange()
+        }
+
+        assertFalse(tapped)
+        assertFalse(released)
+        assertTrue(canceled)
+    }
+
+    /**
      * Clicking in the region with the motion consumed should result in the callback not
      * being invoked.
      */
@@ -334,6 +450,24 @@
     }
 
     /**
+     * Clicking in the region with the motion consumed should result in the callback not
+     * being invoked.
+     */
+    @Test
+    fun consumedMotionTap_withShortcut() = utilWithShortcut.executeInComposition {
+        down(5f, 5f)
+            .moveTo(6f, 2f) {
+                consumePositionChange()
+            }
+            .up(50)
+
+        assertFalse(tapped)
+        assertTrue(pressed)
+        assertFalse(released)
+        assertTrue(canceled)
+    }
+
+    /**
      * Ensure that two-finger taps work.
      */
     @Test
@@ -363,6 +497,35 @@
     }
 
     /**
+     * Ensure that two-finger taps work.
+     */
+    @Test
+    fun twoFingerTap_withShortcut() = utilWithShortcut.executeInComposition {
+        val down = down(1f, 1f)
+        assertTrue(down.consumed.downChange)
+
+        assertTrue(pressed)
+        pressed = false
+
+        val down2 = down(9f, 5f)
+        assertFalse(down2.consumed.downChange)
+
+        assertFalse(pressed)
+
+        val up = down.up()
+        assertFalse(up.consumed.downChange)
+        assertFalse(tapped)
+        assertFalse(released)
+
+        val up2 = down2.up()
+        assertTrue(up2.consumed.downChange)
+
+        assertTrue(tapped)
+        assertTrue(released)
+        assertFalse(canceled)
+    }
+
+    /**
      * A position change consumption on any finger should cause tap to cancel.
      */
     @Test
@@ -389,6 +552,32 @@
     }
 
     /**
+     * A position change consumption on any finger should cause tap to cancel.
+     */
+    @Test
+    fun twoFingerTapCancel_withShortcut() = utilWithShortcut.executeInComposition {
+        val down = down(1f, 1f)
+
+        assertTrue(pressed)
+
+        val down2 = down(9f, 5f)
+
+        val up = down.moveTo(5f, 5f) {
+            consumePositionChange()
+        }.up()
+        assertFalse(up.consumed.downChange)
+
+        assertFalse(tapped)
+        assertTrue(canceled)
+
+        val up2 = down2.up(50)
+        assertFalse(up2.consumed.downChange)
+
+        assertFalse(tapped)
+        assertFalse(released)
+    }
+
+    /**
      * Detect the second tap as long press.
      */
     @Test

compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImplTest.kt

diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImplTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImplTest.kt
index d5e37c6..77af370 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImplTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImplTest.kt
@@ -212,7 +212,7 @@
         assertThat(selectionRegistrar.sorted).isTrue()
 
         // Act.
-        selectionRegistrar.notifyPositionChange()
+        selectionRegistrar.notifyPositionChange(handlerId0)
 
         // Assert.
         assertThat(selectionRegistrar.sorted).isFalse()

compose/integration-tests/benchmark/build.gradle

diff --git a/compose/integration-tests/benchmark/build.gradle b/compose/integration-tests/benchmark/build.gradle
deleted file mode 100644
index dd47137..0000000
--- a/compose/integration-tests/benchmark/build.gradle
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.Publish
-
-plugins {
-    id("AndroidXPlugin")
-    id("com.android.library")
-    id("AndroidXUiPlugin")
-    id("org.jetbrains.kotlin.android")
-    id("androidx.benchmark")
-}
-
-dependencies {
-    kotlinPlugin(project(":compose:compiler:compiler"))
-
-    implementation(project(":benchmark:benchmark-junit4"))
-    implementation(project(":benchmark:benchmark-macro-junit4"))
-    implementation(project(":compose:foundation:foundation-layout"))
-    implementation(project(":compose:integration-tests"))
-    implementation(project(":compose:runtime:runtime"))
-    implementation(project(":compose:ui:ui-test-junit4"))
-    implementation(KOTLIN_STDLIB)
-    implementation(KOTLIN_REFLECT)
-    implementation(ANDROIDX_TEST_RULES)
-    implementation(JUNIT)
-    implementation(TRUTH)
-
-    androidTestImplementation(project(":compose:foundation:foundation-layout"))
-    androidTestImplementation(project(":compose:foundation:foundation"))
-    androidTestImplementation(project(":compose:material:material"))
-    androidTestImplementation(project(":compose:runtime:runtime"))
-    androidTestImplementation(project(":compose:benchmark-utils"))
-    androidTestImplementation(project(":compose:ui:ui"))
-    androidTestImplementation(project(":activity:activity-compose"))
-    androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
-    androidTestImplementation(KOTLIN_TEST_COMMON)
-    androidTestImplementation(ANDROIDX_TEST_RULES)
-    androidTestImplementation(TRUTH)
-}

compose/integration-tests/benchmark/src/androidTest/AndroidManifest.xml

diff --git a/compose/integration-tests/benchmark/src/androidTest/AndroidManifest.xml b/compose/integration-tests/benchmark/src/androidTest/AndroidManifest.xml
deleted file mode 100644
index c828266..0000000
--- a/compose/integration-tests/benchmark/src/androidTest/AndroidManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="androidx.ui.benchmark.test">
-
-    <!--
-      ~ Important: disable debuggable for accurate performance results
-      -->
-    <application
-            android:debuggable="false"
-            tools:replace="android:debuggable">
-        <!-- enable profileableByShell for non-intrusive profiling tools -->
-        <!--suppress AndroidElementNotAllowed -->
-        <profileable android:shell="true"/>
-    </application>
-</manifest>

compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/lazy/LazyListScrollingBenchmark.kt

diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/lazy/LazyListScrollingBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/lazy/LazyListScrollingBenchmark.kt
deleted file mode 100644
index 00163cb..0000000
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/lazy/LazyListScrollingBenchmark.kt
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.ui.lazy
-
-import android.os.Build
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.requiredHeight
-import androidx.compose.foundation.layout.requiredSize
-import androidx.compose.foundation.layout.requiredWidth
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.testutils.assertNoPendingChanges
-import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
-import androidx.compose.testutils.doFramesUntilNoChangesPending
-import androidx.compose.testutils.ComposeTestCase
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.dp
-import androidx.test.filters.LargeTest
-import androidx.test.filters.SdkSuppress
-import kotlinx.coroutines.runBlocking
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.Parameterized
-
-@LargeTest
-@RunWith(Parameterized::class)
-class LazyListScrollingBenchmark(
-    private val testCase: LazyListScrollingTestCase
-) {
-    @get:Rule
-    val benchmarkRule = ComposeBenchmarkRule()
-
-    @Test
-    fun measure_notAddingNewItemsAsResult() {
-        benchmarkRule.toggleStateBenchmarkMeasure {
-            ListRemeasureTestCase(false, testCase.content)
-        }
-    }
-
-    @Test
-    fun measure_addingNewItemAsResult() {
-        benchmarkRule.toggleStateBenchmarkMeasure {
-            ListRemeasureTestCase(true, testCase.content)
-        }
-    }
-
-    // this test makes sense only when run on the Android version which supports RenderNodes
-    // as this tests how efficiently we move RenderNodes.
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
-    @Test
-    fun draw_notAddingNewItemsAsResult() {
-        benchmarkRule.toggleStateBenchmarkDraw {
-            ListRemeasureTestCase(false, testCase.content)
-        }
-    }
-
-    // this test makes sense only when run on the Android version which supports RenderNodes
-    // as this tests how efficiently we move RenderNodes.
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
-    @Test
-    fun draw_addingNewItemAsResult() {
-        benchmarkRule.toggleStateBenchmarkDraw {
-            ListRemeasureTestCase(true, testCase.content)
-        }
-    }
-
-    companion object {
-        @JvmStatic
-        @Parameterized.Parameters(name = "{0}")
-        fun initParameters(): Array<LazyListScrollingTestCase> =
-            arrayOf(
-                LazyColumnWithItemAndItems,
-                LazyColumnWithItems,
-                LazyColumnWithItemsIndexed,
-                LazyRowWithItemAndItems,
-                LazyRowWithItems,
-                LazyRowWithItemsIndexed
-            )
-    }
-}
-
-class LazyListScrollingTestCase(
-    private val name: String,
-    val content: @Composable ListRemeasureTestCase.(LazyListState) -> Unit
-) {
-    override fun toString(): String {
-        return name
-    }
-}
-
-private val LazyColumnWithItemAndItems = LazyListScrollingTestCase(
-    "LazyColumnWithItemAndItems"
-) { state ->
-    LazyColumn(state = state, modifier = Modifier.requiredHeight(400.dp).fillMaxWidth()) {
-        item {
-            FirstLargeItem()
-        }
-        items(items) {
-            RegularItem()
-        }
-    }
-}
-
-private val LazyColumnWithItems = LazyListScrollingTestCase(
-    "LazyColumnWithItems"
-) { state ->
-    LazyColumn(state = state, modifier = Modifier.requiredHeight(400.dp).fillMaxWidth()) {
-        items(items) {
-            if (it.index == 0) {
-                FirstLargeItem()
-            } else {
-                RegularItem()
-            }
-        }
-    }
-}
-
-private val LazyColumnWithItemsIndexed = LazyListScrollingTestCase(
-    "LazyColumnWithItemsIndexed"
-) { state ->
-    LazyColumn(state = state, modifier = Modifier.requiredHeight(400.dp).fillMaxWidth()) {
-        itemsIndexed(items) { index, _ ->
-            if (index == 0) {
-                FirstLargeItem()
-            } else {
-                RegularItem()
-            }
-        }
-    }
-}
-
-private val LazyRowWithItemAndItems = LazyListScrollingTestCase(
-    "LazyRowWithItemAndItems"
-) { state ->
-    LazyRow(state = state, modifier = Modifier.requiredWidth(400.dp).fillMaxHeight()) {
-        item {
-            FirstLargeItem()
-        }
-        items(items) {
-            RegularItem()
-        }
-    }
-}
-
-private val LazyRowWithItems = LazyListScrollingTestCase(
-    "LazyRowWithItems"
-) { state ->
-    LazyRow(state = state, modifier = Modifier.requiredWidth(400.dp).fillMaxHeight()) {
-        items(items) {
-            if (it.index == 0) {
-                FirstLargeItem()
-            } else {
-                RegularItem()
-            }
-        }
-    }
-}
-
-private val LazyRowWithItemsIndexed = LazyListScrollingTestCase(
-    "LazyRowWithItemsIndexed"
-) { state ->
-    LazyRow(state = state, modifier = Modifier.requiredWidth(400.dp).fillMaxHeight()) {
-        itemsIndexed(items) { index, _ ->
-            if (index == 0) {
-                FirstLargeItem()
-            } else {
-                RegularItem()
-            }
-        }
-    }
-}
-
-// TODO(b/169852102 use existing public constructs instead)
-private fun ComposeBenchmarkRule.toggleStateBenchmarkMeasure(
-    caseFactory: () -> ListRemeasureTestCase
-) {
-    runBenchmarkFor(caseFactory) {
-        doFramesUntilNoChangesPending()
-
-        measureRepeated {
-            runWithTimingDisabled {
-                getTestCase().prepareForToggle()
-                assertNoPendingChanges()
-            }
-            getTestCase().toggle()
-            runWithTimingDisabled {
-                assertNoPendingChanges()
-            }
-        }
-    }
-}
-
-// TODO(b/169852102 use existing public constructs instead)
-private fun ComposeBenchmarkRule.toggleStateBenchmarkDraw(
-    caseFactory: () -> ListRemeasureTestCase
-) {
-    runBenchmarkFor(caseFactory) {
-        doFrame()
-
-        measureRepeated {
-            runWithTimingDisabled {
-                // reset the state and draw
-                getTestCase().prepareForToggle()
-                measure()
-                layout()
-                drawPrepare()
-                draw()
-                drawFinish()
-                // toggle and prepare measuring draw
-                getTestCase().toggle()
-                measure()
-                layout()
-                drawPrepare()
-            }
-            draw()
-            runWithTimingDisabled {
-                drawFinish()
-            }
-        }
-    }
-}
-
-class ListRemeasureTestCase(
-    val addNewItemOnToggle: Boolean,
-    val content: @Composable ListRemeasureTestCase.(LazyListState) -> Unit
-) : ComposeTestCase {
-
-    val items = List(100) { ListItem(it) }
-
-    private lateinit var listState: LazyListState
-    private lateinit var density: Density
-
-    @Composable
-    fun FirstLargeItem() {
-        Box(Modifier.requiredSize(30.dp))
-    }
-
-    @Composable
-    override fun Content() {
-        density = LocalDensity.current
-        listState = rememberLazyListState()
-        content(listState)
-    }
-
-    @Composable
-    fun RegularItem() {
-        Box(Modifier.requiredSize(20.dp).background(Color.Red, RoundedCornerShape(8.dp)))
-    }
-
-    fun prepareForToggle() {
-        if (addNewItemOnToggle && listState.firstVisibleItemScrollOffset != 0) {
-            runBlocking {
-                listState.scrollToItem(0, 0)
-            }
-        }
-    }
-
-    fun toggle() {
-        val scrollTo = if (addNewItemOnToggle) {
-            with(density) { 15.dp.roundToPx() }
-        } else {
-            if (listState.firstVisibleItemScrollOffset == 5) {
-                0
-            } else {
-                5
-            }
-        }
-        runBlocking {
-            listState.scrollToItem(0, scrollTo)
-        }
-    }
-}
-
-data class ListItem(val index: Int)

compose/integration-tests/benchmark/src/main/AndroidManifest.xml

diff --git a/compose/integration-tests/benchmark/src/main/AndroidManifest.xml b/compose/integration-tests/benchmark/src/main/AndroidManifest.xml
deleted file mode 100644
index d85c4ca..0000000
--- a/compose/integration-tests/benchmark/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.ui.benchmark">
-
-    <application>
-        <activity
-            android:name="androidx.activity.ComponentActivity"
-            android:theme="@style/TestTheme" />
-    </application>
-</manifest>

compose/integration-tests/demos/OWNERS

diff --git a/compose/integration-tests/demos/OWNERS b/compose/integration-tests/demos/OWNERS
index 61c747e..aa0f147 100644
--- a/compose/integration-tests/demos/OWNERS
+++ b/compose/integration-tests/demos/OWNERS
@@ -4,7 +4,6 @@
 popam@google.com
 andreykulikov@google.com
 ryanmentley@google.com
-shepshapard@google.com
 njawad@google.com
 haoyuchang@google.com
 nona@google.com

compose/lint/common/src/main/java/androidx/compose/lint/ComposableUtils.kt

diff --git a/compose/lint/common/src/main/java/androidx/compose/lint/ComposableUtils.kt b/compose/lint/common/src/main/java/androidx/compose/lint/ComposableUtils.kt
index 7334704..e2efcce 100644
--- a/compose/lint/common/src/main/java/androidx/compose/lint/ComposableUtils.kt
+++ b/compose/lint/common/src/main/java/androidx/compose/lint/ComposableUtils.kt
@@ -21,64 +21,53 @@
 import kotlinx.metadata.jvm.annotations
 import org.jetbrains.kotlin.psi.KtAnnotated
 import org.jetbrains.kotlin.psi.KtFunction
+import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.psi.KtTypeReference
 import org.jetbrains.uast.UAnnotation
+import org.jetbrains.uast.UAnonymousClass
 import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.UDeclaration
+import org.jetbrains.uast.UElement
 import org.jetbrains.uast.ULambdaExpression
 import org.jetbrains.uast.UMethod
 import org.jetbrains.uast.UParameter
 import org.jetbrains.uast.UTypeReferenceExpression
 import org.jetbrains.uast.UVariable
 import org.jetbrains.uast.getContainingDeclaration
+import org.jetbrains.uast.getContainingUClass
 import org.jetbrains.uast.getContainingUMethod
 import org.jetbrains.uast.getParameterForArgument
-import org.jetbrains.uast.kotlin.KotlinUFunctionCallExpression
 import org.jetbrains.uast.toUElement
 import org.jetbrains.uast.withContainingElements
 
 /**
  * Returns whether this [UCallExpression] is invoked within the body of a Composable function or
+ * lambda, and is not `remember`ed.
+ *
+ * This searches parent declarations until we find a lambda expression or a function, and looks
+ * to see if these are Composable. If they are Composable, this function returns whether or not
+ * this call expression is inside the block of a `remember` call.
+ */
+fun UCallExpression.invokedInComposableBodyAndNotRemembered(): Boolean {
+    val visitor = ComposableBodyVisitor(this)
+    if (!visitor.isComposable()) return false
+    return visitor.parentUElements().none {
+        (it as? UCallExpression)?.let { element ->
+            element.methodName == Names.Runtime.Remember.shortName &&
+                element.resolve()?.isInPackageName(Names.Runtime.PackageName) == true
+        } == true
+    }
+}
+
+/**
+ * Returns whether this [UCallExpression] is invoked within the body of a Composable function or
  * lambda.
  *
  * This searches parent declarations until we find a lambda expression or a function, and looks
- * to see if these are Composable. Additionally, if we are inside a non-Composable lambda, the
- * lambda is a parameter on an inline function, and the inline function is within a Composable
- * lambda / function, this will also return true - since scoping functions / iterator functions
- * are commonly used within Composables.
+ * to see if these are Composable.
  */
 fun UCallExpression.isInvokedWithinComposable(): Boolean {
-    // The nearest property / function / etc declaration that contains this call expression
-    val containingDeclaration = getContainingDeclaration()
-
-    // Look through containing elements until we find a lambda or a method
-    for (element in withContainingElements) {
-        when (element) {
-            is ULambdaExpression -> {
-                if (element.isComposable) {
-                    return true
-                }
-                val parent = element.uastParent
-                if (parent is KotlinUFunctionCallExpression && parent.isDeclarationInline) {
-                    // We are now in a non-composable lambda parameter inside an inline function
-                    // For example, a scoping function such as run {} or apply {} - since the
-                    // body will be inlined and this is a common case, try to see if there is
-                    // a parent composable function above us, since it is still most likely
-                    // an error to call these methods inside an inline function, inside a
-                    // Composable function.
-                    continue
-                } else {
-                    return false
-                }
-            }
-            is UMethod -> {
-                return element.isComposable
-            }
-            // Stop when we reach the parent declaration to avoid escaping the scope. This
-            // shouldn't be called unless there is a UAST type we don't handle above.
-            containingDeclaration -> return false
-        }
-    }
-    return false
+    return ComposableBodyVisitor(this).isComposable()
 }
 
 // TODO: https://youtrack.jetbrains.com/issue/KT-45406
@@ -161,6 +150,86 @@
     }
 
 /**
+ * Helper class that visits parent declarations above the provided [callExpression], until it
+ * finds a lambda or method. This 'boundary' is used as the indicator for whether this
+ * [callExpression] can be considered to be inside a Composable body or not.
+ *
+ * @see isComposable
+ * @see parentUElements
+ */
+private class ComposableBodyVisitor(
+    private val callExpression: UCallExpression
+) {
+    /**
+     * @return whether the body can be considered Composable or not
+     */
+    fun isComposable(): Boolean = when (val element = parentUElements.last()) {
+        is UMethod -> element.isComposable
+        is ULambdaExpression -> element.isComposable
+        else -> false
+    }
+
+    /**
+     * Returns all parent [UElement]s until and including the boundary lambda / method.
+     */
+    fun parentUElements() = parentUElements
+
+    /**
+     * The outermost UElement that corresponds to the surrounding UDeclaration that contains
+     * [callExpression], with the following special cases:
+     *
+     * - if the containing UDeclaration is a local property, we ignore it and search above as
+     * it still could be created in the context of a Composable body
+     * - if the containing UDeclaration is an anonymous class (object { }), we ignore it and
+     * search above as it still could be created in the context of a Composable body
+     */
+    private val boundaryUElement by lazy {
+        // The nearest property / function / etc declaration that contains this call expression
+        var containingDeclaration = callExpression.getContainingDeclaration()
+
+        fun UDeclaration.isLocalProperty() = (sourcePsi as? KtProperty)?.isLocal == true
+        fun UDeclaration.isAnonymousClass() = this is UAnonymousClass
+        fun UDeclaration.isPropertyInsideAnonymousClass() =
+            getContainingUClass()?.isAnonymousClass() == true
+
+        while (
+            containingDeclaration != null &&
+            (
+                containingDeclaration.isLocalProperty() ||
+                    containingDeclaration.isAnonymousClass() ||
+                    containingDeclaration.isPropertyInsideAnonymousClass()
+                )
+        ) {
+            containingDeclaration = containingDeclaration.getContainingDeclaration()
+        }
+
+        containingDeclaration
+    }
+
+    private val parentUElements by lazy {
+        val elements = mutableListOf<UElement>()
+
+        // Look through containing elements until we find a lambda or a method
+        for (element in callExpression.withContainingElements) {
+            elements += element
+            when (element) {
+                // TODO: consider handling the case of a lambda inside an inline function call,
+                //  such as `apply` or `forEach`. These calls don't really change the
+                //  'composability' here, but there may be other inline function calls that
+                //  capture the lambda and invoke it elsewhere, so we might need to look for
+                //  a callsInPlace contract in the metadata for the function, or the body of the
+                //  source definition.
+                is ULambdaExpression -> break
+                is UMethod -> break
+                // Stop when we reach the parent declaration to avoid escaping the scope.
+                boundaryUElement -> break
+            }
+        }
+        elements
+    }
+}
+
+/**
  * Returns whether this type reference is @Composable or not
  */
 private val UTypeReferenceExpression.isComposable: Boolean

compose/lint/common/src/main/java/androidx/compose/lint/KotlinUtils.kt

diff --git a/compose/lint/common/src/main/java/androidx/compose/lint/KotlinUtils.kt b/compose/lint/common/src/main/java/androidx/compose/lint/KotlinUtils.kt
index 4b20849..e2dc2d6 100644
--- a/compose/lint/common/src/main/java/androidx/compose/lint/KotlinUtils.kt
+++ b/compose/lint/common/src/main/java/androidx/compose/lint/KotlinUtils.kt
@@ -20,8 +20,15 @@
 import kotlinx.metadata.Flag
 import org.jetbrains.kotlin.lexer.KtTokens.INLINE_KEYWORD
 import org.jetbrains.kotlin.psi.KtFunction
+import org.jetbrains.kotlin.psi.KtLambdaExpression
+import org.jetbrains.kotlin.psi.KtParameter
+import org.jetbrains.kotlin.psi.KtSimpleNameExpression
+import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
+import org.jetbrains.kotlin.psi.psiUtil.isAncestor
 import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.ULambdaExpression
 import org.jetbrains.uast.resolveToUElement
+import org.jetbrains.uast.toUElement
 
 /**
  * @return whether the resolved declaration for this call expression is an inline function
@@ -43,3 +50,123 @@
             else -> false
         }
     }
+
+/**
+ * Returns a list of unreferenced parameters in [this]. If no parameters have been specified, but
+ * there is an implicit `it` parameter, this will return a list containing an
+ * [UnreferencedParameter] with `it` as the name.
+ */
+fun ULambdaExpression.findUnreferencedParameters(): List<UnreferencedParameter> {
+    val lambdaExpression = sourcePsi as? KtLambdaExpression ?: return emptyList()
+    return LambdaParameterVisitor(lambdaExpression).findUnreferencedParameters()
+}
+
+/**
+ * Helper class that visits references inside [lambda], calculating what parameters within
+ * [lambda] are unreferenced inside the expression.
+ */
+private class LambdaParameterVisitor(private val lambda: KtLambdaExpression) {
+    private val ItName = "it"
+
+    /**
+     * Returns a list of [UnreferencedParameter]s inside [lambda]. Inner lambdas are checked to
+     * ensure that they are not shadowing a parameter name, as a reference inside a shadowed lambda
+     * will refer to that lambda's parameter, and not the outer parameter.
+     *
+     * If no parameters have been specified, but there is an implicit `it` parameter, this will
+     * return a list containing an [UnreferencedParameter] with `it` as the name.
+     */
+    fun findUnreferencedParameters(): List<UnreferencedParameter> {
+        // If there is an implicit `it` parameter, we only want to look for "it". There is no value
+        // for parameter, since there is no corresponding declaration in the function literal.
+        return if (lambda.hasImplicitItParameter) {
+            if (isParameterReferenced(ItName)) {
+                emptyList()
+            } else {
+                listOf(UnreferencedParameter(ItName, null))
+            }
+        } else {
+            // Otherwise, look for all named, non-destructured parameters
+            lambda.valueParameters
+                // Ignore parameters with a destructuring declaration instead of a named parameter
+                .filter {
+                    it.destructuringDeclaration == null
+                }
+                // Ignore referenced parameters
+                .filterNot {
+                    isParameterReferenced(it.name!!)
+                }
+                // Return an UnreferencedParameters for each un-referenced parameter
+                .map { UnreferencedParameter(it.name!!, it) }
+        }
+    }
+
+    private fun isParameterReferenced(name: String): Boolean {
+        val matchingReferences = references.filter { it.getReferencedName() == name }
+
+        // Fast return if there is no reference
+        if (matchingReferences.isEmpty()) return false
+
+        // Find lambdas that shadow this parameter name, to make sure that they aren't shadowing
+        // the references we are looking through
+        val lambdasWithMatchingParameterName = innerLambdas.filter { innerLambda ->
+            // If the lambda has an implicit it parameter, it will shadow the outer parameter if
+            // the outer parameter also has an implicit it parameter (its name is "it").
+            if (innerLambda.hasImplicitItParameter) {
+                name == ItName
+            } else {
+                // Otherwise look to see if any of the parameters on the inner lambda have the
+                // same name
+                innerLambda.valueParameters
+                    // Ignore parameters with a destructuring declaration instead of a named
+                    // parameter
+                    .filter {
+                        it.destructuringDeclaration == null
+                    }
+                    .any { it.name == name }
+            }
+        }
+
+        // The parameter is referenced if there is at least one reference that isn't shadowed by an
+        // inner lambda
+        return matchingReferences.any { reference ->
+            lambdasWithMatchingParameterName.none { it.isAncestor(reference) }
+        }
+    }
+
+    private val references by lazy {
+        lambda.functionLiteral.collectDescendantsOfType<KtSimpleNameExpression>()
+    }
+    private val innerLambdas by lazy {
+        lambda.functionLiteral.collectDescendantsOfType<KtLambdaExpression>()
+    }
+}
+
+/**
+ * Represents an unreferenced parameter.
+ *
+ * @property name the name of the parameter - if the parameter is an implicit `it` parameter,
+ * this will be "it"
+ * @property parameter the parameter that is not referenced - can be null if the parameter is an
+ * implicit `it` parameter
+ */
+class UnreferencedParameter(
+    val name: String,
+    val parameter: KtParameter?
+)
+
+/**
+ * Returns whether this lambda expression has an implicit `it` parameter - meaning it has
+ * one parameter, and the parameter is not named explicitly.
+ */
+private val KtLambdaExpression.hasImplicitItParameter: Boolean
+    get() {
+        return when {
+            // There is already a parameter specified explicitly
+            functionLiteral.hasParameterSpecification() -> false
+            // There are either no parameters, or more than 1 parameter required for `it`
+            // to be allowed
+            (toUElement() as? ULambdaExpression)?.valueParameters?.size != 1 -> false
+            else -> true
+        }
+    }

compose/lint/common/src/main/java/androidx/compose/lint/Names.kt

diff --git a/compose/lint/common/src/main/java/androidx/compose/lint/Names.kt b/compose/lint/common/src/main/java/androidx/compose/lint/Names.kt
index 4ff61a8..0c50d08 100644
--- a/compose/lint/common/src/main/java/androidx/compose/lint/Names.kt
+++ b/compose/lint/common/src/main/java/androidx/compose/lint/Names.kt
@@ -22,11 +22,17 @@
  * Contains common names used for lint checks.
  */
 object Names {
+    object AnimationCore {
+        val PackageName = Package("androidx.compose.animation.core")
+    }
     object Runtime {
         val PackageName = Package("androidx.compose.runtime")
 
         val Composable = Name(PackageName, "Composable")
         val CompositionLocal = Name(PackageName, "CompositionLocal")
+        val MutableStateOf = Name(PackageName, "mutableStateOf")
+        val MutableStateListOf = Name(PackageName, "mutableStateListOf")
+        val MutableStateMapOf = Name(PackageName, "mutableStateMapOf")
         val Remember = Name(PackageName, "remember")
     }
     object Ui {

compose/lint/common/src/main/java/androidx/compose/lint/Stubs.kt

diff --git a/compose/lint/common/src/main/java/androidx/compose/lint/Stubs.kt b/compose/lint/common/src/main/java/androidx/compose/lint/Stubs.kt
index 05695f4..08bd13e 100644
--- a/compose/lint/common/src/main/java/androidx/compose/lint/Stubs.kt
+++ b/compose/lint/common/src/main/java/androidx/compose/lint/Stubs.kt
@@ -128,6 +128,22 @@
         ): V = calculation()
         """
     )
+
+    val MutableState = stub(
+        """
+        package androidx.compose.runtime
+
+        fun <T> mutableStateOf(value: T) = MutableState<T>()
+
+        class MutableState<T>
+
+        fun <T> mutableStateListOf() = SnapshotStateList<T>()
+        class SnapshotStateList<T>
+
+        fun <K, V> mutableStateMapOf() = SnapshotStateMap<K, V>()
+        class SnapshotStateMap<K, V>
+        """
+    )
 }
 
 // @Language isn't available as a type annotation, so we need a parameter

compose/material/material-icons-core/api/1.0.0-beta04.txt

diff --git a/compose/material/material-icons-core/api/1.0.0-beta04.txt b/compose/material/material-icons-core/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..a6db2fd
--- /dev/null
+++ b/compose/material/material-icons-core/api/1.0.0-beta04.txt
@@ -0,0 +1,1036 @@
+// Signature format: 4.0
+package androidx.compose.material.icons {
+
+  public final class Icons {
+    method public androidx.compose.material.icons.Icons.Filled getDefault();
+    property public final androidx.compose.material.icons.Icons.Filled Default;
+    field public static final androidx.compose.material.icons.Icons INSTANCE;
+  }
+
+  public static final class Icons.Filled {
+    field public static final androidx.compose.material.icons.Icons.Filled INSTANCE;
+  }
+
+  public static final class Icons.Outlined {
+    field public static final androidx.compose.material.icons.Icons.Outlined INSTANCE;
+  }
+
+  public static final class Icons.Rounded {
+    field public static final androidx.compose.material.icons.Icons.Rounded INSTANCE;
+  }
+
+  public static final class Icons.Sharp {
+    field public static final androidx.compose.material.icons.Icons.Sharp INSTANCE;
+  }
+
+  public static final class Icons.TwoTone {
+    field public static final androidx.compose.material.icons.Icons.TwoTone INSTANCE;
+  }
+
+  public final class IconsKt {
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector materialIcon(String name, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,androidx.compose.ui.graphics.vector.ImageVector.Builder> block);
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder materialPath(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional float fillAlpha, optional float strokeAlpha, optional androidx.compose.ui.graphics.PathFillType pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+}
+
+package androidx.compose.material.icons.filled {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Filled);
+  }
+
+}
+
+package androidx.compose.material.icons.outlined {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+}
+
+package androidx.compose.material.icons.rounded {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+}
+
+package androidx.compose.material.icons.sharp {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+}
+
+package androidx.compose.material.icons.twotone {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+}
+

compose/material/material-icons-core/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/material/material-icons-core/api/public_plus_experimental_1.0.0-beta04.txt b/compose/material/material-icons-core/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..a6db2fd
--- /dev/null
+++ b/compose/material/material-icons-core/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,1036 @@
+// Signature format: 4.0
+package androidx.compose.material.icons {
+
+  public final class Icons {
+    method public androidx.compose.material.icons.Icons.Filled getDefault();
+    property public final androidx.compose.material.icons.Icons.Filled Default;
+    field public static final androidx.compose.material.icons.Icons INSTANCE;
+  }
+
+  public static final class Icons.Filled {
+    field public static final androidx.compose.material.icons.Icons.Filled INSTANCE;
+  }
+
+  public static final class Icons.Outlined {
+    field public static final androidx.compose.material.icons.Icons.Outlined INSTANCE;
+  }
+
+  public static final class Icons.Rounded {
+    field public static final androidx.compose.material.icons.Icons.Rounded INSTANCE;
+  }
+
+  public static final class Icons.Sharp {
+    field public static final androidx.compose.material.icons.Icons.Sharp INSTANCE;
+  }
+
+  public static final class Icons.TwoTone {
+    field public static final androidx.compose.material.icons.Icons.TwoTone INSTANCE;
+  }
+
+  public final class IconsKt {
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector materialIcon(String name, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,androidx.compose.ui.graphics.vector.ImageVector.Builder> block);
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder materialPath(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional float fillAlpha, optional float strokeAlpha, optional androidx.compose.ui.graphics.PathFillType pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+}
+
+package androidx.compose.material.icons.filled {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Filled);
+  }
+
+}
+
+package androidx.compose.material.icons.outlined {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+}
+
+package androidx.compose.material.icons.rounded {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+}
+
+package androidx.compose.material.icons.sharp {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+}
+
+package androidx.compose.material.icons.twotone {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+}
+

compose/material/material-icons-core/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/material/material-icons-core/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/material/material-icons-core/api/res-1.0.0-beta04.txt

compose/material/material-icons-core/api/restricted_1.0.0-beta04.txt

diff --git a/compose/material/material-icons-core/api/restricted_1.0.0-beta04.txt b/compose/material/material-icons-core/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..0ea558f
--- /dev/null
+++ b/compose/material/material-icons-core/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,1037 @@
+// Signature format: 4.0
+package androidx.compose.material.icons {
+
+  public final class Icons {
+    method public androidx.compose.material.icons.Icons.Filled getDefault();
+    property public final androidx.compose.material.icons.Icons.Filled Default;
+    field public static final androidx.compose.material.icons.Icons INSTANCE;
+  }
+
+  public static final class Icons.Filled {
+    field public static final androidx.compose.material.icons.Icons.Filled INSTANCE;
+  }
+
+  public static final class Icons.Outlined {
+    field public static final androidx.compose.material.icons.Icons.Outlined INSTANCE;
+  }
+
+  public static final class Icons.Rounded {
+    field public static final androidx.compose.material.icons.Icons.Rounded INSTANCE;
+  }
+
+  public static final class Icons.Sharp {
+    field public static final androidx.compose.material.icons.Icons.Sharp INSTANCE;
+  }
+
+  public static final class Icons.TwoTone {
+    field public static final androidx.compose.material.icons.Icons.TwoTone INSTANCE;
+  }
+
+  public final class IconsKt {
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector materialIcon(String name, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,androidx.compose.ui.graphics.vector.ImageVector.Builder> block);
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder materialPath(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional float fillAlpha, optional float strokeAlpha, optional androidx.compose.ui.graphics.PathFillType pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+    field @kotlin.PublishedApi internal static final float MaterialIconDimension = 24.0f;
+  }
+
+}
+
+package androidx.compose.material.icons.filled {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Filled);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Filled);
+  }
+
+}
+
+package androidx.compose.material.icons.outlined {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Outlined);
+  }
+
+}
+
+package androidx.compose.material.icons.rounded {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Rounded);
+  }
+
+}
+
+package androidx.compose.material.icons.sharp {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Sharp);
+  }
+
+}
+
+package androidx.compose.material.icons.twotone {
+
+  public final class AccountBoxKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class BuildKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CallKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ClearKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CloseKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class CreateKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class DoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class EditKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class EmailKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class FaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class HomeKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class InfoKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ListKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class LockKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class MenuKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PersonKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class SearchKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class SendKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShareKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class StarKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+  public final class WarningKt {
+    method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.TwoTone);
+  }
+
+}
+

compose/material/material-ripple/api/1.0.0-beta04.txt

diff --git a/compose/material/material-ripple/api/1.0.0-beta04.txt b/compose/material/material-ripple/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..3e18f6d
--- /dev/null
+++ b/compose/material/material-ripple/api/1.0.0-beta04.txt
@@ -0,0 +1,39 @@
+// Signature format: 4.0
+package androidx.compose.material.ripple {
+
+  @androidx.compose.runtime.Immutable public final class RippleAlpha {
+    ctor public RippleAlpha(float draggedAlpha, float focusedAlpha, float hoveredAlpha, float pressedAlpha);
+    method public float getDraggedAlpha();
+    method public float getFocusedAlpha();
+    method public float getHoveredAlpha();
+    method public float getPressedAlpha();
+    property public final float draggedAlpha;
+    property public final float focusedAlpha;
+    property public final float hoveredAlpha;
+    property public final float pressedAlpha;
+  }
+
+  public final class RippleAnimationKt {
+  }
+
+  public final class RippleKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple-aOO63xs(optional boolean bounded, optional float radius, optional long color);
+  }
+
+  public interface RippleTheme {
+    method @androidx.compose.runtime.Composable public long defaultColor-0d7_KjU();
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ripple.RippleAlpha rippleAlpha();
+    field public static final androidx.compose.material.ripple.RippleTheme.Companion Companion;
+  }
+
+  public static final class RippleTheme.Companion {
+    method public androidx.compose.material.ripple.RippleAlpha defaultRippleAlpha-QZCes2I(long contentColor, boolean lightTheme);
+    method public long defaultRippleColor-QZCes2I(long contentColor, boolean lightTheme);
+  }
+
+  public final class RippleThemeKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ripple.RippleTheme> getLocalRippleTheme();
+  }
+
+}
+

compose/material/material-ripple/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/material/material-ripple/api/public_plus_experimental_1.0.0-beta04.txt b/compose/material/material-ripple/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..3e18f6d
--- /dev/null
+++ b/compose/material/material-ripple/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,39 @@
+// Signature format: 4.0
+package androidx.compose.material.ripple {
+
+  @androidx.compose.runtime.Immutable public final class RippleAlpha {
+    ctor public RippleAlpha(float draggedAlpha, float focusedAlpha, float hoveredAlpha, float pressedAlpha);
+    method public float getDraggedAlpha();
+    method public float getFocusedAlpha();
+    method public float getHoveredAlpha();
+    method public float getPressedAlpha();
+    property public final float draggedAlpha;
+    property public final float focusedAlpha;
+    property public final float hoveredAlpha;
+    property public final float pressedAlpha;
+  }
+
+  public final class RippleAnimationKt {
+  }
+
+  public final class RippleKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple-aOO63xs(optional boolean bounded, optional float radius, optional long color);
+  }
+
+  public interface RippleTheme {
+    method @androidx.compose.runtime.Composable public long defaultColor-0d7_KjU();
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ripple.RippleAlpha rippleAlpha();
+    field public static final androidx.compose.material.ripple.RippleTheme.Companion Companion;
+  }
+
+  public static final class RippleTheme.Companion {
+    method public androidx.compose.material.ripple.RippleAlpha defaultRippleAlpha-QZCes2I(long contentColor, boolean lightTheme);
+    method public long defaultRippleColor-QZCes2I(long contentColor, boolean lightTheme);
+  }
+
+  public final class RippleThemeKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ripple.RippleTheme> getLocalRippleTheme();
+  }
+
+}
+

compose/material/material-ripple/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/material/material-ripple/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/material/material-ripple/api/res-1.0.0-beta04.txt

compose/material/material-ripple/api/restricted_1.0.0-beta04.txt

diff --git a/compose/material/material-ripple/api/restricted_1.0.0-beta04.txt b/compose/material/material-ripple/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..3e18f6d
--- /dev/null
+++ b/compose/material/material-ripple/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,39 @@
+// Signature format: 4.0
+package androidx.compose.material.ripple {
+
+  @androidx.compose.runtime.Immutable public final class RippleAlpha {
+    ctor public RippleAlpha(float draggedAlpha, float focusedAlpha, float hoveredAlpha, float pressedAlpha);
+    method public float getDraggedAlpha();
+    method public float getFocusedAlpha();
+    method public float getHoveredAlpha();
+    method public float getPressedAlpha();
+    property public final float draggedAlpha;
+    property public final float focusedAlpha;
+    property public final float hoveredAlpha;
+    property public final float pressedAlpha;
+  }
+
+  public final class RippleAnimationKt {
+  }
+
+  public final class RippleKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple-aOO63xs(optional boolean bounded, optional float radius, optional long color);
+  }
+
+  public interface RippleTheme {
+    method @androidx.compose.runtime.Composable public long defaultColor-0d7_KjU();
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ripple.RippleAlpha rippleAlpha();
+    field public static final androidx.compose.material.ripple.RippleTheme.Companion Companion;
+  }
+
+  public static final class RippleTheme.Companion {
+    method public androidx.compose.material.ripple.RippleAlpha defaultRippleAlpha-QZCes2I(long contentColor, boolean lightTheme);
+    method public long defaultRippleColor-QZCes2I(long contentColor, boolean lightTheme);
+  }
+
+  public final class RippleThemeKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ripple.RippleTheme> getLocalRippleTheme();
+  }
+
+}
+

compose/material/material/api/1.0.0-beta04.txt

diff --git a/compose/material/material/api/1.0.0-beta04.txt b/compose/material/material/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..c630e0c
--- /dev/null
+++ b/compose/material/material/api/1.0.0-beta04.txt
@@ -0,0 +1,640 @@
+// Signature format: 4.0
+package androidx.compose.material {
+
+  public final class AlertDialogKt {
+  }
+
+  public final class AndroidAlertDialog_androidKt {
+    method @androidx.compose.runtime.Composable public static void AlertDialog--HzSArw(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+    method @androidx.compose.runtime.Composable public static void AlertDialog-PPVLV-g(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+  }
+
+  public final class AndroidMenu_androidKt {
+    method @androidx.compose.runtime.Composable public static void DropdownMenu-jyMeD6A(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional long offset, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void DropdownMenuItem(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  public final class AppBarDefaults {
+    method public float getBottomAppBarElevation-D9Ej5fM();
+    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+    method public float getTopAppBarElevation-D9Ej5fM();
+    property public final float BottomAppBarElevation;
+    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public final float TopAppBarElevation;
+    field public static final androidx.compose.material.AppBarDefaults INSTANCE;
+  }
+
+  public final class AppBarKt {
+    method @androidx.compose.runtime.Composable public static void BottomAppBar-EMTaL0E(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.graphics.Shape? cutoutShape, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void TopAppBar-QjfF_Us(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void TopAppBar-_azMXew(kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? navigationIcon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> actions, optional long backgroundColor, optional long contentColor, optional float elevation);
+  }
+
+  public final class BackdropScaffoldDefaults {
+    method public float getFrontLayerElevation-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public long getFrontLayerScrimColor-0d7_KjU();
+    method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.Shape getFrontLayerShape();
+    method public float getHeaderHeight-D9Ej5fM();
+    method public float getPeekHeight-D9Ej5fM();
+    property public final float FrontLayerElevation;
+    property public final float HeaderHeight;
+    property public final float PeekHeight;
+    property @androidx.compose.runtime.Composable public final long frontLayerScrimColor;
+    property @androidx.compose.runtime.Composable public final androidx.compose.ui.graphics.Shape frontLayerShape;
+    field public static final androidx.compose.material.BackdropScaffoldDefaults INSTANCE;
+  }
+
+  public final class BackdropScaffoldKt {
+  }
+
+  public final class BottomDrawerState {
+    ctor public BottomDrawerState(androidx.compose.material.BottomDrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+    method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? expand(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public final T! getCurrentValue();
+    method public final float getDirection();
+    method public final androidx.compose.runtime.State<java.lang.Float> getOffset();
+    method public final androidx.compose.runtime.State<java.lang.Float> getOverflow();
+    method public final T! getTargetValue();
+    method public final boolean isAnimationRunning();
+    method public boolean isClosed();
+    method public boolean isExpanded();
+    method public boolean isOpen();
+    method public suspend Object? open(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public final float performDrag(float delta);
+    method public final suspend Object? performFling(float velocity, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final boolean isClosed;
+    property public final boolean isExpanded;
+    property public final boolean isOpen;
+    field public static final androidx.compose.material.BottomDrawerState.Companion Companion;
+  }
+
+  public static final class BottomDrawerState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.BottomDrawerState,androidx.compose.material.BottomDrawerValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  public enum BottomDrawerValue {
+    enum_constant public static final androidx.compose.material.BottomDrawerValue Closed;
+    enum_constant public static final androidx.compose.material.BottomDrawerValue Expanded;
+    enum_constant public static final androidx.compose.material.BottomDrawerValue Open;
+  }
+
+  public final class BottomNavigationDefaults {
+    method public float getElevation-D9Ej5fM();
+    property public final float Elevation;
+    field public static final androidx.compose.material.BottomNavigationDefaults INSTANCE;
+  }
+
+  public final class BottomNavigationKt {
+    method @androidx.compose.runtime.Composable public static void BottomNavigation-ye6PvEY(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void BottomNavigationItem-g7W06kY(androidx.compose.foundation.layout.RowScope, boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional boolean alwaysShowLabel, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+  }
+
+  public final class BottomSheetScaffoldDefaults {
+    method public float getSheetElevation-D9Ej5fM();
+    method public float getSheetPeekHeight-D9Ej5fM();
+    property public final float SheetElevation;
+    property public final float SheetPeekHeight;
+    field public static final androidx.compose.material.BottomSheetScaffoldDefaults INSTANCE;
+  }
+
+  public final class BottomSheetScaffoldKt {
+  }
+
+  @androidx.compose.runtime.Stable public interface ButtonColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+  }
+
+  public final class ButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors buttonColors-nlx5xbs(optional long backgroundColor, optional long contentColor, optional long disabledBackgroundColor, optional long disabledContentColor);
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonElevation elevation-qYQSm_w(optional float defaultElevation, optional float pressedElevation, optional float disabledElevation);
+    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+    method public float getIconSize-D9Ej5fM();
+    method public float getIconSpacing-D9Ej5fM();
+    method public float getMinHeight-D9Ej5fM();
+    method public float getMinWidth-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public androidx.compose.foundation.BorderStroke getOutlinedBorder();
+    method public float getOutlinedBorderSize-D9Ej5fM();
+    method public androidx.compose.foundation.layout.PaddingValues getTextButtonContentPadding();
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors outlinedButtonColors-xS_xkl8(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors textButtonColors-xS_xkl8(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public final float IconSize;
+    property public final float IconSpacing;
+    property public final float MinHeight;
+    property public final float MinWidth;
+    property public final float OutlinedBorderSize;
+    property public final androidx.compose.foundation.layout.PaddingValues TextButtonContentPadding;
+    property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
+    field public static final androidx.compose.material.ButtonDefaults INSTANCE;
+    field public static final float OutlinedBorderOpacity = 0.12f;
+  }
+
+  @androidx.compose.runtime.Stable public interface ButtonElevation {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(boolean enabled, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+  }
+
+  public final class ButtonKt {
+    method @androidx.compose.runtime.Composable public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void OutlinedButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void TextButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  public final class CardKt {
+    method @androidx.compose.runtime.Composable public static void Card-IHU7g64(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Stable public interface CheckboxColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> borderColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> boxColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> checkmarkColor(androidx.compose.ui.state.ToggleableState state);
+  }
+
+  public final class CheckboxDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.CheckboxColors colors-QGkLkJU(optional long checkedColor, optional long uncheckedColor, optional long checkmarkColor, optional long disabledColor, optional long disabledIndeterminateColor);
+    field public static final androidx.compose.material.CheckboxDefaults INSTANCE;
+  }
+
+  public final class CheckboxKt {
+    method @androidx.compose.runtime.Composable public static void Checkbox(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+    method @androidx.compose.runtime.Composable public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+  }
+
+  @androidx.compose.runtime.Stable public final class Colors {
+    method public androidx.compose.material.Colors copy-7EMdAJ8(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError, optional boolean isLight);
+    method public long getBackground-0d7_KjU();
+    method public long getError-0d7_KjU();
+    method public long getOnBackground-0d7_KjU();
+    method public long getOnError-0d7_KjU();
+    method public long getOnPrimary-0d7_KjU();
+    method public long getOnSecondary-0d7_KjU();
+    method public long getOnSurface-0d7_KjU();
+    method public long getPrimary-0d7_KjU();
+    method public long getPrimaryVariant-0d7_KjU();
+    method public long getSecondary-0d7_KjU();
+    method public long getSecondaryVariant-0d7_KjU();
+    method public long getSurface-0d7_KjU();
+    method public boolean isLight();
+    property public final long background;
+    property public final long error;
+    property public final boolean isLight;
+    property public final long onBackground;
+    property public final long onError;
+    property public final long onPrimary;
+    property public final long onSecondary;
+    property public final long onSurface;
+    property public final long primary;
+    property public final long primaryVariant;
+    property public final long secondary;
+    property public final long secondaryVariant;
+    property public final long surface;
+  }
+
+  public final class ColorsKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long contentColorFor-8_81llA(long backgroundColor);
+    method public static long contentColorFor-pz-ABmo(androidx.compose.material.Colors, long backgroundColor);
+    method public static androidx.compose.material.Colors darkColors-hW7iGhc(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+    method public static long getPrimarySurface(androidx.compose.material.Colors);
+    method public static androidx.compose.material.Colors lightColors-hW7iGhc(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+  }
+
+  public final class ContentAlpha {
+    method @androidx.compose.runtime.Composable public float getDisabled();
+    method @androidx.compose.runtime.Composable public float getHigh();
+    method @androidx.compose.runtime.Composable public float getMedium();
+    property @androidx.compose.runtime.Composable public final float disabled;
+    property @androidx.compose.runtime.Composable public final float high;
+    property @androidx.compose.runtime.Composable public final float medium;
+    field public static final androidx.compose.material.ContentAlpha INSTANCE;
+  }
+
+  public final class ContentAlphaKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> getLocalContentAlpha();
+  }
+
+  public final class ContentColorKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
+  }
+
+  public enum DismissDirection {
+    enum_constant public static final androidx.compose.material.DismissDirection EndToStart;
+    enum_constant public static final androidx.compose.material.DismissDirection StartToEnd;
+  }
+
+  public enum DismissValue {
+    enum_constant public static final androidx.compose.material.DismissValue Default;
+    enum_constant public static final androidx.compose.material.DismissValue DismissedToEnd;
+    enum_constant public static final androidx.compose.material.DismissValue DismissedToStart;
+  }
+
+  public final class DividerKt {
+    method @androidx.compose.runtime.Composable public static void Divider-JRSVyrs(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
+  }
+
+  public final class DrawerDefaults {
+    method public float getElevation-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public long getScrimColor-0d7_KjU();
+    property public final float Elevation;
+    property @androidx.compose.runtime.Composable public final long scrimColor;
+    field public static final androidx.compose.material.DrawerDefaults INSTANCE;
+    field public static final float ScrimOpacity = 0.32f;
+  }
+
+  public final class DrawerKt {
+    method @androidx.compose.runtime.Composable public static void ModalDrawer-TlzqArY(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.DrawerState drawerState, optional boolean gesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static androidx.compose.material.BottomDrawerState rememberBottomDrawerState(androidx.compose.material.BottomDrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+    method @androidx.compose.runtime.Composable public static androidx.compose.material.DrawerState rememberDrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  @androidx.compose.runtime.Stable public final class DrawerState {
+    ctor public DrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+    method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public final T! getCurrentValue();
+    method public final float getDirection();
+    method public final androidx.compose.runtime.State<java.lang.Float> getOffset();
+    method public final androidx.compose.runtime.State<java.lang.Float> getOverflow();
+    method public final T! getTargetValue();
+    method public final boolean isAnimationRunning();
+    method public boolean isClosed();
+    method public boolean isOpen();
+    method public suspend Object? open(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public final float performDrag(float delta);
+    method public final suspend Object? performFling(float velocity, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final boolean isClosed;
+    property public final boolean isOpen;
+    field public static final androidx.compose.material.DrawerState.Companion Companion;
+  }
+
+  public static final class DrawerState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.DrawerState,androidx.compose.material.DrawerValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  public enum DrawerValue {
+    enum_constant public static final androidx.compose.material.DrawerValue Closed;
+    enum_constant public static final androidx.compose.material.DrawerValue Open;
+  }
+
+  public final class ElevationKt {
+  }
+
+  public interface ElevationOverlay {
+    method @androidx.compose.runtime.Composable public long apply-_fH6D24(long color, float elevation);
+  }
+
+  public final class ElevationOverlayKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteElevation();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ElevationOverlay> getLocalElevationOverlay();
+  }
+
+  public enum FabPosition {
+    enum_constant public static final androidx.compose.material.FabPosition Center;
+    enum_constant public static final androidx.compose.material.FabPosition End;
+  }
+
+  public final class FloatingActionButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.FloatingActionButtonElevation elevation-ioHfwGI(optional float defaultElevation, optional float pressedElevation);
+    field public static final androidx.compose.material.FloatingActionButtonDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Stable public interface FloatingActionButtonElevation {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+  }
+
+  public final class FloatingActionButtonKt {
+    method @androidx.compose.runtime.Composable public static void ExtendedFloatingActionButton-opHSmBI(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation);
+    method @androidx.compose.runtime.Composable public static void FloatingActionButton-n9X6i6U(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class IconButtonKt {
+    method @androidx.compose.runtime.Composable public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void IconToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class IconKt {
+    method @androidx.compose.runtime.Composable public static void Icon-8NTYWNk(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+    method @androidx.compose.runtime.Composable public static void Icon-BG621w0(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+    method @androidx.compose.runtime.Composable public static void Icon-hGAziDE(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+  }
+
+  public final class ListItemKt {
+  }
+
+  public final class MaterialTextSelectionColorsKt {
+  }
+
+  public final class MaterialTheme {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Typography getTypography();
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Colors colors;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Shapes shapes;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Typography typography;
+    field public static final androidx.compose.material.MaterialTheme INSTANCE;
+  }
+
+  public final class MaterialThemeKt {
+    method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class MenuDefaults {
+    method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
+    property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
+    field public static final androidx.compose.material.MenuDefaults INSTANCE;
+  }
+
+  public final class MenuKt {
+  }
+
+  public final class ModalBottomSheetDefaults {
+    method public float getElevation-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public long getScrimColor-0d7_KjU();
+    property public final float Elevation;
+    property @androidx.compose.runtime.Composable public final long scrimColor;
+    field public static final androidx.compose.material.ModalBottomSheetDefaults INSTANCE;
+  }
+
+  public final class ModalBottomSheetKt {
+  }
+
+  public final class OutlinedTextFieldKt {
+    method @androidx.compose.runtime.Composable public static void OutlinedTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.TextFieldColors colors);
+    method @androidx.compose.runtime.Composable public static void OutlinedTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.TextFieldColors colors);
+  }
+
+  public final class ProgressIndicatorDefaults {
+    method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
+    method public float getStrokeWidth-D9Ej5fM();
+    property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
+    property public final float StrokeWidth;
+    field public static final androidx.compose.material.ProgressIndicatorDefaults INSTANCE;
+    field public static final float IndicatorBackgroundOpacity = 0.24f;
+  }
+
+  public final class ProgressIndicatorKt {
+    method @androidx.compose.runtime.Composable public static void CircularProgressIndicator-vFL-O2w(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+    method @androidx.compose.runtime.Composable public static void CircularProgressIndicator-y0SQU_c(optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+    method @androidx.compose.runtime.Composable public static void LinearProgressIndicator-BeBJghs(optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+    method @androidx.compose.runtime.Composable public static void LinearProgressIndicator-kLDug40(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+  }
+
+  @androidx.compose.runtime.Stable public interface RadioButtonColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> radioColor(boolean enabled, boolean selected);
+  }
+
+  public final class RadioButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.RadioButtonColors colors-xS_xkl8(optional long selectedColor, optional long unselectedColor, optional long disabledColor);
+    field public static final androidx.compose.material.RadioButtonDefaults INSTANCE;
+  }
+
+  public final class RadioButtonKt {
+    method @androidx.compose.runtime.Composable public static void RadioButton(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.RadioButtonColors colors);
+  }
+
+  @androidx.compose.runtime.Immutable public final class ResistanceConfig {
+    ctor public ResistanceConfig(float basis, optional float factorAtMin, optional float factorAtMax);
+    method public float computeResistance(float overflow);
+    method public float getBasis();
+    method public float getFactorAtMax();
+    method public float getFactorAtMin();
+    property public final float basis;
+    property public final float factorAtMax;
+    property public final float factorAtMin;
+  }
+
+  public final class ScaffoldKt {
+    method @androidx.compose.runtime.Composable public static void Scaffold-axyFlp8(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.ScaffoldState scaffoldState, optional kotlin.jvm.functions.Function0<kotlin.Unit> topBar, optional kotlin.jvm.functions.Function0<kotlin.Unit> bottomBar, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarHostState,kotlin.Unit> snackbarHost, optional kotlin.jvm.functions.Function0<kotlin.Unit> floatingActionButton, optional androidx.compose.material.FabPosition floatingActionButtonPosition, optional boolean isFloatingActionButtonDocked, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? drawerContent, optional boolean drawerGesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long drawerScrimColor, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.PaddingValues,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static androidx.compose.material.ScaffoldState rememberScaffoldState(optional androidx.compose.material.DrawerState drawerState, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+  }
+
+  @androidx.compose.runtime.Stable public final class ScaffoldState {
+    ctor public ScaffoldState(androidx.compose.material.DrawerState drawerState, androidx.compose.material.SnackbarHostState snackbarHostState);
+    method public androidx.compose.material.DrawerState getDrawerState();
+    method public androidx.compose.material.SnackbarHostState getSnackbarHostState();
+    property public final androidx.compose.material.DrawerState drawerState;
+    property public final androidx.compose.material.SnackbarHostState snackbarHostState;
+  }
+
+  @androidx.compose.runtime.Immutable public final class Shapes {
+    ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+    method public androidx.compose.material.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+    method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+    method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+    method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+    property public final androidx.compose.foundation.shape.CornerBasedShape large;
+    property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+    property public final androidx.compose.foundation.shape.CornerBasedShape small;
+  }
+
+  public final class ShapesKt {
+  }
+
+  @androidx.compose.runtime.Stable public interface SliderColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean active);
+  }
+
+  public final class SliderDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.SliderColors colors-kU-unao(optional long thumbColor, optional long disabledThumbColor, optional long activeTrackColor, optional long inactiveTrackColor, optional long disabledActiveTrackColor, optional long disabledInactiveTrackColor, optional long activeTickColor, optional long inactiveTickColor, optional long disabledActiveTickColor, optional long disabledInactiveTickColor);
+    field public static final float DisabledActiveTrackAlpha = 0.32f;
+    field public static final float DisabledInactiveTrackAlpha = 0.12f;
+    field public static final float DisabledTickAlpha = 0.12f;
+    field public static final androidx.compose.material.SliderDefaults INSTANCE;
+    field public static final float InactiveTrackAlpha = 0.24f;
+    field public static final float TickAlpha = 0.54f;
+  }
+
+  public final class SliderKt {
+    method @androidx.compose.runtime.Composable public static void Slider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onValueChangeFinished, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SliderColors colors);
+  }
+
+  public interface SnackbarData {
+    method public void dismiss();
+    method public String? getActionLabel();
+    method public androidx.compose.material.SnackbarDuration getDuration();
+    method public String getMessage();
+    method public void performAction();
+    property public abstract String? actionLabel;
+    property public abstract androidx.compose.material.SnackbarDuration duration;
+    property public abstract String message;
+  }
+
+  public final class SnackbarDefaults {
+    method @androidx.compose.runtime.Composable public long getBackgroundColor-0d7_KjU();
+    method @androidx.compose.runtime.Composable public long getPrimaryActionColor-0d7_KjU();
+    property @androidx.compose.runtime.Composable public final long backgroundColor;
+    property @androidx.compose.runtime.Composable public final long primaryActionColor;
+    field public static final androidx.compose.material.SnackbarDefaults INSTANCE;
+  }
+
+  public enum SnackbarDuration {
+    enum_constant public static final androidx.compose.material.SnackbarDuration Indefinite;
+    enum_constant public static final androidx.compose.material.SnackbarDuration Long;
+    enum_constant public static final androidx.compose.material.SnackbarDuration Short;
+  }
+
+  public final class SnackbarHostKt {
+    method @androidx.compose.runtime.Composable public static void SnackbarHost(androidx.compose.material.SnackbarHostState hostState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarData,kotlin.Unit> snackbar);
+  }
+
+  @androidx.compose.runtime.Stable public final class SnackbarHostState {
+    ctor public SnackbarHostState();
+    method public androidx.compose.material.SnackbarData? getCurrentSnackbarData();
+    method public suspend Object? showSnackbar(String message, optional String? actionLabel, optional androidx.compose.material.SnackbarDuration duration, optional kotlin.coroutines.Continuation<? super androidx.compose.material.SnackbarResult> p);
+    property public final androidx.compose.material.SnackbarData? currentSnackbarData;
+  }
+
+  public final class SnackbarKt {
+    method @androidx.compose.runtime.Composable public static void Snackbar-GiTsVJ0(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? action, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Snackbar-Ou9cdGU(androidx.compose.material.SnackbarData snackbarData, optional androidx.compose.ui.Modifier modifier, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional long actionColor, optional float elevation);
+  }
+
+  public enum SnackbarResult {
+    enum_constant public static final androidx.compose.material.SnackbarResult ActionPerformed;
+    enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
+  }
+
+  public final class SurfaceKt {
+    method @androidx.compose.runtime.Composable public static void Surface-IHU7g64(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class SwipeToDismissKt {
+  }
+
+  public final class SwipeableDefaults {
+    method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getAnimationSpec();
+    method public float getVelocityThreshold-D9Ej5fM();
+    method public androidx.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
+    property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+    property public final float VelocityThreshold;
+    field public static final androidx.compose.material.SwipeableDefaults INSTANCE;
+    field public static final float StandardResistanceFactor = 10.0f;
+    field public static final float StiffResistanceFactor = 20.0f;
+  }
+
+  public final class SwipeableKt {
+  }
+
+  @androidx.compose.runtime.Stable public interface SwitchColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
+  }
+
+  public final class SwitchDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.SwitchColors colors-R8aI8sA(optional long checkedThumbColor, optional long checkedTrackColor, optional float checkedTrackAlpha, optional long uncheckedThumbColor, optional long uncheckedTrackColor, optional float uncheckedTrackAlpha, optional long disabledCheckedThumbColor, optional long disabledCheckedTrackColor, optional long disabledUncheckedThumbColor, optional long disabledUncheckedTrackColor);
+    field public static final androidx.compose.material.SwitchDefaults INSTANCE;
+  }
+
+  public final class SwitchKt {
+    method @androidx.compose.runtime.Composable public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SwitchColors colors);
+  }
+
+  public final class TabKt {
+    method @androidx.compose.runtime.Composable public static void Tab-TC9MJzw(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+    method @androidx.compose.runtime.Composable public static void Tab-wUuQ7UU(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TabPosition {
+    method public float getLeft-D9Ej5fM();
+    method public float getRight-D9Ej5fM();
+    method public float getWidth-D9Ej5fM();
+    property public final float left;
+    property public final float right;
+    property public final float width;
+  }
+
+  public final class TabRowDefaults {
+    method @androidx.compose.runtime.Composable public void Divider-Z-uBYeE(optional androidx.compose.ui.Modifier modifier, optional float thickness, optional long color);
+    method @androidx.compose.runtime.Composable public void Indicator-Z-uBYeE(optional androidx.compose.ui.Modifier modifier, optional float height, optional long color);
+    method public float getDividerThickness-D9Ej5fM();
+    method public float getIndicatorHeight-D9Ej5fM();
+    method public float getScrollableTabRowPadding-D9Ej5fM();
+    method public androidx.compose.ui.Modifier tabIndicatorOffset(androidx.compose.ui.Modifier, androidx.compose.material.TabPosition currentTabPosition);
+    property public final float DividerThickness;
+    property public final float IndicatorHeight;
+    property public final float ScrollableTabRowPadding;
+    field public static final float DividerOpacity = 0.12f;
+    field public static final androidx.compose.material.TabRowDefaults INSTANCE;
+  }
+
+  public final class TabRowKt {
+    method @androidx.compose.runtime.Composable public static void ScrollableTabRow-qhCAd8w(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float edgePadding, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+    method @androidx.compose.runtime.Composable public static void TabRow-xUsefZ0(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+  }
+
+  @androidx.compose.runtime.Stable public interface TextFieldColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> cursorColor(boolean isError);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> indicatorColor(boolean enabled, boolean isError, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> labelColor(boolean enabled, boolean error, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> leadingIconColor(boolean enabled, boolean isError);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> placeholderColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> textColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trailingIconColor(boolean enabled, boolean isError);
+  }
+
+  public final class TextFieldDefaults {
+    method public float getMinHeight-D9Ej5fM();
+    method public float getMinWidth-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors outlinedTextFieldColors-LWDMS30(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedBorderColor, optional long unfocusedBorderColor, optional long disabledBorderColor, optional long errorBorderColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+    method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors textFieldColors-LWDMS30(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedIndicatorColor, optional long unfocusedIndicatorColor, optional long disabledIndicatorColor, optional long errorIndicatorColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+    property public final float MinHeight;
+    property public final float MinWidth;
+    field public static final float BackgroundOpacity = 0.12f;
+    field public static final androidx.compose.material.TextFieldDefaults INSTANCE;
+    field public static final float IconOpacity = 0.54f;
+    field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
+  }
+
+  public final class TextFieldImplKt {
+  }
+
+  public final class TextFieldKt {
+    method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+    method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+  }
+
+  public final class TextKt {
+    method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Text-TPAwlIA(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+    method @androidx.compose.runtime.Composable public static void Text-Vh6c2nE(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+  }
+
+  @androidx.compose.runtime.Immutable public final class Typography {
+    ctor public Typography(optional androidx.compose.ui.text.font.FontFamily defaultFontFamily, optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+    method public androidx.compose.material.Typography copy(optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+    method public androidx.compose.ui.text.TextStyle getBody1();
+    method public androidx.compose.ui.text.TextStyle getBody2();
+    method public androidx.compose.ui.text.TextStyle getButton();
+    method public androidx.compose.ui.text.TextStyle getCaption();
+    method public androidx.compose.ui.text.TextStyle getH1();
+    method public androidx.compose.ui.text.TextStyle getH2();
+    method public androidx.compose.ui.text.TextStyle getH3();
+    method public androidx.compose.ui.text.TextStyle getH4();
+    method public androidx.compose.ui.text.TextStyle getH5();
+    method public androidx.compose.ui.text.TextStyle getH6();
+    method public androidx.compose.ui.text.TextStyle getOverline();
+    method public androidx.compose.ui.text.TextStyle getSubtitle1();
+    method public androidx.compose.ui.text.TextStyle getSubtitle2();
+    property public final androidx.compose.ui.text.TextStyle body1;
+    property public final androidx.compose.ui.text.TextStyle body2;
+    property public final androidx.compose.ui.text.TextStyle button;
+    property public final androidx.compose.ui.text.TextStyle caption;
+    property public final androidx.compose.ui.text.TextStyle h1;
+    property public final androidx.compose.ui.text.TextStyle h2;
+    property public final androidx.compose.ui.text.TextStyle h3;
+    property public final androidx.compose.ui.text.TextStyle h4;
+    property public final androidx.compose.ui.text.TextStyle h5;
+    property public final androidx.compose.ui.text.TextStyle h6;
+    property public final androidx.compose.ui.text.TextStyle overline;
+    property public final androidx.compose.ui.text.TextStyle subtitle1;
+    property public final androidx.compose.ui.text.TextStyle subtitle2;
+  }
+
+  public final class TypographyKt {
+  }
+
+}
+

compose/material/material/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/material/material/api/public_plus_experimental_1.0.0-beta04.txt b/compose/material/material/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..2795abb
--- /dev/null
+++ b/compose/material/material/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,778 @@
+// Signature format: 4.0
+package androidx.compose.material {
+
+  public final class AlertDialogKt {
+  }
+
+  public final class AndroidAlertDialog_androidKt {
+    method @androidx.compose.runtime.Composable public static void AlertDialog--HzSArw(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+    method @androidx.compose.runtime.Composable public static void AlertDialog-PPVLV-g(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+  }
+
+  public final class AndroidMenu_androidKt {
+    method @androidx.compose.runtime.Composable public static void DropdownMenu-jyMeD6A(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional long offset, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void DropdownMenuItem(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  public final class AppBarDefaults {
+    method public float getBottomAppBarElevation-D9Ej5fM();
+    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+    method public float getTopAppBarElevation-D9Ej5fM();
+    property public final float BottomAppBarElevation;
+    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public final float TopAppBarElevation;
+    field public static final androidx.compose.material.AppBarDefaults INSTANCE;
+  }
+
+  public final class AppBarKt {
+    method @androidx.compose.runtime.Composable public static void BottomAppBar-EMTaL0E(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.graphics.Shape? cutoutShape, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void TopAppBar-QjfF_Us(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void TopAppBar-_azMXew(kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? navigationIcon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> actions, optional long backgroundColor, optional long contentColor, optional float elevation);
+  }
+
+  public final class BackdropScaffoldDefaults {
+    method public float getFrontLayerElevation-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public long getFrontLayerScrimColor-0d7_KjU();
+    method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.Shape getFrontLayerShape();
+    method public float getHeaderHeight-D9Ej5fM();
+    method public float getPeekHeight-D9Ej5fM();
+    property public final float FrontLayerElevation;
+    property public final float HeaderHeight;
+    property public final float PeekHeight;
+    property @androidx.compose.runtime.Composable public final long frontLayerScrimColor;
+    property @androidx.compose.runtime.Composable public final androidx.compose.ui.graphics.Shape frontLayerShape;
+    field public static final androidx.compose.material.BackdropScaffoldDefaults INSTANCE;
+  }
+
+  public final class BackdropScaffoldKt {
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void BackdropScaffold-hO0kuRE(kotlin.jvm.functions.Function0<kotlin.Unit> appBar, kotlin.jvm.functions.Function0<kotlin.Unit> backLayerContent, kotlin.jvm.functions.Function0<kotlin.Unit> frontLayerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.BackdropScaffoldState scaffoldState, optional boolean gesturesEnabled, optional float peekHeight, optional float headerHeight, optional boolean persistentAppBar, optional boolean stickyFrontLayer, optional long backLayerBackgroundColor, optional long backLayerContentColor, optional androidx.compose.ui.graphics.Shape frontLayerShape, optional float frontLayerElevation, optional long frontLayerBackgroundColor, optional long frontLayerContentColor, optional long frontLayerScrimColor, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarHostState,kotlin.Unit> snackbarHost);
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.BackdropScaffoldState rememberBackdropScaffoldState(androidx.compose.material.BackdropValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BackdropValue,java.lang.Boolean> confirmStateChange, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public final class BackdropScaffoldState extends androidx.compose.material.SwipeableState<androidx.compose.material.BackdropValue> {
+    ctor public BackdropScaffoldState(androidx.compose.material.BackdropValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BackdropValue,java.lang.Boolean> confirmStateChange, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+    method public suspend Object? conceal(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public androidx.compose.material.SnackbarHostState getSnackbarHostState();
+    method public boolean isConcealed();
+    method public boolean isRevealed();
+    method public suspend Object? reveal(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final boolean isConcealed;
+    property public final boolean isRevealed;
+    property public final androidx.compose.material.SnackbarHostState snackbarHostState;
+    field public static final androidx.compose.material.BackdropScaffoldState.Companion Companion;
+  }
+
+  public static final class BackdropScaffoldState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.BackdropScaffoldState,?> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.material.BackdropValue,java.lang.Boolean> confirmStateChange, androidx.compose.material.SnackbarHostState snackbarHostState);
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi public enum BackdropValue {
+    enum_constant public static final androidx.compose.material.BackdropValue Concealed;
+    enum_constant public static final androidx.compose.material.BackdropValue Revealed;
+  }
+
+  public final class BottomDrawerState extends androidx.compose.material.SwipeableState<androidx.compose.material.BottomDrawerValue> {
+    ctor public BottomDrawerState(androidx.compose.material.BottomDrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+    method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? expand(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public boolean isClosed();
+    method public boolean isExpanded();
+    method public boolean isOpen();
+    method public suspend Object? open(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final boolean isClosed;
+    property public final boolean isExpanded;
+    property public final boolean isOpen;
+    field public static final androidx.compose.material.BottomDrawerState.Companion Companion;
+  }
+
+  public static final class BottomDrawerState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.BottomDrawerState,androidx.compose.material.BottomDrawerValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  public enum BottomDrawerValue {
+    enum_constant public static final androidx.compose.material.BottomDrawerValue Closed;
+    enum_constant public static final androidx.compose.material.BottomDrawerValue Expanded;
+    enum_constant public static final androidx.compose.material.BottomDrawerValue Open;
+  }
+
+  public final class BottomNavigationDefaults {
+    method public float getElevation-D9Ej5fM();
+    property public final float Elevation;
+    field public static final androidx.compose.material.BottomNavigationDefaults INSTANCE;
+  }
+
+  public final class BottomNavigationKt {
+    method @androidx.compose.runtime.Composable public static void BottomNavigation-ye6PvEY(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void BottomNavigationItem-g7W06kY(androidx.compose.foundation.layout.RowScope, boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional boolean alwaysShowLabel, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+  }
+
+  public final class BottomSheetScaffoldDefaults {
+    method public float getSheetElevation-D9Ej5fM();
+    method public float getSheetPeekHeight-D9Ej5fM();
+    property public final float SheetElevation;
+    property public final float SheetPeekHeight;
+    field public static final androidx.compose.material.BottomSheetScaffoldDefaults INSTANCE;
+  }
+
+  public final class BottomSheetScaffoldKt {
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void BottomSheetScaffold-0Ttp7_s(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> sheetContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.BottomSheetScaffoldState scaffoldState, optional kotlin.jvm.functions.Function0<kotlin.Unit>? topBar, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarHostState,kotlin.Unit> snackbarHost, optional kotlin.jvm.functions.Function0<kotlin.Unit>? floatingActionButton, optional androidx.compose.material.FabPosition floatingActionButtonPosition, optional boolean sheetGesturesEnabled, optional androidx.compose.ui.graphics.Shape sheetShape, optional float sheetElevation, optional long sheetBackgroundColor, optional long sheetContentColor, optional float sheetPeekHeight, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? drawerContent, optional boolean drawerGesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long drawerScrimColor, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.PaddingValues,kotlin.Unit> content);
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.BottomSheetScaffoldState rememberBottomSheetScaffoldState(optional androidx.compose.material.DrawerState drawerState, optional androidx.compose.material.BottomSheetState bottomSheetState, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.BottomSheetState rememberBottomSheetState(androidx.compose.material.BottomSheetValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomSheetValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public final class BottomSheetScaffoldState {
+    ctor public BottomSheetScaffoldState(androidx.compose.material.DrawerState drawerState, androidx.compose.material.BottomSheetState bottomSheetState, androidx.compose.material.SnackbarHostState snackbarHostState);
+    method public androidx.compose.material.BottomSheetState getBottomSheetState();
+    method public androidx.compose.material.DrawerState getDrawerState();
+    method public androidx.compose.material.SnackbarHostState getSnackbarHostState();
+    property public final androidx.compose.material.BottomSheetState bottomSheetState;
+    property public final androidx.compose.material.DrawerState drawerState;
+    property public final androidx.compose.material.SnackbarHostState snackbarHostState;
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public final class BottomSheetState extends androidx.compose.material.SwipeableState<androidx.compose.material.BottomSheetValue> {
+    ctor public BottomSheetState(androidx.compose.material.BottomSheetValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomSheetValue,java.lang.Boolean> confirmStateChange);
+    method public suspend Object? collapse(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? expand(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public boolean isCollapsed();
+    method public boolean isExpanded();
+    property public final boolean isCollapsed;
+    property public final boolean isExpanded;
+    field public static final androidx.compose.material.BottomSheetState.Companion Companion;
+  }
+
+  public static final class BottomSheetState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.BottomSheetState,?> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomSheetValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi public enum BottomSheetValue {
+    enum_constant public static final androidx.compose.material.BottomSheetValue Collapsed;
+    enum_constant public static final androidx.compose.material.BottomSheetValue Expanded;
+  }
+
+  @androidx.compose.runtime.Stable public interface ButtonColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+  }
+
+  public final class ButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors buttonColors-nlx5xbs(optional long backgroundColor, optional long contentColor, optional long disabledBackgroundColor, optional long disabledContentColor);
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonElevation elevation-qYQSm_w(optional float defaultElevation, optional float pressedElevation, optional float disabledElevation);
+    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+    method public float getIconSize-D9Ej5fM();
+    method public float getIconSpacing-D9Ej5fM();
+    method public float getMinHeight-D9Ej5fM();
+    method public float getMinWidth-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public androidx.compose.foundation.BorderStroke getOutlinedBorder();
+    method public float getOutlinedBorderSize-D9Ej5fM();
+    method public androidx.compose.foundation.layout.PaddingValues getTextButtonContentPadding();
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors outlinedButtonColors-xS_xkl8(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors textButtonColors-xS_xkl8(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public final float IconSize;
+    property public final float IconSpacing;
+    property public final float MinHeight;
+    property public final float MinWidth;
+    property public final float OutlinedBorderSize;
+    property public final androidx.compose.foundation.layout.PaddingValues TextButtonContentPadding;
+    property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
+    field public static final androidx.compose.material.ButtonDefaults INSTANCE;
+    field public static final float OutlinedBorderOpacity = 0.12f;
+  }
+
+  @androidx.compose.runtime.Stable public interface ButtonElevation {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(boolean enabled, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+  }
+
+  public final class ButtonKt {
+    method @androidx.compose.runtime.Composable public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void OutlinedButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void TextButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  public final class CardKt {
+    method @androidx.compose.runtime.Composable public static void Card-IHU7g64(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Stable public interface CheckboxColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> borderColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> boxColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> checkmarkColor(androidx.compose.ui.state.ToggleableState state);
+  }
+
+  public final class CheckboxDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.CheckboxColors colors-QGkLkJU(optional long checkedColor, optional long uncheckedColor, optional long checkmarkColor, optional long disabledColor, optional long disabledIndeterminateColor);
+    field public static final androidx.compose.material.CheckboxDefaults INSTANCE;
+  }
+
+  public final class CheckboxKt {
+    method @androidx.compose.runtime.Composable public static void Checkbox(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+    method @androidx.compose.runtime.Composable public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+  }
+
+  @androidx.compose.runtime.Stable public final class Colors {
+    method public androidx.compose.material.Colors copy-7EMdAJ8(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError, optional boolean isLight);
+    method public long getBackground-0d7_KjU();
+    method public long getError-0d7_KjU();
+    method public long getOnBackground-0d7_KjU();
+    method public long getOnError-0d7_KjU();
+    method public long getOnPrimary-0d7_KjU();
+    method public long getOnSecondary-0d7_KjU();
+    method public long getOnSurface-0d7_KjU();
+    method public long getPrimary-0d7_KjU();
+    method public long getPrimaryVariant-0d7_KjU();
+    method public long getSecondary-0d7_KjU();
+    method public long getSecondaryVariant-0d7_KjU();
+    method public long getSurface-0d7_KjU();
+    method public boolean isLight();
+    property public final long background;
+    property public final long error;
+    property public final boolean isLight;
+    property public final long onBackground;
+    property public final long onError;
+    property public final long onPrimary;
+    property public final long onSecondary;
+    property public final long onSurface;
+    property public final long primary;
+    property public final long primaryVariant;
+    property public final long secondary;
+    property public final long secondaryVariant;
+    property public final long surface;
+  }
+
+  public final class ColorsKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long contentColorFor-8_81llA(long backgroundColor);
+    method public static long contentColorFor-pz-ABmo(androidx.compose.material.Colors, long backgroundColor);
+    method public static androidx.compose.material.Colors darkColors-hW7iGhc(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+    method public static long getPrimarySurface(androidx.compose.material.Colors);
+    method public static androidx.compose.material.Colors lightColors-hW7iGhc(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+  }
+
+  public final class ContentAlpha {
+    method @androidx.compose.runtime.Composable public float getDisabled();
+    method @androidx.compose.runtime.Composable public float getHigh();
+    method @androidx.compose.runtime.Composable public float getMedium();
+    property @androidx.compose.runtime.Composable public final float disabled;
+    property @androidx.compose.runtime.Composable public final float high;
+    property @androidx.compose.runtime.Composable public final float medium;
+    field public static final androidx.compose.material.ContentAlpha INSTANCE;
+  }
+
+  public final class ContentAlphaKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> getLocalContentAlpha();
+  }
+
+  public final class ContentColorKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
+  }
+
+  public enum DismissDirection {
+    enum_constant public static final androidx.compose.material.DismissDirection EndToStart;
+    enum_constant public static final androidx.compose.material.DismissDirection StartToEnd;
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi public final class DismissState extends androidx.compose.material.SwipeableState<androidx.compose.material.DismissValue> {
+    ctor public DismissState(androidx.compose.material.DismissValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DismissValue,java.lang.Boolean> confirmStateChange);
+    method public suspend Object? dismiss(androidx.compose.material.DismissDirection direction, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public androidx.compose.material.DismissDirection? getDismissDirection();
+    method public boolean isDismissed(androidx.compose.material.DismissDirection direction);
+    method public suspend Object? reset(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final androidx.compose.material.DismissDirection? dismissDirection;
+    field public static final androidx.compose.material.DismissState.Companion Companion;
+  }
+
+  public static final class DismissState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.DismissState,androidx.compose.material.DismissValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.DismissValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  public enum DismissValue {
+    enum_constant public static final androidx.compose.material.DismissValue Default;
+    enum_constant public static final androidx.compose.material.DismissValue DismissedToEnd;
+    enum_constant public static final androidx.compose.material.DismissValue DismissedToStart;
+  }
+
+  public final class DividerKt {
+    method @androidx.compose.runtime.Composable public static void Divider-JRSVyrs(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
+  }
+
+  public final class DrawerDefaults {
+    method public float getElevation-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public long getScrimColor-0d7_KjU();
+    property public final float Elevation;
+    property @androidx.compose.runtime.Composable public final long scrimColor;
+    field public static final androidx.compose.material.DrawerDefaults INSTANCE;
+    field public static final float ScrimOpacity = 0.32f;
+  }
+
+  public final class DrawerKt {
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void BottomDrawer--6CoO6E(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.BottomDrawerState drawerState, optional boolean gesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void ModalDrawer-TlzqArY(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.DrawerState drawerState, optional boolean gesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static androidx.compose.material.BottomDrawerState rememberBottomDrawerState(androidx.compose.material.BottomDrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+    method @androidx.compose.runtime.Composable public static androidx.compose.material.DrawerState rememberDrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  @androidx.compose.runtime.Stable public final class DrawerState extends androidx.compose.material.SwipeableState<androidx.compose.material.DrawerValue> {
+    ctor public DrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+    method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public boolean isClosed();
+    method public boolean isOpen();
+    method public suspend Object? open(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final boolean isClosed;
+    property public final boolean isOpen;
+    field public static final androidx.compose.material.DrawerState.Companion Companion;
+  }
+
+  public static final class DrawerState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.DrawerState,androidx.compose.material.DrawerValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  public enum DrawerValue {
+    enum_constant public static final androidx.compose.material.DrawerValue Closed;
+    enum_constant public static final androidx.compose.material.DrawerValue Open;
+  }
+
+  public final class ElevationKt {
+  }
+
+  public interface ElevationOverlay {
+    method @androidx.compose.runtime.Composable public long apply-_fH6D24(long color, float elevation);
+  }
+
+  public final class ElevationOverlayKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteElevation();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ElevationOverlay> getLocalElevationOverlay();
+  }
+
+  @kotlin.RequiresOptIn(message="This material API is experimental and is likely to change or to be removed in" + " the future.") public @interface ExperimentalMaterialApi {
+  }
+
+  public enum FabPosition {
+    enum_constant public static final androidx.compose.material.FabPosition Center;
+    enum_constant public static final androidx.compose.material.FabPosition End;
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Immutable public final class FixedThreshold implements androidx.compose.material.ThresholdConfig {
+    method public float computeThreshold(androidx.compose.ui.unit.Density, float fromValue, float toValue);
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Immutable public androidx.compose.material.FixedThreshold copy-0680j_4(float offset);
+  }
+
+  public final class FloatingActionButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.FloatingActionButtonElevation elevation-ioHfwGI(optional float defaultElevation, optional float pressedElevation);
+    field public static final androidx.compose.material.FloatingActionButtonDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Stable public interface FloatingActionButtonElevation {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+  }
+
+  public final class FloatingActionButtonKt {
+    method @androidx.compose.runtime.Composable public static void ExtendedFloatingActionButton-opHSmBI(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation);
+    method @androidx.compose.runtime.Composable public static void FloatingActionButton-n9X6i6U(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Immutable public final class FractionalThreshold implements androidx.compose.material.ThresholdConfig {
+    ctor public FractionalThreshold(float fraction);
+    method public float computeThreshold(androidx.compose.ui.unit.Density, float fromValue, float toValue);
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Immutable public androidx.compose.material.FractionalThreshold copy(float fraction);
+  }
+
+  public final class IconButtonKt {
+    method @androidx.compose.runtime.Composable public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void IconToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class IconKt {
+    method @androidx.compose.runtime.Composable public static void Icon-8NTYWNk(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+    method @androidx.compose.runtime.Composable public static void Icon-BG621w0(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+    method @androidx.compose.runtime.Composable public static void Icon-hGAziDE(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+  }
+
+  public final class ListItemKt {
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void ListItem(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? secondaryText, optional boolean singleLineSecondaryText, optional kotlin.jvm.functions.Function0<kotlin.Unit>? overlineText, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailing, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+  }
+
+  public final class MaterialTextSelectionColorsKt {
+  }
+
+  public final class MaterialTheme {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Typography getTypography();
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Colors colors;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Shapes shapes;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Typography typography;
+    field public static final androidx.compose.material.MaterialTheme INSTANCE;
+  }
+
+  public final class MaterialThemeKt {
+    method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class MenuDefaults {
+    method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
+    property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
+    field public static final androidx.compose.material.MenuDefaults INSTANCE;
+  }
+
+  public final class MenuKt {
+  }
+
+  public final class ModalBottomSheetDefaults {
+    method public float getElevation-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public long getScrimColor-0d7_KjU();
+    property public final float Elevation;
+    property @androidx.compose.runtime.Composable public final long scrimColor;
+    field public static final androidx.compose.material.ModalBottomSheetDefaults INSTANCE;
+  }
+
+  public final class ModalBottomSheetKt {
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void ModalBottomSheetLayout-dpadJcU(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> sheetContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.ModalBottomSheetState sheetState, optional androidx.compose.ui.graphics.Shape sheetShape, optional float sheetElevation, optional long sheetBackgroundColor, optional long sheetContentColor, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.ModalBottomSheetState rememberModalBottomSheetState(androidx.compose.material.ModalBottomSheetValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.ModalBottomSheetValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi public final class ModalBottomSheetState extends androidx.compose.material.SwipeableState<androidx.compose.material.ModalBottomSheetValue> {
+    ctor public ModalBottomSheetState(androidx.compose.material.ModalBottomSheetValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.ModalBottomSheetValue,java.lang.Boolean> confirmStateChange);
+    method public suspend Object? hide(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public boolean isVisible();
+    method public suspend Object? show(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final boolean isVisible;
+    field public static final androidx.compose.material.ModalBottomSheetState.Companion Companion;
+  }
+
+  public static final class ModalBottomSheetState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.ModalBottomSheetState,?> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.material.ModalBottomSheetValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi public enum ModalBottomSheetValue {
+    enum_constant public static final androidx.compose.material.ModalBottomSheetValue Expanded;
+    enum_constant public static final androidx.compose.material.ModalBottomSheetValue HalfExpanded;
+    enum_constant public static final androidx.compose.material.ModalBottomSheetValue Hidden;
+  }
+
+  public final class OutlinedTextFieldKt {
+    method @androidx.compose.runtime.Composable public static void OutlinedTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.TextFieldColors colors);
+    method @androidx.compose.runtime.Composable public static void OutlinedTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.TextFieldColors colors);
+  }
+
+  public final class ProgressIndicatorDefaults {
+    method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
+    method public float getStrokeWidth-D9Ej5fM();
+    property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
+    property public final float StrokeWidth;
+    field public static final androidx.compose.material.ProgressIndicatorDefaults INSTANCE;
+    field public static final float IndicatorBackgroundOpacity = 0.24f;
+  }
+
+  public final class ProgressIndicatorKt {
+    method @androidx.compose.runtime.Composable public static void CircularProgressIndicator-vFL-O2w(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+    method @androidx.compose.runtime.Composable public static void CircularProgressIndicator-y0SQU_c(optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+    method @androidx.compose.runtime.Composable public static void LinearProgressIndicator-BeBJghs(optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+    method @androidx.compose.runtime.Composable public static void LinearProgressIndicator-kLDug40(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+  }
+
+  @androidx.compose.runtime.Stable public interface RadioButtonColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> radioColor(boolean enabled, boolean selected);
+  }
+
+  public final class RadioButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.RadioButtonColors colors-xS_xkl8(optional long selectedColor, optional long unselectedColor, optional long disabledColor);
+    field public static final androidx.compose.material.RadioButtonDefaults INSTANCE;
+  }
+
+  public final class RadioButtonKt {
+    method @androidx.compose.runtime.Composable public static void RadioButton(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.RadioButtonColors colors);
+  }
+
+  @androidx.compose.runtime.Immutable public final class ResistanceConfig {
+    ctor public ResistanceConfig(float basis, optional float factorAtMin, optional float factorAtMax);
+    method public float computeResistance(float overflow);
+    method public float getBasis();
+    method public float getFactorAtMax();
+    method public float getFactorAtMin();
+    property public final float basis;
+    property public final float factorAtMax;
+    property public final float factorAtMin;
+  }
+
+  public final class ScaffoldKt {
+    method @androidx.compose.runtime.Composable public static void Scaffold-axyFlp8(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.ScaffoldState scaffoldState, optional kotlin.jvm.functions.Function0<kotlin.Unit> topBar, optional kotlin.jvm.functions.Function0<kotlin.Unit> bottomBar, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarHostState,kotlin.Unit> snackbarHost, optional kotlin.jvm.functions.Function0<kotlin.Unit> floatingActionButton, optional androidx.compose.material.FabPosition floatingActionButtonPosition, optional boolean isFloatingActionButtonDocked, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? drawerContent, optional boolean drawerGesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long drawerScrimColor, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.PaddingValues,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static androidx.compose.material.ScaffoldState rememberScaffoldState(optional androidx.compose.material.DrawerState drawerState, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+  }
+
+  @androidx.compose.runtime.Stable public final class ScaffoldState {
+    ctor public ScaffoldState(androidx.compose.material.DrawerState drawerState, androidx.compose.material.SnackbarHostState snackbarHostState);
+    method public androidx.compose.material.DrawerState getDrawerState();
+    method public androidx.compose.material.SnackbarHostState getSnackbarHostState();
+    property public final androidx.compose.material.DrawerState drawerState;
+    property public final androidx.compose.material.SnackbarHostState snackbarHostState;
+  }
+
+  @androidx.compose.runtime.Immutable public final class Shapes {
+    ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+    method public androidx.compose.material.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+    method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+    method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+    method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+    property public final androidx.compose.foundation.shape.CornerBasedShape large;
+    property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+    property public final androidx.compose.foundation.shape.CornerBasedShape small;
+  }
+
+  public final class ShapesKt {
+  }
+
+  @androidx.compose.runtime.Stable public interface SliderColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean active);
+  }
+
+  public final class SliderDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.SliderColors colors-kU-unao(optional long thumbColor, optional long disabledThumbColor, optional long activeTrackColor, optional long inactiveTrackColor, optional long disabledActiveTrackColor, optional long disabledInactiveTrackColor, optional long activeTickColor, optional long inactiveTickColor, optional long disabledActiveTickColor, optional long disabledInactiveTickColor);
+    field public static final float DisabledActiveTrackAlpha = 0.32f;
+    field public static final float DisabledInactiveTrackAlpha = 0.12f;
+    field public static final float DisabledTickAlpha = 0.12f;
+    field public static final androidx.compose.material.SliderDefaults INSTANCE;
+    field public static final float InactiveTrackAlpha = 0.24f;
+    field public static final float TickAlpha = 0.54f;
+  }
+
+  public final class SliderKt {
+    method @androidx.compose.runtime.Composable public static void Slider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onValueChangeFinished, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SliderColors colors);
+  }
+
+  public interface SnackbarData {
+    method public void dismiss();
+    method public String? getActionLabel();
+    method public androidx.compose.material.SnackbarDuration getDuration();
+    method public String getMessage();
+    method public void performAction();
+    property public abstract String? actionLabel;
+    property public abstract androidx.compose.material.SnackbarDuration duration;
+    property public abstract String message;
+  }
+
+  public final class SnackbarDefaults {
+    method @androidx.compose.runtime.Composable public long getBackgroundColor-0d7_KjU();
+    method @androidx.compose.runtime.Composable public long getPrimaryActionColor-0d7_KjU();
+    property @androidx.compose.runtime.Composable public final long backgroundColor;
+    property @androidx.compose.runtime.Composable public final long primaryActionColor;
+    field public static final androidx.compose.material.SnackbarDefaults INSTANCE;
+  }
+
+  public enum SnackbarDuration {
+    enum_constant public static final androidx.compose.material.SnackbarDuration Indefinite;
+    enum_constant public static final androidx.compose.material.SnackbarDuration Long;
+    enum_constant public static final androidx.compose.material.SnackbarDuration Short;
+  }
+
+  public final class SnackbarHostKt {
+    method @androidx.compose.runtime.Composable public static void SnackbarHost(androidx.compose.material.SnackbarHostState hostState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarData,kotlin.Unit> snackbar);
+  }
+
+  @androidx.compose.runtime.Stable public final class SnackbarHostState {
+    ctor public SnackbarHostState();
+    method public androidx.compose.material.SnackbarData? getCurrentSnackbarData();
+    method public suspend Object? showSnackbar(String message, optional String? actionLabel, optional androidx.compose.material.SnackbarDuration duration, optional kotlin.coroutines.Continuation<? super androidx.compose.material.SnackbarResult> p);
+    property public final androidx.compose.material.SnackbarData? currentSnackbarData;
+  }
+
+  public final class SnackbarKt {
+    method @androidx.compose.runtime.Composable public static void Snackbar-GiTsVJ0(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? action, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Snackbar-Ou9cdGU(androidx.compose.material.SnackbarData snackbarData, optional androidx.compose.ui.Modifier modifier, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional long actionColor, optional float elevation);
+  }
+
+  public enum SnackbarResult {
+    enum_constant public static final androidx.compose.material.SnackbarResult ActionPerformed;
+    enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
+  }
+
+  public final class SurfaceKt {
+    method @androidx.compose.runtime.Composable public static void Surface-IHU7g64(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Immutable public final class SwipeProgress<T> {
+    ctor public SwipeProgress(T? from, T? to, float fraction);
+    method public float getFraction();
+    method public T! getFrom();
+    method public T! getTo();
+    property public final float fraction;
+    property public final T! from;
+    property public final T! to;
+  }
+
+  public final class SwipeToDismissKt {
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void SwipeToDismiss(androidx.compose.material.DismissState state, optional androidx.compose.ui.Modifier modifier, optional java.util.Set<? extends androidx.compose.material.DismissDirection> directions, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DismissDirection,? extends androidx.compose.material.ThresholdConfig> dismissThresholds, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> background, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> dismissContent);
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.DismissState rememberDismissState(optional androidx.compose.material.DismissValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DismissValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  public final class SwipeableDefaults {
+    method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getAnimationSpec();
+    method public float getVelocityThreshold-D9Ej5fM();
+    method public androidx.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
+    property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+    property public final float VelocityThreshold;
+    field public static final androidx.compose.material.SwipeableDefaults INSTANCE;
+    field public static final float StandardResistanceFactor = 10.0f;
+    field public static final float StiffResistanceFactor = 20.0f;
+  }
+
+  public final class SwipeableKt {
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static <T> androidx.compose.material.SwipeableState<T> rememberSwipeableState(T initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
+    method @androidx.compose.material.ExperimentalMaterialApi public static <T> androidx.compose.ui.Modifier swipeable-827DgyA(androidx.compose.ui.Modifier, androidx.compose.material.SwipeableState<T> state, java.util.Map<java.lang.Float,? extends T> anchors, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends androidx.compose.material.ThresholdConfig> thresholds, optional androidx.compose.material.ResistanceConfig? resistance, optional float velocityThreshold);
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public class SwipeableState<T> {
+    ctor public SwipeableState(T? initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
+    method @androidx.compose.material.ExperimentalMaterialApi public final suspend Object? animateTo(T? targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> anim, optional kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public final T! getCurrentValue();
+    method public final float getDirection();
+    method public final androidx.compose.runtime.State<java.lang.Float> getOffset();
+    method public final androidx.compose.runtime.State<java.lang.Float> getOverflow();
+    method public final androidx.compose.material.SwipeProgress<T> getProgress();
+    method public final T! getTargetValue();
+    method public final boolean isAnimationRunning();
+    method public final float performDrag(float delta);
+    method public final suspend Object? performFling(float velocity, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method @androidx.compose.material.ExperimentalMaterialApi public final suspend Object? snapTo(T? targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final T! currentValue;
+    property public final float direction;
+    property public final boolean isAnimationRunning;
+    property public final androidx.compose.runtime.State<java.lang.Float> offset;
+    property public final androidx.compose.runtime.State<java.lang.Float> overflow;
+    property public final androidx.compose.material.SwipeProgress<T> progress;
+    property public final T! targetValue;
+    field public static final androidx.compose.material.SwipeableState.Companion Companion;
+  }
+
+  public static final class SwipeableState.Companion {
+    method public <T> androidx.compose.runtime.saveable.Saver<androidx.compose.material.SwipeableState<T>,T> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
+  }
+
+  @androidx.compose.runtime.Stable public interface SwitchColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
+  }
+
+  public final class SwitchDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.SwitchColors colors-R8aI8sA(optional long checkedThumbColor, optional long checkedTrackColor, optional float checkedTrackAlpha, optional long uncheckedThumbColor, optional long uncheckedTrackColor, optional float uncheckedTrackAlpha, optional long disabledCheckedThumbColor, optional long disabledCheckedTrackColor, optional long disabledUncheckedThumbColor, optional long disabledUncheckedTrackColor);
+    field public static final androidx.compose.material.SwitchDefaults INSTANCE;
+  }
+
+  public final class SwitchKt {
+    method @androidx.compose.runtime.Composable public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SwitchColors colors);
+  }
+
+  public final class TabKt {
+    method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void LeadingIconTab-PWX9des(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+    method @androidx.compose.runtime.Composable public static void Tab-TC9MJzw(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+    method @androidx.compose.runtime.Composable public static void Tab-wUuQ7UU(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TabPosition {
+    method public float getLeft-D9Ej5fM();
+    method public float getRight-D9Ej5fM();
+    method public float getWidth-D9Ej5fM();
+    property public final float left;
+    property public final float right;
+    property public final float width;
+  }
+
+  public final class TabRowDefaults {
+    method @androidx.compose.runtime.Composable public void Divider-Z-uBYeE(optional androidx.compose.ui.Modifier modifier, optional float thickness, optional long color);
+    method @androidx.compose.runtime.Composable public void Indicator-Z-uBYeE(optional androidx.compose.ui.Modifier modifier, optional float height, optional long color);
+    method public float getDividerThickness-D9Ej5fM();
+    method public float getIndicatorHeight-D9Ej5fM();
+    method public float getScrollableTabRowPadding-D9Ej5fM();
+    method public androidx.compose.ui.Modifier tabIndicatorOffset(androidx.compose.ui.Modifier, androidx.compose.material.TabPosition currentTabPosition);
+    property public final float DividerThickness;
+    property public final float IndicatorHeight;
+    property public final float ScrollableTabRowPadding;
+    field public static final float DividerOpacity = 0.12f;
+    field public static final androidx.compose.material.TabRowDefaults INSTANCE;
+  }
+
+  public final class TabRowKt {
+    method @androidx.compose.runtime.Composable public static void ScrollableTabRow-qhCAd8w(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float edgePadding, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+    method @androidx.compose.runtime.Composable public static void TabRow-xUsefZ0(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+  }
+
+  @androidx.compose.runtime.Stable public interface TextFieldColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> cursorColor(boolean isError);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> indicatorColor(boolean enabled, boolean isError, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> labelColor(boolean enabled, boolean error, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> leadingIconColor(boolean enabled, boolean isError);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> placeholderColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> textColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trailingIconColor(boolean enabled, boolean isError);
+  }
+
+  public final class TextFieldDefaults {
+    method public float getMinHeight-D9Ej5fM();
+    method public float getMinWidth-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors outlinedTextFieldColors-LWDMS30(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedBorderColor, optional long unfocusedBorderColor, optional long disabledBorderColor, optional long errorBorderColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+    method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors textFieldColors-LWDMS30(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedIndicatorColor, optional long unfocusedIndicatorColor, optional long disabledIndicatorColor, optional long errorIndicatorColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+    property public final float MinHeight;
+    property public final float MinWidth;
+    field public static final float BackgroundOpacity = 0.12f;
+    field public static final androidx.compose.material.TextFieldDefaults INSTANCE;
+    field public static final float IconOpacity = 0.54f;
+    field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
+  }
+
+  public final class TextFieldImplKt {
+  }
+
+  public final class TextFieldKt {
+    method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+    method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+  }
+
+  public final class TextKt {
+    method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Text-TPAwlIA(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+    method @androidx.compose.runtime.Composable public static void Text-Vh6c2nE(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+  }
+
+  @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public interface ThresholdConfig {
+    method public float computeThreshold(androidx.compose.ui.unit.Density, float fromValue, float toValue);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Typography {
+    ctor public Typography(optional androidx.compose.ui.text.font.FontFamily defaultFontFamily, optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+    method public androidx.compose.material.Typography copy(optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+    method public androidx.compose.ui.text.TextStyle getBody1();
+    method public androidx.compose.ui.text.TextStyle getBody2();
+    method public androidx.compose.ui.text.TextStyle getButton();
+    method public androidx.compose.ui.text.TextStyle getCaption();
+    method public androidx.compose.ui.text.TextStyle getH1();
+    method public androidx.compose.ui.text.TextStyle getH2();
+    method public androidx.compose.ui.text.TextStyle getH3();
+    method public androidx.compose.ui.text.TextStyle getH4();
+    method public androidx.compose.ui.text.TextStyle getH5();
+    method public androidx.compose.ui.text.TextStyle getH6();
+    method public androidx.compose.ui.text.TextStyle getOverline();
+    method public androidx.compose.ui.text.TextStyle getSubtitle1();
+    method public androidx.compose.ui.text.TextStyle getSubtitle2();
+    property public final androidx.compose.ui.text.TextStyle body1;
+    property public final androidx.compose.ui.text.TextStyle body2;
+    property public final androidx.compose.ui.text.TextStyle button;
+    property public final androidx.compose.ui.text.TextStyle caption;
+    property public final androidx.compose.ui.text.TextStyle h1;
+    property public final androidx.compose.ui.text.TextStyle h2;
+    property public final androidx.compose.ui.text.TextStyle h3;
+    property public final androidx.compose.ui.text.TextStyle h4;
+    property public final androidx.compose.ui.text.TextStyle h5;
+    property public final androidx.compose.ui.text.TextStyle h6;
+    property public final androidx.compose.ui.text.TextStyle overline;
+    property public final androidx.compose.ui.text.TextStyle subtitle1;
+    property public final androidx.compose.ui.text.TextStyle subtitle2;
+  }
+
+  public final class TypographyKt {
+  }
+
+}
+

compose/material/material/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/material/material/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/material/material/api/res-1.0.0-beta04.txt

compose/material/material/api/restricted_1.0.0-beta04.txt

diff --git a/compose/material/material/api/restricted_1.0.0-beta04.txt b/compose/material/material/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..c630e0c
--- /dev/null
+++ b/compose/material/material/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,640 @@
+// Signature format: 4.0
+package androidx.compose.material {
+
+  public final class AlertDialogKt {
+  }
+
+  public final class AndroidAlertDialog_androidKt {
+    method @androidx.compose.runtime.Composable public static void AlertDialog--HzSArw(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+    method @androidx.compose.runtime.Composable public static void AlertDialog-PPVLV-g(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+  }
+
+  public final class AndroidMenu_androidKt {
+    method @androidx.compose.runtime.Composable public static void DropdownMenu-jyMeD6A(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional long offset, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void DropdownMenuItem(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  public final class AppBarDefaults {
+    method public float getBottomAppBarElevation-D9Ej5fM();
+    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+    method public float getTopAppBarElevation-D9Ej5fM();
+    property public final float BottomAppBarElevation;
+    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public final float TopAppBarElevation;
+    field public static final androidx.compose.material.AppBarDefaults INSTANCE;
+  }
+
+  public final class AppBarKt {
+    method @androidx.compose.runtime.Composable public static void BottomAppBar-EMTaL0E(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.graphics.Shape? cutoutShape, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void TopAppBar-QjfF_Us(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void TopAppBar-_azMXew(kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? navigationIcon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> actions, optional long backgroundColor, optional long contentColor, optional float elevation);
+  }
+
+  public final class BackdropScaffoldDefaults {
+    method public float getFrontLayerElevation-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public long getFrontLayerScrimColor-0d7_KjU();
+    method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.Shape getFrontLayerShape();
+    method public float getHeaderHeight-D9Ej5fM();
+    method public float getPeekHeight-D9Ej5fM();
+    property public final float FrontLayerElevation;
+    property public final float HeaderHeight;
+    property public final float PeekHeight;
+    property @androidx.compose.runtime.Composable public final long frontLayerScrimColor;
+    property @androidx.compose.runtime.Composable public final androidx.compose.ui.graphics.Shape frontLayerShape;
+    field public static final androidx.compose.material.BackdropScaffoldDefaults INSTANCE;
+  }
+
+  public final class BackdropScaffoldKt {
+  }
+
+  public final class BottomDrawerState {
+    ctor public BottomDrawerState(androidx.compose.material.BottomDrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+    method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? expand(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public final T! getCurrentValue();
+    method public final float getDirection();
+    method public final androidx.compose.runtime.State<java.lang.Float> getOffset();
+    method public final androidx.compose.runtime.State<java.lang.Float> getOverflow();
+    method public final T! getTargetValue();
+    method public final boolean isAnimationRunning();
+    method public boolean isClosed();
+    method public boolean isExpanded();
+    method public boolean isOpen();
+    method public suspend Object? open(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public final float performDrag(float delta);
+    method public final suspend Object? performFling(float velocity, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final boolean isClosed;
+    property public final boolean isExpanded;
+    property public final boolean isOpen;
+    field public static final androidx.compose.material.BottomDrawerState.Companion Companion;
+  }
+
+  public static final class BottomDrawerState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.BottomDrawerState,androidx.compose.material.BottomDrawerValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  public enum BottomDrawerValue {
+    enum_constant public static final androidx.compose.material.BottomDrawerValue Closed;
+    enum_constant public static final androidx.compose.material.BottomDrawerValue Expanded;
+    enum_constant public static final androidx.compose.material.BottomDrawerValue Open;
+  }
+
+  public final class BottomNavigationDefaults {
+    method public float getElevation-D9Ej5fM();
+    property public final float Elevation;
+    field public static final androidx.compose.material.BottomNavigationDefaults INSTANCE;
+  }
+
+  public final class BottomNavigationKt {
+    method @androidx.compose.runtime.Composable public static void BottomNavigation-ye6PvEY(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void BottomNavigationItem-g7W06kY(androidx.compose.foundation.layout.RowScope, boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional boolean alwaysShowLabel, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+  }
+
+  public final class BottomSheetScaffoldDefaults {
+    method public float getSheetElevation-D9Ej5fM();
+    method public float getSheetPeekHeight-D9Ej5fM();
+    property public final float SheetElevation;
+    property public final float SheetPeekHeight;
+    field public static final androidx.compose.material.BottomSheetScaffoldDefaults INSTANCE;
+  }
+
+  public final class BottomSheetScaffoldKt {
+  }
+
+  @androidx.compose.runtime.Stable public interface ButtonColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+  }
+
+  public final class ButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors buttonColors-nlx5xbs(optional long backgroundColor, optional long contentColor, optional long disabledBackgroundColor, optional long disabledContentColor);
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonElevation elevation-qYQSm_w(optional float defaultElevation, optional float pressedElevation, optional float disabledElevation);
+    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+    method public float getIconSize-D9Ej5fM();
+    method public float getIconSpacing-D9Ej5fM();
+    method public float getMinHeight-D9Ej5fM();
+    method public float getMinWidth-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public androidx.compose.foundation.BorderStroke getOutlinedBorder();
+    method public float getOutlinedBorderSize-D9Ej5fM();
+    method public androidx.compose.foundation.layout.PaddingValues getTextButtonContentPadding();
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors outlinedButtonColors-xS_xkl8(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+    method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors textButtonColors-xS_xkl8(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public final float IconSize;
+    property public final float IconSpacing;
+    property public final float MinHeight;
+    property public final float MinWidth;
+    property public final float OutlinedBorderSize;
+    property public final androidx.compose.foundation.layout.PaddingValues TextButtonContentPadding;
+    property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
+    field public static final androidx.compose.material.ButtonDefaults INSTANCE;
+    field public static final float OutlinedBorderOpacity = 0.12f;
+  }
+
+  @androidx.compose.runtime.Stable public interface ButtonElevation {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(boolean enabled, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+  }
+
+  public final class ButtonKt {
+    method @androidx.compose.runtime.Composable public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void OutlinedButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void TextButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  public final class CardKt {
+    method @androidx.compose.runtime.Composable public static void Card-IHU7g64(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Stable public interface CheckboxColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> borderColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> boxColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> checkmarkColor(androidx.compose.ui.state.ToggleableState state);
+  }
+
+  public final class CheckboxDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.CheckboxColors colors-QGkLkJU(optional long checkedColor, optional long uncheckedColor, optional long checkmarkColor, optional long disabledColor, optional long disabledIndeterminateColor);
+    field public static final androidx.compose.material.CheckboxDefaults INSTANCE;
+  }
+
+  public final class CheckboxKt {
+    method @androidx.compose.runtime.Composable public static void Checkbox(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+    method @androidx.compose.runtime.Composable public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+  }
+
+  @androidx.compose.runtime.Stable public final class Colors {
+    method public androidx.compose.material.Colors copy-7EMdAJ8(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError, optional boolean isLight);
+    method public long getBackground-0d7_KjU();
+    method public long getError-0d7_KjU();
+    method public long getOnBackground-0d7_KjU();
+    method public long getOnError-0d7_KjU();
+    method public long getOnPrimary-0d7_KjU();
+    method public long getOnSecondary-0d7_KjU();
+    method public long getOnSurface-0d7_KjU();
+    method public long getPrimary-0d7_KjU();
+    method public long getPrimaryVariant-0d7_KjU();
+    method public long getSecondary-0d7_KjU();
+    method public long getSecondaryVariant-0d7_KjU();
+    method public long getSurface-0d7_KjU();
+    method public boolean isLight();
+    property public final long background;
+    property public final long error;
+    property public final boolean isLight;
+    property public final long onBackground;
+    property public final long onError;
+    property public final long onPrimary;
+    property public final long onSecondary;
+    property public final long onSurface;
+    property public final long primary;
+    property public final long primaryVariant;
+    property public final long secondary;
+    property public final long secondaryVariant;
+    property public final long surface;
+  }
+
+  public final class ColorsKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long contentColorFor-8_81llA(long backgroundColor);
+    method public static long contentColorFor-pz-ABmo(androidx.compose.material.Colors, long backgroundColor);
+    method public static androidx.compose.material.Colors darkColors-hW7iGhc(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+    method public static long getPrimarySurface(androidx.compose.material.Colors);
+    method public static androidx.compose.material.Colors lightColors-hW7iGhc(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+  }
+
+  public final class ContentAlpha {
+    method @androidx.compose.runtime.Composable public float getDisabled();
+    method @androidx.compose.runtime.Composable public float getHigh();
+    method @androidx.compose.runtime.Composable public float getMedium();
+    property @androidx.compose.runtime.Composable public final float disabled;
+    property @androidx.compose.runtime.Composable public final float high;
+    property @androidx.compose.runtime.Composable public final float medium;
+    field public static final androidx.compose.material.ContentAlpha INSTANCE;
+  }
+
+  public final class ContentAlphaKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> getLocalContentAlpha();
+  }
+
+  public final class ContentColorKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
+  }
+
+  public enum DismissDirection {
+    enum_constant public static final androidx.compose.material.DismissDirection EndToStart;
+    enum_constant public static final androidx.compose.material.DismissDirection StartToEnd;
+  }
+
+  public enum DismissValue {
+    enum_constant public static final androidx.compose.material.DismissValue Default;
+    enum_constant public static final androidx.compose.material.DismissValue DismissedToEnd;
+    enum_constant public static final androidx.compose.material.DismissValue DismissedToStart;
+  }
+
+  public final class DividerKt {
+    method @androidx.compose.runtime.Composable public static void Divider-JRSVyrs(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
+  }
+
+  public final class DrawerDefaults {
+    method public float getElevation-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public long getScrimColor-0d7_KjU();
+    property public final float Elevation;
+    property @androidx.compose.runtime.Composable public final long scrimColor;
+    field public static final androidx.compose.material.DrawerDefaults INSTANCE;
+    field public static final float ScrimOpacity = 0.32f;
+  }
+
+  public final class DrawerKt {
+    method @androidx.compose.runtime.Composable public static void ModalDrawer-TlzqArY(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.DrawerState drawerState, optional boolean gesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static androidx.compose.material.BottomDrawerState rememberBottomDrawerState(androidx.compose.material.BottomDrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+    method @androidx.compose.runtime.Composable public static androidx.compose.material.DrawerState rememberDrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  @androidx.compose.runtime.Stable public final class DrawerState {
+    ctor public DrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+    method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public final T! getCurrentValue();
+    method public final float getDirection();
+    method public final androidx.compose.runtime.State<java.lang.Float> getOffset();
+    method public final androidx.compose.runtime.State<java.lang.Float> getOverflow();
+    method public final T! getTargetValue();
+    method public final boolean isAnimationRunning();
+    method public boolean isClosed();
+    method public boolean isOpen();
+    method public suspend Object? open(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public final float performDrag(float delta);
+    method public final suspend Object? performFling(float velocity, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final boolean isClosed;
+    property public final boolean isOpen;
+    field public static final androidx.compose.material.DrawerState.Companion Companion;
+  }
+
+  public static final class DrawerState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.DrawerState,androidx.compose.material.DrawerValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+  }
+
+  public enum DrawerValue {
+    enum_constant public static final androidx.compose.material.DrawerValue Closed;
+    enum_constant public static final androidx.compose.material.DrawerValue Open;
+  }
+
+  public final class ElevationKt {
+  }
+
+  public interface ElevationOverlay {
+    method @androidx.compose.runtime.Composable public long apply-_fH6D24(long color, float elevation);
+  }
+
+  public final class ElevationOverlayKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteElevation();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ElevationOverlay> getLocalElevationOverlay();
+  }
+
+  public enum FabPosition {
+    enum_constant public static final androidx.compose.material.FabPosition Center;
+    enum_constant public static final androidx.compose.material.FabPosition End;
+  }
+
+  public final class FloatingActionButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.FloatingActionButtonElevation elevation-ioHfwGI(optional float defaultElevation, optional float pressedElevation);
+    field public static final androidx.compose.material.FloatingActionButtonDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Stable public interface FloatingActionButtonElevation {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+  }
+
+  public final class FloatingActionButtonKt {
+    method @androidx.compose.runtime.Composable public static void ExtendedFloatingActionButton-opHSmBI(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation);
+    method @androidx.compose.runtime.Composable public static void FloatingActionButton-n9X6i6U(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class IconButtonKt {
+    method @androidx.compose.runtime.Composable public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void IconToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class IconKt {
+    method @androidx.compose.runtime.Composable public static void Icon-8NTYWNk(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+    method @androidx.compose.runtime.Composable public static void Icon-BG621w0(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+    method @androidx.compose.runtime.Composable public static void Icon-hGAziDE(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+  }
+
+  public final class ListItemKt {
+  }
+
+  public final class MaterialTextSelectionColorsKt {
+  }
+
+  public final class MaterialTheme {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Typography getTypography();
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Colors colors;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Shapes shapes;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Typography typography;
+    field public static final androidx.compose.material.MaterialTheme INSTANCE;
+  }
+
+  public final class MaterialThemeKt {
+    method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class MenuDefaults {
+    method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
+    property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
+    field public static final androidx.compose.material.MenuDefaults INSTANCE;
+  }
+
+  public final class MenuKt {
+  }
+
+  public final class ModalBottomSheetDefaults {
+    method public float getElevation-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public long getScrimColor-0d7_KjU();
+    property public final float Elevation;
+    property @androidx.compose.runtime.Composable public final long scrimColor;
+    field public static final androidx.compose.material.ModalBottomSheetDefaults INSTANCE;
+  }
+
+  public final class ModalBottomSheetKt {
+  }
+
+  public final class OutlinedTextFieldKt {
+    method @androidx.compose.runtime.Composable public static void OutlinedTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.TextFieldColors colors);
+    method @androidx.compose.runtime.Composable public static void OutlinedTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.TextFieldColors colors);
+  }
+
+  public final class ProgressIndicatorDefaults {
+    method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
+    method public float getStrokeWidth-D9Ej5fM();
+    property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
+    property public final float StrokeWidth;
+    field public static final androidx.compose.material.ProgressIndicatorDefaults INSTANCE;
+    field public static final float IndicatorBackgroundOpacity = 0.24f;
+  }
+
+  public final class ProgressIndicatorKt {
+    method @androidx.compose.runtime.Composable public static void CircularProgressIndicator-vFL-O2w(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+    method @androidx.compose.runtime.Composable public static void CircularProgressIndicator-y0SQU_c(optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+    method @androidx.compose.runtime.Composable public static void LinearProgressIndicator-BeBJghs(optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+    method @androidx.compose.runtime.Composable public static void LinearProgressIndicator-kLDug40(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+  }
+
+  @androidx.compose.runtime.Stable public interface RadioButtonColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> radioColor(boolean enabled, boolean selected);
+  }
+
+  public final class RadioButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.RadioButtonColors colors-xS_xkl8(optional long selectedColor, optional long unselectedColor, optional long disabledColor);
+    field public static final androidx.compose.material.RadioButtonDefaults INSTANCE;
+  }
+
+  public final class RadioButtonKt {
+    method @androidx.compose.runtime.Composable public static void RadioButton(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.RadioButtonColors colors);
+  }
+
+  @androidx.compose.runtime.Immutable public final class ResistanceConfig {
+    ctor public ResistanceConfig(float basis, optional float factorAtMin, optional float factorAtMax);
+    method public float computeResistance(float overflow);
+    method public float getBasis();
+    method public float getFactorAtMax();
+    method public float getFactorAtMin();
+    property public final float basis;
+    property public final float factorAtMax;
+    property public final float factorAtMin;
+  }
+
+  public final class ScaffoldKt {
+    method @androidx.compose.runtime.Composable public static void Scaffold-axyFlp8(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.ScaffoldState scaffoldState, optional kotlin.jvm.functions.Function0<kotlin.Unit> topBar, optional kotlin.jvm.functions.Function0<kotlin.Unit> bottomBar, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarHostState,kotlin.Unit> snackbarHost, optional kotlin.jvm.functions.Function0<kotlin.Unit> floatingActionButton, optional androidx.compose.material.FabPosition floatingActionButtonPosition, optional boolean isFloatingActionButtonDocked, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? drawerContent, optional boolean drawerGesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long drawerScrimColor, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.PaddingValues,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static androidx.compose.material.ScaffoldState rememberScaffoldState(optional androidx.compose.material.DrawerState drawerState, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+  }
+
+  @androidx.compose.runtime.Stable public final class ScaffoldState {
+    ctor public ScaffoldState(androidx.compose.material.DrawerState drawerState, androidx.compose.material.SnackbarHostState snackbarHostState);
+    method public androidx.compose.material.DrawerState getDrawerState();
+    method public androidx.compose.material.SnackbarHostState getSnackbarHostState();
+    property public final androidx.compose.material.DrawerState drawerState;
+    property public final androidx.compose.material.SnackbarHostState snackbarHostState;
+  }
+
+  @androidx.compose.runtime.Immutable public final class Shapes {
+    ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+    method public androidx.compose.material.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+    method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+    method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+    method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+    property public final androidx.compose.foundation.shape.CornerBasedShape large;
+    property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+    property public final androidx.compose.foundation.shape.CornerBasedShape small;
+  }
+
+  public final class ShapesKt {
+  }
+
+  @androidx.compose.runtime.Stable public interface SliderColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean active);
+  }
+
+  public final class SliderDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.SliderColors colors-kU-unao(optional long thumbColor, optional long disabledThumbColor, optional long activeTrackColor, optional long inactiveTrackColor, optional long disabledActiveTrackColor, optional long disabledInactiveTrackColor, optional long activeTickColor, optional long inactiveTickColor, optional long disabledActiveTickColor, optional long disabledInactiveTickColor);
+    field public static final float DisabledActiveTrackAlpha = 0.32f;
+    field public static final float DisabledInactiveTrackAlpha = 0.12f;
+    field public static final float DisabledTickAlpha = 0.12f;
+    field public static final androidx.compose.material.SliderDefaults INSTANCE;
+    field public static final float InactiveTrackAlpha = 0.24f;
+    field public static final float TickAlpha = 0.54f;
+  }
+
+  public final class SliderKt {
+    method @androidx.compose.runtime.Composable public static void Slider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onValueChangeFinished, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SliderColors colors);
+  }
+
+  public interface SnackbarData {
+    method public void dismiss();
+    method public String? getActionLabel();
+    method public androidx.compose.material.SnackbarDuration getDuration();
+    method public String getMessage();
+    method public void performAction();
+    property public abstract String? actionLabel;
+    property public abstract androidx.compose.material.SnackbarDuration duration;
+    property public abstract String message;
+  }
+
+  public final class SnackbarDefaults {
+    method @androidx.compose.runtime.Composable public long getBackgroundColor-0d7_KjU();
+    method @androidx.compose.runtime.Composable public long getPrimaryActionColor-0d7_KjU();
+    property @androidx.compose.runtime.Composable public final long backgroundColor;
+    property @androidx.compose.runtime.Composable public final long primaryActionColor;
+    field public static final androidx.compose.material.SnackbarDefaults INSTANCE;
+  }
+
+  public enum SnackbarDuration {
+    enum_constant public static final androidx.compose.material.SnackbarDuration Indefinite;
+    enum_constant public static final androidx.compose.material.SnackbarDuration Long;
+    enum_constant public static final androidx.compose.material.SnackbarDuration Short;
+  }
+
+  public final class SnackbarHostKt {
+    method @androidx.compose.runtime.Composable public static void SnackbarHost(androidx.compose.material.SnackbarHostState hostState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarData,kotlin.Unit> snackbar);
+  }
+
+  @androidx.compose.runtime.Stable public final class SnackbarHostState {
+    ctor public SnackbarHostState();
+    method public androidx.compose.material.SnackbarData? getCurrentSnackbarData();
+    method public suspend Object? showSnackbar(String message, optional String? actionLabel, optional androidx.compose.material.SnackbarDuration duration, optional kotlin.coroutines.Continuation<? super androidx.compose.material.SnackbarResult> p);
+    property public final androidx.compose.material.SnackbarData? currentSnackbarData;
+  }
+
+  public final class SnackbarKt {
+    method @androidx.compose.runtime.Composable public static void Snackbar-GiTsVJ0(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? action, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Snackbar-Ou9cdGU(androidx.compose.material.SnackbarData snackbarData, optional androidx.compose.ui.Modifier modifier, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional long actionColor, optional float elevation);
+  }
+
+  public enum SnackbarResult {
+    enum_constant public static final androidx.compose.material.SnackbarResult ActionPerformed;
+    enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
+  }
+
+  public final class SurfaceKt {
+    method @androidx.compose.runtime.Composable public static void Surface-IHU7g64(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class SwipeToDismissKt {
+  }
+
+  public final class SwipeableDefaults {
+    method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getAnimationSpec();
+    method public float getVelocityThreshold-D9Ej5fM();
+    method public androidx.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
+    property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+    property public final float VelocityThreshold;
+    field public static final androidx.compose.material.SwipeableDefaults INSTANCE;
+    field public static final float StandardResistanceFactor = 10.0f;
+    field public static final float StiffResistanceFactor = 20.0f;
+  }
+
+  public final class SwipeableKt {
+  }
+
+  @androidx.compose.runtime.Stable public interface SwitchColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
+  }
+
+  public final class SwitchDefaults {
+    method @androidx.compose.runtime.Composable public androidx.compose.material.SwitchColors colors-R8aI8sA(optional long checkedThumbColor, optional long checkedTrackColor, optional float checkedTrackAlpha, optional long uncheckedThumbColor, optional long uncheckedTrackColor, optional float uncheckedTrackAlpha, optional long disabledCheckedThumbColor, optional long disabledCheckedTrackColor, optional long disabledUncheckedThumbColor, optional long disabledUncheckedTrackColor);
+    field public static final androidx.compose.material.SwitchDefaults INSTANCE;
+  }
+
+  public final class SwitchKt {
+    method @androidx.compose.runtime.Composable public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SwitchColors colors);
+  }
+
+  public final class TabKt {
+    method @androidx.compose.runtime.Composable public static void Tab-TC9MJzw(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+    method @androidx.compose.runtime.Composable public static void Tab-wUuQ7UU(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TabPosition {
+    method public float getLeft-D9Ej5fM();
+    method public float getRight-D9Ej5fM();
+    method public float getWidth-D9Ej5fM();
+    property public final float left;
+    property public final float right;
+    property public final float width;
+  }
+
+  public final class TabRowDefaults {
+    method @androidx.compose.runtime.Composable public void Divider-Z-uBYeE(optional androidx.compose.ui.Modifier modifier, optional float thickness, optional long color);
+    method @androidx.compose.runtime.Composable public void Indicator-Z-uBYeE(optional androidx.compose.ui.Modifier modifier, optional float height, optional long color);
+    method public float getDividerThickness-D9Ej5fM();
+    method public float getIndicatorHeight-D9Ej5fM();
+    method public float getScrollableTabRowPadding-D9Ej5fM();
+    method public androidx.compose.ui.Modifier tabIndicatorOffset(androidx.compose.ui.Modifier, androidx.compose.material.TabPosition currentTabPosition);
+    property public final float DividerThickness;
+    property public final float IndicatorHeight;
+    property public final float ScrollableTabRowPadding;
+    field public static final float DividerOpacity = 0.12f;
+    field public static final androidx.compose.material.TabRowDefaults INSTANCE;
+  }
+
+  public final class TabRowKt {
+    method @androidx.compose.runtime.Composable public static void ScrollableTabRow-qhCAd8w(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float edgePadding, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+    method @androidx.compose.runtime.Composable public static void TabRow-xUsefZ0(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+  }
+
+  @androidx.compose.runtime.Stable public interface TextFieldColors {
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> cursorColor(boolean isError);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> indicatorColor(boolean enabled, boolean isError, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> labelColor(boolean enabled, boolean error, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> leadingIconColor(boolean enabled, boolean isError);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> placeholderColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> textColor(boolean enabled);
+    method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trailingIconColor(boolean enabled, boolean isError);
+  }
+
+  public final class TextFieldDefaults {
+    method public float getMinHeight-D9Ej5fM();
+    method public float getMinWidth-D9Ej5fM();
+    method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors outlinedTextFieldColors-LWDMS30(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedBorderColor, optional long unfocusedBorderColor, optional long disabledBorderColor, optional long errorBorderColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+    method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors textFieldColors-LWDMS30(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedIndicatorColor, optional long unfocusedIndicatorColor, optional long disabledIndicatorColor, optional long errorIndicatorColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+    property public final float MinHeight;
+    property public final float MinWidth;
+    field public static final float BackgroundOpacity = 0.12f;
+    field public static final androidx.compose.material.TextFieldDefaults INSTANCE;
+    field public static final float IconOpacity = 0.54f;
+    field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
+  }
+
+  public final class TextFieldImplKt {
+  }
+
+  public final class TextFieldKt {
+    method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+    method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+  }
+
+  public final class TextKt {
+    method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Text-TPAwlIA(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+    method @androidx.compose.runtime.Composable public static void Text-Vh6c2nE(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional androidx.compose.ui.text.style.TextOverflow overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+  }
+
+  @androidx.compose.runtime.Immutable public final class Typography {
+    ctor public Typography(optional androidx.compose.ui.text.font.FontFamily defaultFontFamily, optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+    method public androidx.compose.material.Typography copy(optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+    method public androidx.compose.ui.text.TextStyle getBody1();
+    method public androidx.compose.ui.text.TextStyle getBody2();
+    method public androidx.compose.ui.text.TextStyle getButton();
+    method public androidx.compose.ui.text.TextStyle getCaption();
+    method public androidx.compose.ui.text.TextStyle getH1();
+    method public androidx.compose.ui.text.TextStyle getH2();
+    method public androidx.compose.ui.text.TextStyle getH3();
+    method public androidx.compose.ui.text.TextStyle getH4();
+    method public androidx.compose.ui.text.TextStyle getH5();
+    method public androidx.compose.ui.text.TextStyle getH6();
+    method public androidx.compose.ui.text.TextStyle getOverline();
+    method public androidx.compose.ui.text.TextStyle getSubtitle1();
+    method public androidx.compose.ui.text.TextStyle getSubtitle2();
+    property public final androidx.compose.ui.text.TextStyle body1;
+    property public final androidx.compose.ui.text.TextStyle body2;
+    property public final androidx.compose.ui.text.TextStyle button;
+    property public final androidx.compose.ui.text.TextStyle caption;
+    property public final androidx.compose.ui.text.TextStyle h1;
+    property public final androidx.compose.ui.text.TextStyle h2;
+    property public final androidx.compose.ui.text.TextStyle h3;
+    property public final androidx.compose.ui.text.TextStyle h4;
+    property public final androidx.compose.ui.text.TextStyle h5;
+    property public final androidx.compose.ui.text.TextStyle h6;
+    property public final androidx.compose.ui.text.TextStyle overline;
+    property public final androidx.compose.ui.text.TextStyle subtitle1;
+    property public final androidx.compose.ui.text.TextStyle subtitle2;
+  }
+
+  public final class TypographyKt {
+  }
+
+}
+

compose/material/material/icons/generator/src/main/kotlin/androidx/compose/material/icons/generator/ImageVectorGenerator.kt

diff --git a/compose/material/material/icons/generator/src/main/kotlin/androidx/compose/material/icons/generator/ImageVectorGenerator.kt b/compose/material/material/icons/generator/src/main/kotlin/androidx/compose/material/icons/generator/ImageVectorGenerator.kt
index d9d9983..c474e24 100644
--- a/compose/material/material/icons/generator/src/main/kotlin/androidx/compose/material/icons/generator/ImageVectorGenerator.kt
+++ b/compose/material/material/icons/generator/src/main/kotlin/androidx/compose/material/icons/generator/ImageVectorGenerator.kt
@@ -58,7 +58,6 @@
         // Kotlin 1.4) each property with the same name will be considered as a possible candidate
         // for resolution, regardless of the access modifier, so by using unique names we reduce
         // the size from ~6000 to 1, and speed up compilation time for these icons.
-        @OptIn(ExperimentalStdlibApi::class)
         val backingPropertyName = "_" + iconName.decapitalize(Locale.ROOT)
         val backingProperty = backingProperty(name = backingPropertyName)
         return FileSpec.builder(

compose/material/material/integration-tests/material-catalog/build.gradle

diff --git a/compose/material/material/integration-tests/material-catalog/build.gradle b/compose/material/material/integration-tests/material-catalog/build.gradle
index 3cf2268..3b1ed12 100644
--- a/compose/material/material/integration-tests/material-catalog/build.gradle
+++ b/compose/material/material/integration-tests/material-catalog/build.gradle
@@ -28,20 +28,17 @@
     kotlinPlugin project(":compose:compiler:compiler")
     implementation(KOTLIN_STDLIB)
 
-    implementation project(":compose:foundation:foundation")
-    implementation project(":compose:foundation:foundation-layout")
     implementation project(":compose:integration-tests:demos:common")
+    implementation project(":compose:ui:ui")
     implementation project(":compose:material:material")
     implementation project(":compose:material:material:material-samples")
-    implementation project(":compose:runtime:runtime")
-    implementation project(":compose:ui:ui")
-    implementation project(":compose:ui:ui-text")
     implementation project(":activity:activity-compose")
+    implementation project(":navigation:navigation-compose")
 }
 
 androidx {
-    name = "Compose Material Catalog"
+    name = "Compose Material catalog"
     publish = Publish.NONE
     inceptionYear = "2021"
-    description = "This is a project for a Material catalog."
+    description = "This is a project for a Compose Material catalog."
 }

compose/material/material/integration-tests/material-catalog/src/main/AndroidManifest.xml

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/AndroidManifest.xml b/compose/material/material/integration-tests/material-catalog/src/main/AndroidManifest.xml
index 40c6046..d6ee456 100644
--- a/compose/material/material/integration-tests/material-catalog/src/main/AndroidManifest.xml
+++ b/compose/material/material/integration-tests/material-catalog/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
@@ -20,9 +21,8 @@
 
     <application>
         <activity android:name=".CatalogActivity"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:configChanges="orientation|screenSize"
-            android:label="Catalog">
+            android:theme="@style/Theme.Catalog"
+            android:label="@string/app_name">
         </activity>
     </application>
 </manifest>

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogActivity.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogActivity.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogActivity.kt
index 55c1ac1..580b0f5 100644
--- a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogActivity.kt
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogActivity.kt
@@ -19,38 +19,14 @@
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.darkColors
-import androidx.compose.material.lightColors
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
+import androidx.core.view.WindowCompat
 
 class CatalogActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
         setContent {
             CatalogApp()
         }
     }
 }
-
-@Composable
-fun CatalogApp() {
-    val colors = if (isSystemInDarkTheme()) darkColors() else lightColors()
-    MaterialTheme(colors = colors) {
-        Surface(modifier = Modifier.fillMaxSize()) {
-            Box {
-                Text(
-                    text = "Nothing to see here!",
-                    modifier = Modifier.align(Alignment.Center)
-                )
-            }
-        }
-    }
-}

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogApp.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/MaterialCatalog.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogApp.kt
similarity index 69%
copy from compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/MaterialCatalog.kt
copy to compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogApp.kt
index 5ece3c2..503ec64 100644
--- a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/MaterialCatalog.kt
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogApp.kt
@@ -16,6 +16,15 @@
 
 package androidx.compose.material.catalog
 
-import androidx.compose.integration.demos.common.ActivityDemo
+import androidx.compose.material.catalog.insets.ProvideWindowInsets
+import androidx.compose.material.catalog.ui.theme.CatalogTheme
+import androidx.compose.runtime.Composable
 
-val MaterialCatalog = ActivityDemo("Material Catalog", CatalogActivity::class)
+@Composable
+fun CatalogApp() {
+    ProvideWindowInsets {
+        CatalogTheme {
+            NavGraph()
+        }
+    }
+}

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogDemo.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/MaterialCatalog.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogDemo.kt
similarity index 91%
rename from compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/MaterialCatalog.kt
rename to compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogDemo.kt
index 5ece3c2..febf878 100644
--- a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/MaterialCatalog.kt
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/CatalogDemo.kt
@@ -18,4 +18,4 @@
 
 import androidx.compose.integration.demos.common.ActivityDemo
 
-val MaterialCatalog = ActivityDemo("Material Catalog", CatalogActivity::class)
+val MaterialCatalog = ActivityDemo("Material catalog", CatalogActivity::class)

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/NavGraph.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/NavGraph.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/NavGraph.kt
new file mode 100644
index 0000000..62d0076
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/NavGraph.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog
+
+import androidx.compose.material.catalog.model.Components
+import androidx.compose.material.catalog.ui.component.Component
+import androidx.compose.material.catalog.ui.example.Example
+import androidx.compose.material.catalog.ui.home.Home
+import androidx.compose.runtime.Composable
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.navArgument
+import androidx.navigation.compose.navigate
+import androidx.navigation.compose.rememberNavController
+
+@Composable
+fun NavGraph() {
+    val navController = rememberNavController()
+    NavHost(
+        navController = navController,
+        startDestination = HOME_ROUTE
+    ) {
+        composable(HOME_ROUTE) {
+            Home(
+                components = Components,
+                onComponentClick = { component ->
+                    val componentId = component.id
+                    val route = "$COMPONENT_ROUTE/$componentId"
+                    navController.navigate(route)
+                }
+            )
+        }
+        composable(
+            route = "$COMPONENT_ROUTE/" +
+                "{$COMPONENT_ID_ARG_NAME}",
+            arguments = listOf(
+                navArgument(COMPONENT_ID_ARG_NAME) { type = NavType.IntType }
+            )
+        ) { navBackStackEntry ->
+            val arguments = requireNotNull(navBackStackEntry.arguments) { "No arguments" }
+            val componentId = arguments.getInt(COMPONENT_ID_ARG_NAME)
+            val component = Components.first { component -> component.id == componentId }
+            Component(
+                component = component,
+                onExampleClick = { example ->
+                    val exampleIndex = component.examples.indexOf(example)
+                    val route = "$EXAMPLE_ROUTE/$componentId/$exampleIndex"
+                    navController.navigate(route)
+                },
+                onBackClick = { navController.popBackStack() }
+            )
+        }
+        composable(
+            route = "$EXAMPLE_ROUTE/" +
+                "{$COMPONENT_ID_ARG_NAME}/" +
+                "{$EXAMPLE_INDEX_ARG_NAME}",
+            arguments = listOf(
+                navArgument(COMPONENT_ID_ARG_NAME) { type = NavType.IntType },
+                navArgument(EXAMPLE_INDEX_ARG_NAME) { type = NavType.IntType }
+            )
+        ) { navBackStackEntry ->
+            val arguments = requireNotNull(navBackStackEntry.arguments) { "No arguments" }
+            val componentId = arguments.getInt(COMPONENT_ID_ARG_NAME)
+            val exampleIndex = arguments.getInt(EXAMPLE_INDEX_ARG_NAME)
+            val component = Components.first { component -> component.id == componentId }
+            val example = component.examples[exampleIndex]
+            Example(
+                example = example,
+                onBackClick = { navController.popBackStack() }
+            )
+        }
+    }
+}
+
+private const val HOME_ROUTE = "home"
+private const val COMPONENT_ROUTE = "component"
+private const val EXAMPLE_ROUTE = "example"
+private const val COMPONENT_ID_ARG_NAME = "componentId"
+private const val EXAMPLE_INDEX_ARG_NAME = "exampleIndex"

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Insets.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Insets.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Insets.kt
new file mode 100644
index 0000000..cd8110f
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Insets.kt
@@ -0,0 +1,644 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: Move to depending on Accompanist with prebuilts when we hit a stable version
+ * https://github.com/google/accompanist/blob/main/insets/src/main/java/com/google/accompanist
+ * /insets/Insets.kt
+ */
+
+@file:Suppress("NOTHING_TO_INLINE", "unused", "PropertyName")
+
+@file:JvmName("ComposeInsets")
+@file:JvmMultifileClass
+
+package androidx.compose.material.catalog.insets
+
+import android.annotation.SuppressLint
+import android.view.View
+import android.view.WindowInsetsAnimation
+import androidx.annotation.FloatRange
+import androidx.annotation.IntRange
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsAnimationCompat
+import androidx.core.view.WindowInsetsCompat
+
+/**
+ * Main holder of our inset values.
+ */
+@Stable
+class WindowInsets {
+    /**
+     * Inset values which match [WindowInsetsCompat.Type.systemBars]
+     */
+    val systemBars: InsetsType = InsetsType()
+
+    /**
+     * Inset values which match [WindowInsetsCompat.Type.systemGestures]
+     */
+    val systemGestures: InsetsType = InsetsType()
+
+    /**
+     * Inset values which match [WindowInsetsCompat.Type.navigationBars]
+     */
+    val navigationBars: InsetsType = InsetsType()
+
+    /**
+     * Inset values which match [WindowInsetsCompat.Type.statusBars]
+     */
+    val statusBars: InsetsType = InsetsType()
+
+    /**
+     * Inset values which match [WindowInsetsCompat.Type.ime]
+     */
+    val ime: InsetsType = InsetsType()
+}
+
+/**
+ * Represents the values for a type of insets, and stores information about the layout insets,
+ * animating insets, and visibility of the insets.
+ *
+ * [InsetsType] instances are commonly stored in a [WindowInsets] instance.
+ */
+@Stable
+@Suppress("MemberVisibilityCanBePrivate")
+class InsetsType : Insets {
+    private var ongoingAnimationsCount by mutableStateOf(0)
+    internal val _layoutInsets = MutableInsets()
+    internal val _animatedInsets = MutableInsets()
+
+    /**
+     * The layout insets for this [InsetsType]. These are the insets which are defined from the
+     * current window layout.
+     *
+     * You should not normally need to use this directly, and instead use [left], [top],
+     * [right], and [bottom] to return the correct value for the current state.
+     */
+    val layoutInsets: Insets
+        get() = _layoutInsets
+
+    /**
+     * The animated insets for this [InsetsType]. These are the insets which are updated from
+     * any on-going animations. If there are no animations in progress, the returned [Insets] will
+     * be empty.
+     *
+     * You should not normally need to use this directly, and instead use [left], [top],
+     * [right], and [bottom] to return the correct value for the current state.
+     */
+    val animatedInsets: Insets
+        get() = _animatedInsets
+
+    /**
+     * The left dimension of the insets in pixels.
+     */
+    override val left: Int
+        get() = (if (animationInProgress) animatedInsets else layoutInsets).left
+
+    /**
+     * The top dimension of the insets in pixels.
+     */
+    override val top: Int
+        get() = (if (animationInProgress) animatedInsets else layoutInsets).top
+
+    /**
+     * The right dimension of the insets in pixels.
+     */
+    override val right: Int
+        get() = (if (animationInProgress) animatedInsets else layoutInsets).right
+
+    /**
+     * The bottom dimension of the insets in pixels.
+     */
+    override val bottom: Int
+        get() = (if (animationInProgress) animatedInsets else layoutInsets).bottom
+
+    /**
+     * Whether the insets are currently visible.
+     */
+    var isVisible by mutableStateOf(true)
+        internal set
+
+    /**
+     * Whether this insets type is being animated at this moment.
+     */
+    val animationInProgress: Boolean
+        get() = ongoingAnimationsCount > 0
+
+    /**
+     * The progress of any ongoing animations, in the range of 0 to 1.
+     * If there is no animation in progress, this will return 0.
+     */
+    @get:FloatRange(from = 0.0, to = 1.0)
+    var animationFraction by mutableStateOf(0f)
+        internal set
+
+    internal fun onAnimationStart() {
+        ongoingAnimationsCount++
+    }
+
+    internal fun onAnimationEnd() {
+        ongoingAnimationsCount--
+
+        if (ongoingAnimationsCount == 0) {
+            // If there are no on-going animations, clear out the animated insets
+            _animatedInsets.reset()
+            animationFraction = 0f
+        }
+    }
+}
+
+@Stable
+interface Insets {
+    /**
+     * The left dimension of these insets in pixels.
+     */
+    @get:IntRange(from = 0)
+    val left: Int
+
+    /**
+     * The top dimension of these insets in pixels.
+     */
+    @get:IntRange(from = 0)
+    val top: Int
+
+    /**
+     * The right dimension of these insets in pixels.
+     */
+    @get:IntRange(from = 0)
+    val right: Int
+
+    /**
+     * The bottom dimension of these insets in pixels.
+     */
+    @get:IntRange(from = 0)
+    val bottom: Int
+
+    fun copy(
+        left: Int = this.left,
+        top: Int = this.top,
+        right: Int = this.right,
+        bottom: Int = this.bottom,
+    ): Insets = MutableInsets(left, top, right, bottom)
+
+    operator fun minus(other: Insets): Insets = copy(
+        left = this.left - other.left,
+        top = this.top - other.top,
+        right = this.right - other.right,
+        bottom = this.bottom - other.bottom,
+    )
+
+    operator fun plus(other: Insets): Insets = copy(
+        left = this.left + other.left,
+        top = this.top + other.top,
+        right = this.right + other.right,
+        bottom = this.bottom + other.bottom,
+    )
+}
+
+internal class MutableInsets(
+    left: Int = 0,
+    top: Int = 0,
+    right: Int = 0,
+    bottom: Int = 0,
+) : Insets {
+    override var left by mutableStateOf(left)
+        internal set
+
+    override var top by mutableStateOf(top)
+        internal set
+
+    override var right by mutableStateOf(right)
+        internal set
+
+    override var bottom by mutableStateOf(bottom)
+        internal set
+
+    fun reset() {
+        left = 0
+        top = 0
+        right = 0
+        bottom = 0
+    }
+}
+
+/**
+ * Composition local containing the current [WindowInsets].
+ */
+val LocalWindowInsets = staticCompositionLocalOf { WindowInsets() }
+
+/**
+ * This class sets up the necessary listeners on the given [view] to be able to observe
+ * [WindowInsetsCompat] instances dispatched by the system.
+ *
+ * This class is useful for when you prefer to handle the ownership of the [WindowInsets]
+ * yourself. One example of this is if you find yourself using [ProvideWindowInsets] in fragments.
+ *
+ * It is convenient to use [ProvideWindowInsets] in fragments, but that can result in a
+ * delay in the initial inset update, which results in a visual flicker.
+ * See [this issue](https://github.com/google/accompanist/issues/155) for more information.
+ *
+ * The alternative is for fragments to manage the [WindowInsets] themselves, like so:
+ *
+ * ```
+ * override fun onCreateView(
+ *     inflater: LayoutInflater,
+ *     container: ViewGroup?,
+ *     savedInstanceState: Bundle?
+ * ): View = ComposeView(requireContext()).apply {
+ *     layoutParams = LayoutParams(MATCH_PARENT, MATCH_PARENT)
+ *
+ *     // Create an ViewWindowInsetObserver using this view
+ *     val observer = ViewWindowInsetObserver(this)
+ *
+ *     // Call start() to start listening now.
+ *     // The WindowInsets instance is returned to us.
+ *     val windowInsets = observer.start()
+ *
+ *     setContent {
+ *         // Instead of calling ProvideWindowInsets, we use CompositionLocalProvider to provide
+ *         // the WindowInsets instance from above to LocalWindowInsets
+ *         CompositionLocalProvider(LocalWindowInsets provides windowInsets) {
+ *             /* Content */
+ *         }
+ *     }
+ * }
+ * ```
+ *
+ * @param view The view to observe [WindowInsetsCompat]s from.
+ */
+class ViewWindowInsetObserver(private val view: View) {
+    private val attachListener = object : View.OnAttachStateChangeListener {
+        override fun onViewAttachedToWindow(v: View) = v.requestApplyInsets()
+        override fun onViewDetachedFromWindow(v: View) = Unit
+    }
+
+    /**
+     * Whether this [ViewWindowInsetObserver] is currently observing.
+     */
+    @Suppress("MemberVisibilityCanBePrivate")
+    var isObserving: Boolean = false
+        private set
+
+    /**
+     * Start observing window insets from [view]. Make sure to call [stop] if required.
+     *
+     * @param consumeWindowInsets Whether to consume any [WindowInsetsCompat]s which are
+     * dispatched to the host view. Defaults to `true`.
+     */
+    fun start(
+        consumeWindowInsets: Boolean = true
+    ): WindowInsets {
+        return WindowInsets().apply {
+            observeInto(
+                windowInsets = this,
+                consumeWindowInsets = consumeWindowInsets,
+                windowInsetsAnimationsEnabled = false
+            )
+        }
+    }
+
+    /**
+     * Start observing window insets from [view]. Make sure to call [stop] if required.
+     *
+     * @param windowInsetsAnimationsEnabled Whether to listen for [WindowInsetsAnimation]s, such as
+     * IME animations.
+     * @param consumeWindowInsets Whether to consume any [WindowInsetsCompat]s which are
+     * dispatched to the host view. Defaults to `true`.
+     */
+    @ExperimentalAnimatedInsets
+    fun start(
+        windowInsetsAnimationsEnabled: Boolean,
+        consumeWindowInsets: Boolean = true,
+    ): WindowInsets {
+        return WindowInsets().apply {
+            observeInto(
+                windowInsets = this,
+                consumeWindowInsets = consumeWindowInsets,
+                windowInsetsAnimationsEnabled = windowInsetsAnimationsEnabled
+            )
+        }
+    }
+
+    internal fun observeInto(
+        windowInsets: WindowInsets,
+        consumeWindowInsets: Boolean,
+        windowInsetsAnimationsEnabled: Boolean,
+    ) {
+        require(!isObserving) {
+            "start() called, but this ViewWindowInsetObserver is already observing"
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(view) { _, wic ->
+            // Go through each inset type and update its layoutInsets from the
+            // WindowInsetsCompat values
+            windowInsets.statusBars.run {
+                _layoutInsets.updateFrom(wic.getInsets(WindowInsetsCompat.Type.statusBars()))
+                isVisible = wic.isVisible(WindowInsetsCompat.Type.statusBars())
+            }
+            windowInsets.navigationBars.run {
+                _layoutInsets.updateFrom(wic.getInsets(WindowInsetsCompat.Type.navigationBars()))
+                isVisible = wic.isVisible(WindowInsetsCompat.Type.navigationBars())
+            }
+            windowInsets.systemBars.run {
+                _layoutInsets.updateFrom(wic.getInsets(WindowInsetsCompat.Type.systemBars()))
+                isVisible = wic.isVisible(WindowInsetsCompat.Type.systemBars())
+            }
+            windowInsets.systemGestures.run {
+                _layoutInsets.updateFrom(wic.getInsets(WindowInsetsCompat.Type.systemGestures()))
+                isVisible = wic.isVisible(WindowInsetsCompat.Type.systemGestures())
+            }
+            windowInsets.ime.run {
+                _layoutInsets.updateFrom(wic.getInsets(WindowInsetsCompat.Type.ime()))
+                isVisible = wic.isVisible(WindowInsetsCompat.Type.ime())
+            }
+
+            if (consumeWindowInsets) WindowInsetsCompat.CONSUMED else wic
+        }
+
+        // Add an OnAttachStateChangeListener to request an inset pass each time we're attached
+        // to the window
+        val attachListener = object : View.OnAttachStateChangeListener {
+            override fun onViewAttachedToWindow(v: View) = v.requestApplyInsets()
+            override fun onViewDetachedFromWindow(v: View) = Unit
+        }
+        view.addOnAttachStateChangeListener(attachListener)
+
+        if (windowInsetsAnimationsEnabled) {
+            ViewCompat.setWindowInsetsAnimationCallback(
+                view,
+                InnerWindowInsetsAnimationCallback(windowInsets)
+            )
+        } else {
+            ViewCompat.setWindowInsetsAnimationCallback(view, null)
+        }
+
+        if (view.isAttachedToWindow) {
+            // If the view is already attached, we can request an inset pass now
+            view.requestApplyInsets()
+        }
+
+        isObserving = true
+    }
+
+    /**
+     * Removes any listeners from the [view] so that we no longer observe inset changes.
+     *
+     * This is only required to be called from hosts which have a shorter lifetime than the [view].
+     * For example, if you're using [ViewWindowInsetObserver] from a `@Composable` function,
+     * you should call [stop] from an `onDispose` block, like so:
+     *
+     * ```
+     * DisposableEffect(view) {
+     *     val observer = ViewWindowInsetObserver(view)
+     *     // ...
+     *     onDispose {
+     *         observer.stop()
+     *     }
+     * }
+     * ```
+     *
+     * Whereas if you're using this class from a fragment (or similar), it is not required to
+     * call this function since it will live as least as longer as the view.
+     */
+    fun stop() {
+        require(isObserving) {
+            "stop() called, but this ViewWindowInsetObserver is not currently observing"
+        }
+        view.removeOnAttachStateChangeListener(attachListener)
+        ViewCompat.setOnApplyWindowInsetsListener(view, null)
+        isObserving = false
+    }
+}
+
+/**
+ * Applies any [WindowInsetsCompat] values to [LocalWindowInsets], which are then available
+ * within [content].
+ *
+ * If you're using this in fragments, you may wish to take a look at
+ * [ViewWindowInsetObserver] for a more optimal solution.
+ *
+ * @param consumeWindowInsets Whether to consume any [WindowInsetsCompat]s which are dispatched to
+ * the host view. Defaults to `true`.
+ */
+@SuppressLint("UnnecessaryLambdaCreation")
+@Composable
+fun ProvideWindowInsets(
+    consumeWindowInsets: Boolean = true,
+    content: @Composable () -> Unit,
+) {
+    val view = LocalView.current
+    val windowInsets = LocalWindowInsets.current
+
+    DisposableEffect(view) {
+        val observer = ViewWindowInsetObserver(view)
+        observer.observeInto(
+            windowInsets = windowInsets,
+            consumeWindowInsets = consumeWindowInsets,
+            windowInsetsAnimationsEnabled = false
+        )
+        onDispose {
+            observer.stop()
+        }
+    }
+
+    CompositionLocalProvider(LocalWindowInsets provides windowInsets) {
+        content()
+    }
+}
+
+/**
+ * Applies any [WindowInsetsCompat] values to [LocalWindowInsets], which are then available
+ * within [content].
+ *
+ * If you're using this in fragments, you may wish to take a look at
+ * [ViewWindowInsetObserver] for a more optimal solution.
+ *
+ * @param windowInsetsAnimationsEnabled Whether to listen for [WindowInsetsAnimation]s, such as
+ * IME animations.
+ * @param consumeWindowInsets Whether to consume any [WindowInsetsCompat]s which are dispatched to
+ * the host view. Defaults to `true`.
+ */
+@SuppressLint("UnnecessaryLambdaCreation")
+@ExperimentalAnimatedInsets
+@Composable
+fun ProvideWindowInsets(
+    windowInsetsAnimationsEnabled: Boolean,
+    consumeWindowInsets: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    val view = LocalView.current
+    val windowInsets = remember { WindowInsets() }
+
+    DisposableEffect(view) {
+        val observer = ViewWindowInsetObserver(view)
+        observer.observeInto(
+            windowInsets = windowInsets,
+            consumeWindowInsets = consumeWindowInsets,
+            windowInsetsAnimationsEnabled = windowInsetsAnimationsEnabled
+        )
+        onDispose {
+            observer.stop()
+        }
+    }
+
+    CompositionLocalProvider(LocalWindowInsets provides windowInsets) {
+        content()
+    }
+}
+
+private class InnerWindowInsetsAnimationCallback(
+    private val windowInsets: WindowInsets,
+) : WindowInsetsAnimationCompat.Callback(DISPATCH_MODE_STOP) {
+    override fun onPrepare(animation: WindowInsetsAnimationCompat) {
+        // Go through each type and flag that an animation has started
+        if (animation.typeMask and WindowInsetsCompat.Type.ime() != 0) {
+            windowInsets.ime.onAnimationStart()
+        }
+        if (animation.typeMask and WindowInsetsCompat.Type.statusBars() != 0) {
+            windowInsets.statusBars.onAnimationStart()
+        }
+        if (animation.typeMask and WindowInsetsCompat.Type.navigationBars() != 0) {
+            windowInsets.navigationBars.onAnimationStart()
+        }
+        if (animation.typeMask and WindowInsetsCompat.Type.systemBars() != 0) {
+            windowInsets.systemBars.onAnimationStart()
+        }
+        if (animation.typeMask and WindowInsetsCompat.Type.systemGestures() != 0) {
+            windowInsets.systemGestures.onAnimationStart()
+        }
+    }
+
+    override fun onProgress(
+        platformInsets: WindowInsetsCompat,
+        runningAnimations: List<WindowInsetsAnimationCompat>
+    ): WindowInsetsCompat {
+        // Update each inset type with the given parameters
+        windowInsets.ime.updateAnimation(
+            platformInsets = platformInsets,
+            runningAnimations = runningAnimations,
+            type = WindowInsetsCompat.Type.ime()
+        )
+        windowInsets.statusBars.updateAnimation(
+            platformInsets = platformInsets,
+            runningAnimations = runningAnimations,
+            type = WindowInsetsCompat.Type.statusBars()
+        )
+        windowInsets.navigationBars.updateAnimation(
+            platformInsets = platformInsets,
+            runningAnimations = runningAnimations,
+            type = WindowInsetsCompat.Type.navigationBars()
+        )
+        windowInsets.systemBars.updateAnimation(
+            platformInsets = platformInsets,
+            runningAnimations = runningAnimations,
+            type = WindowInsetsCompat.Type.systemBars()
+        )
+        windowInsets.systemBars.updateAnimation(
+            platformInsets = platformInsets,
+            runningAnimations = runningAnimations,
+            type = WindowInsetsCompat.Type.systemGestures()
+        )
+        return platformInsets
+    }
+
+    private inline fun InsetsType.updateAnimation(
+        platformInsets: WindowInsetsCompat,
+        runningAnimations: List<WindowInsetsAnimationCompat>,
+        type: Int,
+    ) {
+        // If there are animations of the given type...
+        if (runningAnimations.any { it.typeMask or type != 0 }) {
+            // Update our animated inset values
+            _animatedInsets.updateFrom(platformInsets.getInsets(type))
+            // And update the animation fraction. We use the maximum animation progress of any
+            // ongoing animations for this type.
+            animationFraction = runningAnimations.maxOf { it.fraction }
+        }
+    }
+
+    override fun onEnd(animation: WindowInsetsAnimationCompat) {
+        // Go through each type and flag that an animation has ended
+        if (animation.typeMask and WindowInsetsCompat.Type.ime() != 0) {
+            windowInsets.ime.onAnimationEnd()
+        }
+        if (animation.typeMask and WindowInsetsCompat.Type.statusBars() != 0) {
+            windowInsets.statusBars.onAnimationEnd()
+        }
+        if (animation.typeMask and WindowInsetsCompat.Type.navigationBars() != 0) {
+            windowInsets.navigationBars.onAnimationEnd()
+        }
+        if (animation.typeMask and WindowInsetsCompat.Type.systemBars() != 0) {
+            windowInsets.systemBars.onAnimationEnd()
+        }
+        if (animation.typeMask and WindowInsetsCompat.Type.systemGestures() != 0) {
+            windowInsets.systemGestures.onAnimationEnd()
+        }
+    }
+}
+
+/**
+ * Updates our mutable state backed [InsetsType] from an Android system insets.
+ */
+private fun MutableInsets.updateFrom(insets: androidx.core.graphics.Insets) {
+    left = insets.left
+    top = insets.top
+    right = insets.right
+    bottom = insets.bottom
+}
+
+/**
+ * Ensures that each dimension is not less than corresponding dimension in the
+ * specified [minimumValue].
+ *
+ * @return this if every dimension is greater than or equal to the corresponding
+ * dimension value in [minimumValue], otherwise a copy of this with each dimension coerced with the
+ * corresponding dimension value in [minimumValue].
+ */
+fun InsetsType.coerceEachDimensionAtLeast(minimumValue: InsetsType): Insets {
+    // Fast path, no need to copy if: this >= minimumValue
+    if (left >= minimumValue.left && top >= minimumValue.top &&
+        right >= minimumValue.right && bottom >= minimumValue.bottom
+    ) {
+        return this
+    }
+    return MutableInsets(
+        left = left.coerceAtLeast(minimumValue.left),
+        top = top.coerceAtLeast(minimumValue.top),
+        right = right.coerceAtLeast(minimumValue.right),
+        bottom = bottom.coerceAtLeast(minimumValue.bottom),
+    )
+}
+
+enum class HorizontalSide { Left, Right }
+enum class VerticalSide { Top, Bottom }
+
+@RequiresOptIn(
+    message = "Animated Insets support is experimental. The API may be changed in the " +
+        "future."
+)
+@Retention(AnnotationRetention.BINARY)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+annotation class ExperimentalAnimatedInsets

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Padding.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Padding.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Padding.kt
new file mode 100644
index 0000000..c3fcfe6
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Padding.kt
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: Move to depending on Accompanist with prebuilts when we hit a stable version
+ * https://github.com/google/accompanist/blob/main/insets/src/main/java/com/google/accompanist
+ * /insets/Padding.kt
+ */
+
+@file:Suppress("NOTHING_TO_INLINE", "unused")
+
+@file:JvmName("ComposeInsets")
+@file:JvmMultifileClass
+
+package androidx.compose.material.catalog.insets
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.layout.LayoutModifier
+import androidx.compose.ui.layout.Measurable
+import androidx.compose.ui.layout.MeasureResult
+import androidx.compose.ui.layout.MeasureScope
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.offset
+
+/**
+ * Selectively apply additional space which matches the width/height of any system bars present
+ * on the respective edges of the screen.
+ *
+ * @param enabled Whether to apply padding using the system bars dimensions on the respective edges.
+ * Defaults to `true`.
+ */
+@SuppressLint("ModifierInspectorInfo")
+fun Modifier.systemBarsPadding(
+    enabled: Boolean = true
+): Modifier = composed {
+    InsetsPaddingModifier(
+        insetsType = LocalWindowInsets.current.systemBars,
+        applyLeft = enabled,
+        applyTop = enabled,
+        applyRight = enabled,
+        applyBottom = enabled
+    )
+}
+
+/**
+ * Apply additional space which matches the height of the status bars height along the top edge
+ * of the content.
+ */
+@SuppressLint("ModifierInspectorInfo")
+fun Modifier.statusBarsPadding(): Modifier = composed {
+    InsetsPaddingModifier(
+        insetsType = LocalWindowInsets.current.statusBars,
+        applyTop = true
+    )
+}
+
+/**
+ * Apply additional space which matches the height of the navigation bars height
+ * along the [bottom] edge of the content, and additional space which matches the width of
+ * the navigation bars on the respective [left] and [right] edges.
+ *
+ * @param bottom Whether to apply padding to the bottom edge, which matches the navigation bars
+ * height (if present) at the bottom edge of the screen. Defaults to `true`.
+ * @param left Whether to apply padding to the left edge, which matches the navigation bars width
+ * (if present) on the left edge of the screen. Defaults to `true`.
+ * @param right Whether to apply padding to the right edge, which matches the navigation bars width
+ * (if present) on the right edge of the screen. Defaults to `true`.
+ */
+@SuppressLint("ModifierInspectorInfo")
+fun Modifier.navigationBarsPadding(
+    bottom: Boolean = true,
+    left: Boolean = true,
+    right: Boolean = true
+): Modifier = composed {
+    InsetsPaddingModifier(
+        insetsType = LocalWindowInsets.current.navigationBars,
+        applyLeft = left,
+        applyRight = right,
+        applyBottom = bottom
+    )
+}
+
+/**
+ * Apply additional space which matches the height of the [WindowInsets.ime] (on-screen keyboard)
+ * height along the bottom edge of the content.
+ *
+ * This method has no special handling for the [WindowInsets.navigationBars], which usually
+ * intersect the [WindowInsets.ime]. Most apps will usually want to use the
+ * [Modifier.navigationBarsWithImePadding] modifier.
+ */
+@SuppressLint("ModifierInspectorInfo")
+fun Modifier.imePadding(): Modifier = composed {
+    InsetsPaddingModifier(
+        insetsType = LocalWindowInsets.current.ime,
+        applyLeft = true,
+        applyRight = true,
+        applyBottom = true,
+    )
+}
+
+/**
+ * Apply additional space which matches the height of the [WindowInsets.ime] (on-screen keyboard)
+ * height and [WindowInsets.navigationBars]. This is what apps should use to handle any insets
+ * at the bottom of the screen.
+ */
+@SuppressLint("ModifierInspectorInfo")
+fun Modifier.navigationBarsWithImePadding(): Modifier = composed {
+    InsetsPaddingModifier(
+        insetsType = LocalWindowInsets.current.ime,
+        minimumInsetsType = LocalWindowInsets.current.navigationBars,
+        applyLeft = true,
+        applyRight = true,
+        applyBottom = true,
+    )
+}
+
+private data class InsetsPaddingModifier(
+    private val insetsType: InsetsType,
+    private val minimumInsetsType: InsetsType? = null,
+    private val applyLeft: Boolean = false,
+    private val applyTop: Boolean = false,
+    private val applyRight: Boolean = false,
+    private val applyBottom: Boolean = false,
+) : LayoutModifier {
+    override fun MeasureScope.measure(
+        measurable: Measurable,
+        constraints: Constraints
+    ): MeasureResult {
+        val transformedInsets = if (minimumInsetsType != null) {
+            // If we have a minimum insets, coerce each dimensions
+            insetsType.coerceEachDimensionAtLeast(minimumInsetsType)
+        } else insetsType
+
+        val left = if (applyLeft) transformedInsets.left else 0
+        val top = if (applyTop) transformedInsets.top else 0
+        val right = if (applyRight) transformedInsets.right else 0
+        val bottom = if (applyBottom) transformedInsets.bottom else 0
+        val horizontal = left + right
+        val vertical = top + bottom
+
+        val placeable = measurable.measure(constraints.offset(-horizontal, -vertical))
+
+        val width = (placeable.width + horizontal)
+            .coerceIn(constraints.minWidth, constraints.maxWidth)
+        val height = (placeable.height + vertical)
+            .coerceIn(constraints.minHeight, constraints.maxHeight)
+        return layout(width, height) {
+            placeable.place(left, top)
+        }
+    }
+}
+
+/**
+ * Returns the current insets converted into a [PaddingValues].
+ *
+ * @param start Whether to apply the inset on the start dimension.
+ * @param top Whether to apply the inset on the top dimension.
+ * @param end Whether to apply the inset on the end dimension.
+ * @param bottom Whether to apply the inset on the bottom dimension.
+ * @param additionalHorizontal Value to add to the start and end dimensions.
+ * @param additionalVertical Value to add to the top and bottom dimensions.
+ */
+@Composable
+inline fun InsetsType.toPaddingValues(
+    start: Boolean = true,
+    top: Boolean = true,
+    end: Boolean = true,
+    bottom: Boolean = true,
+    additionalHorizontal: Dp = 0.dp,
+    additionalVertical: Dp = 0.dp,
+) = toPaddingValues(
+    start = start,
+    top = top,
+    end = end,
+    bottom = bottom,
+    additionalStart = additionalHorizontal,
+    additionalTop = additionalVertical,
+    additionalEnd = additionalHorizontal,
+    additionalBottom = additionalVertical
+)
+
+/**
+ * Returns the current insets converted into a [PaddingValues].
+ *
+ * @param start Whether to apply the inset on the start dimension.
+ * @param top Whether to apply the inset on the top dimension.
+ * @param end Whether to apply the inset on the end dimension.
+ * @param bottom Whether to apply the inset on the bottom dimension.
+ * @param additionalStart Value to add to the start dimension.
+ * @param additionalTop Value to add to the top dimension.
+ * @param additionalEnd Value to add to the end dimension.
+ * @param additionalBottom Value to add to the bottom dimension.
+ */
+@Composable
+fun InsetsType.toPaddingValues(
+    start: Boolean = true,
+    top: Boolean = true,
+    end: Boolean = true,
+    bottom: Boolean = true,
+    additionalStart: Dp = 0.dp,
+    additionalTop: Dp = 0.dp,
+    additionalEnd: Dp = 0.dp,
+    additionalBottom: Dp = 0.dp,
+): PaddingValues = with(LocalDensity.current) {
+    val layoutDirection = LocalLayoutDirection.current
+    PaddingValues(
+        start = additionalStart + when {
+            start && layoutDirection == LayoutDirection.Ltr -> this@toPaddingValues.left.toDp()
+            start && layoutDirection == LayoutDirection.Rtl -> this@toPaddingValues.right.toDp()
+            else -> 0.dp
+        },
+        top = additionalTop + when {
+            top -> this@toPaddingValues.top.toDp()
+            else -> 0.dp
+        },
+        end = additionalEnd + when {
+            end && layoutDirection == LayoutDirection.Ltr -> this@toPaddingValues.right.toDp()
+            end && layoutDirection == LayoutDirection.Rtl -> this@toPaddingValues.left.toDp()
+            else -> 0.dp
+        },
+        bottom = additionalBottom + when {
+            bottom -> this@toPaddingValues.bottom.toDp()
+            else -> 0.dp
+        }
+    )
+}

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Size.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Size.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Size.kt
new file mode 100644
index 0000000..115014d
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/insets/Size.kt
@@ -0,0 +1,270 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TODO: Move to depending on Accompanist with prebuilts when we hit a stable version
+ * https://github.com/google/accompanist/blob/main/insets/src/main/java/com/google/accompanist
+ * /insets/Size.kt
+ */
+
+@file:Suppress("NOTHING_TO_INLINE", "unused")
+
+@file:JvmName("ComposeInsets")
+@file:JvmMultifileClass
+
+package androidx.compose.material.catalog.insets
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.layout.height
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.layout.IntrinsicMeasurable
+import androidx.compose.ui.layout.IntrinsicMeasureScope
+import androidx.compose.ui.layout.LayoutModifier
+import androidx.compose.ui.layout.Measurable
+import androidx.compose.ui.layout.MeasureResult
+import androidx.compose.ui.layout.MeasureScope
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+/**
+ * Declare the height of the content to match the height of the status bars exactly.
+ *
+ * This is very handy when used with `Spacer` to push content below the status bars:
+ * ```
+ * Column {
+ *     Spacer(Modifier.statusBarHeight())
+ *
+ *     // Content to be drawn below status bars (y-axis)
+ * }
+ * ```
+ *
+ * It's also useful when used to draw a scrim which matches the status bars:
+ * ```
+ * Spacer(
+ *     Modifier.statusBarHeight()
+ *         .fillMaxWidth()
+ *         .drawBackground(MaterialTheme.colors.background.copy(alpha = 0.3f)
+ * )
+ * ```
+ *
+ * Internally this matches the behavior of the [Modifier.height] modifier.
+ *
+ * @param additional Any additional height to add to the status bars size.
+ */
+@SuppressLint("ModifierInspectorInfo")
+fun Modifier.statusBarsHeight(
+    additional: Dp = 0.dp
+): Modifier = composed {
+    InsetsSizeModifier(
+        insetsType = LocalWindowInsets.current.statusBars,
+        heightSide = VerticalSide.Top,
+        additionalHeight = additional
+    )
+}
+
+/**
+ * Declare the preferred height of the content to match the height of the navigation bars when
+ * present at the bottom of the screen.
+ *
+ * This is very handy when used with `Spacer` to push content below the navigation bars:
+ * ```
+ * Column {
+ *     // Content to be drawn above status bars (y-axis)
+ *     Spacer(Modifier.navigationBarHeight())
+ * }
+ * ```
+ *
+ * It's also useful when used to draw a scrim which matches the navigation bars:
+ * ```
+ * Spacer(
+ *     Modifier.navigationBarHeight()
+ *         .fillMaxWidth()
+ *         .drawBackground(MaterialTheme.colors.background.copy(alpha = 0.3f)
+ * )
+ * ```
+ *
+ * Internally this matches the behavior of the [Modifier.height] modifier.
+ *
+ * @param additional Any additional height to add to the status bars size.
+ */
+@SuppressLint("ModifierInspectorInfo")
+fun Modifier.navigationBarsHeight(
+    additional: Dp = 0.dp
+): Modifier = composed {
+    InsetsSizeModifier(
+        insetsType = LocalWindowInsets.current.navigationBars,
+        heightSide = VerticalSide.Bottom,
+        additionalHeight = additional
+    )
+}
+
+/**
+ * Declare the preferred width of the content to match the width of the navigation bars,
+ * on the given [side].
+ *
+ * This is very handy when used with `Spacer` to push content inside from any vertical
+ * navigation bars (typically when the device is in landscape):
+ * ```
+ * Row {
+ *     Spacer(Modifier.navigationBarWidth(HorizontalSide.Left))
+ *
+ *     // Content to be inside the navigation bars (x-axis)
+ *
+ *     Spacer(Modifier.navigationBarWidth(HorizontalSide.Right))
+ * }
+ * ```
+ *
+ * It's also useful when used to draw a scrim which matches the navigation bars:
+ * ```
+ * Spacer(
+ *     Modifier.navigationBarWidth(HorizontalSide.Left)
+ *         .fillMaxHeight()
+ *         .drawBackground(MaterialTheme.colors.background.copy(alpha = 0.3f)
+ * )
+ * ```
+ *
+ * Internally this matches the behavior of the [Modifier.height] modifier.
+ *
+ * @param side The navigation bar side to use as the source for the width.
+ * @param additional Any additional width to add to the status bars size.
+ */
+@SuppressLint("ModifierInspectorInfo")
+fun Modifier.navigationBarsWidth(
+    side: HorizontalSide,
+    additional: Dp = 0.dp
+): Modifier = composed {
+    InsetsSizeModifier(
+        insetsType = LocalWindowInsets.current.navigationBars,
+        widthSide = side,
+        additionalWidth = additional
+    )
+}
+
+/**
+ * [Modifier] class which powers the modifiers above. This is the lower level modifier which
+ * supports the functionality through a number of parameters.
+ *
+ * We may make this public at some point. If you need this, please let us know via the
+ * issue tracker.
+ */
+private data class InsetsSizeModifier(
+    private val insetsType: InsetsType,
+    private val widthSide: HorizontalSide? = null,
+    private val additionalWidth: Dp = 0.dp,
+    private val heightSide: VerticalSide? = null,
+    private val additionalHeight: Dp = 0.dp
+) : LayoutModifier {
+    private val Density.targetConstraints: Constraints
+        get() {
+            val additionalWidthPx = additionalWidth.roundToPx()
+            val additionalHeightPx = additionalHeight.roundToPx()
+            return Constraints(
+                minWidth = additionalWidthPx + when (widthSide) {
+                    HorizontalSide.Left -> insetsType.left
+                    HorizontalSide.Right -> insetsType.right
+                    null -> 0
+                },
+                minHeight = additionalHeightPx + when (heightSide) {
+                    VerticalSide.Top -> insetsType.top
+                    VerticalSide.Bottom -> insetsType.bottom
+                    null -> 0
+                },
+                maxWidth = when (widthSide) {
+                    HorizontalSide.Left -> insetsType.left + additionalWidthPx
+                    HorizontalSide.Right -> insetsType.right + additionalWidthPx
+                    null -> Constraints.Infinity
+                },
+                maxHeight = when (heightSide) {
+                    VerticalSide.Top -> insetsType.top + additionalHeightPx
+                    VerticalSide.Bottom -> insetsType.bottom + additionalHeightPx
+                    null -> Constraints.Infinity
+                }
+            )
+        }
+
+    override fun MeasureScope.measure(
+        measurable: Measurable,
+        constraints: Constraints
+    ): MeasureResult {
+        val wrappedConstraints = targetConstraints.let { targetConstraints ->
+            val resolvedMinWidth = if (widthSide != null) {
+                targetConstraints.minWidth
+            } else {
+                constraints.minWidth.coerceAtMost(targetConstraints.maxWidth)
+            }
+            val resolvedMaxWidth = if (widthSide != null) {
+                targetConstraints.maxWidth
+            } else {
+                constraints.maxWidth.coerceAtLeast(targetConstraints.minWidth)
+            }
+            val resolvedMinHeight = if (heightSide != null) {
+                targetConstraints.minHeight
+            } else {
+                constraints.minHeight.coerceAtMost(targetConstraints.maxHeight)
+            }
+            val resolvedMaxHeight = if (heightSide != null) {
+                targetConstraints.maxHeight
+            } else {
+                constraints.maxHeight.coerceAtLeast(targetConstraints.minHeight)
+            }
+            Constraints(
+                resolvedMinWidth,
+                resolvedMaxWidth,
+                resolvedMinHeight,
+                resolvedMaxHeight
+            )
+        }
+        val placeable = measurable.measure(wrappedConstraints)
+        return layout(placeable.width, placeable.height) {
+            placeable.place(0, 0)
+        }
+    }
+
+    override fun IntrinsicMeasureScope.minIntrinsicWidth(
+        measurable: IntrinsicMeasurable,
+        height: Int
+    ) = measurable.minIntrinsicWidth(height).let {
+        val constraints = targetConstraints
+        it.coerceIn(constraints.minWidth, constraints.maxWidth)
+    }
+
+    override fun IntrinsicMeasureScope.maxIntrinsicWidth(
+        measurable: IntrinsicMeasurable,
+        height: Int
+    ) = measurable.maxIntrinsicWidth(height).let {
+        val constraints = targetConstraints
+        it.coerceIn(constraints.minWidth, constraints.maxWidth)
+    }
+
+    override fun IntrinsicMeasureScope.minIntrinsicHeight(
+        measurable: IntrinsicMeasurable,
+        width: Int
+    ) = measurable.minIntrinsicHeight(width).let {
+        val constraints = targetConstraints
+        it.coerceIn(constraints.minHeight, constraints.maxHeight)
+    }
+
+    override fun IntrinsicMeasureScope.maxIntrinsicHeight(
+        measurable: IntrinsicMeasurable,
+        width: Int
+    ) = measurable.maxIntrinsicHeight(width).let {
+        val constraints = targetConstraints
+        it.coerceIn(constraints.minHeight, constraints.maxHeight)
+    }
+}

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/model/Components.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/model/Components.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/model/Components.kt
new file mode 100644
index 0000000..5e17a3a
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/model/Components.kt
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.model
+
+import androidx.annotation.DrawableRes
+import androidx.compose.material.catalog.R
+
+data class Component(
+    val id: Int,
+    val name: String,
+    val description: String,
+    @DrawableRes
+    val icon: Int = R.drawable.ic_component,
+    val examples: List<Example>
+)
+
+private val AppBarsBottom = Component(
+    id = 1,
+    name = "App bars: bottom",
+    description = "A bottom app bar displays navigation and key actions at the bottom of mobile " +
+        "screens.",
+    examples = AppBarsBottomExamples
+)
+
+private val AppBarsTop = Component(
+    id = 2,
+    name = "App bars: top",
+    description = "The top app bar displays information and actions relating to the current " +
+        "screen.",
+    examples = AppBarsTopExamples
+)
+
+private val Backdrop = Component(
+    id = 3,
+    name = "Backdrop",
+    description = "A backdrop appears behind all other surfaces in an app, displaying contextual " +
+        "and actionable content.",
+    examples = BackdropExamples
+)
+
+private val BottomNavigation = Component(
+    id = 4,
+    name = "Bottom navigation",
+    description = "Bottom navigation bars allow movement between primary destinations in an app.",
+    examples = BottomNavigationExamples
+)
+
+private val Buttons = Component(
+    id = 5,
+    name = "Buttons",
+    description = "Buttons allow users to take actions, and make choices, with a single tap.",
+    examples = ButtonsExamples
+)
+
+private val ButtonsFloatingActionButton = Component(
+    id = 6,
+    name = "Buttons: floating action button",
+    description = "A floating action button (FAB) represents the primary action of a screen.",
+    examples = ButtonsFloatingActionButtonExamples
+)
+
+private val Cards = Component(
+    id = 7,
+    name = "Cards",
+    description = "Cards contain content and actions about a single subject.",
+    examples = CardsExamples
+)
+
+private val Checkboxes = Component(
+    id = 8,
+    name = "Checkboxes",
+    description = "Checkboxes allow the user to select one or more items from a set or turn an " +
+        "option on or off.",
+    examples = CheckboxesExamples
+)
+
+private val Dialogs = Component(
+    id = 9,
+    name = "Dialogs",
+    description = "Dialogs inform users about a task and can contain critical information, " +
+        "require decisions, or involve multiple tasks.",
+    examples = DialogsExamples
+)
+
+private val Dividers = Component(
+    id = 10,
+    name = "Dividers",
+    description = "A divider is a thin line that groups content in lists and layouts.",
+    examples = DividersExamples
+)
+
+private val Lists = Component(
+    id = 11,
+    name = "Lists",
+    description = "Lists are continuous, vertical indexes of text or images.",
+    examples = ListsExamples
+)
+
+private val Menus = Component(
+    id = 12,
+    name = "Menus",
+    description = "Menus display a list of choices on temporary surfaces.",
+    examples = MenusExamples
+)
+
+private val NavigationDrawer = Component(
+    id = 13,
+    name = "Navigation drawer",
+    description = "Navigation drawers provide access to destinations in your app.",
+    examples = NavigationDrawerExamples
+)
+
+private val ProgressIndicators = Component(
+    id = 14,
+    name = "Progress indicators",
+    description = "Progress indicators express an unspecified wait time or display the length of " +
+        "a process.",
+    examples = ProgressIndicatorsExamples
+)
+
+private val RadioButtons = Component(
+    id = 15,
+    name = "Radio buttons",
+    description = "Radio buttons allow the user to select one option from a set.",
+    examples = RadioButtonsExamples
+)
+
+private val SheetsBottom = Component(
+    id = 16,
+    name = "Sheets: bottom",
+    description = "Bottom sheets are surfaces containing supplementary content that are anchored " +
+        "to the bottom of the screen.",
+    examples = SheetsBottomExamples
+)
+
+private val Sliders = Component(
+    id = 17,
+    name = "Sliders",
+    description = "Sliders allow users to make selections from a range of values.",
+    examples = SlidersExamples
+)
+
+private val Snackbars = Component(
+    id = 18,
+    name = "Snackbars",
+    description = "Snackbars provide brief messages about app processes at the bottom of the " +
+        "screen.",
+    examples = SnackbarsExamples
+)
+
+private val Switches = Component(
+    id = 19,
+    name = "Switches",
+    description = "Switches toggle the state of a single setting on or off.",
+    examples = SwitchesExamples
+)
+
+private val Tabs = Component(
+    id = 20,
+    name = "Tabs",
+    description = "Tabs organize content across different screens, data sets, and other " +
+        "interactions.",
+    examples = TabsExamples
+)
+
+private val TextFields = Component(
+    id = 21,
+    name = "Text fields",
+    description = "Text fields let users enter and edit text.",
+    examples = TextFieldsExamples
+)
+
+val Components = listOf(
+    AppBarsBottom,
+    AppBarsTop,
+    Backdrop,
+    BottomNavigation,
+    Buttons,
+    ButtonsFloatingActionButton,
+    Cards,
+    Checkboxes,
+    Dialogs,
+    Dividers,
+    Lists,
+    Menus,
+    NavigationDrawer,
+    ProgressIndicators,
+    RadioButtons,
+    SheetsBottom,
+    Sliders,
+    Snackbars,
+    Switches,
+    Tabs,
+    TextFields
+)

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/model/Examples.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/model/Examples.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/model/Examples.kt
new file mode 100644
index 0000000..8a192f8
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/model/Examples.kt
@@ -0,0 +1,524 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("COMPOSABLE_FUNCTION_REFERENCE")
+
+package androidx.compose.material.catalog.model
+
+import androidx.compose.material.samples.AlertDialogSample
+import androidx.compose.material.samples.BackdropScaffoldSample
+import androidx.compose.material.samples.BottomDrawerSample
+import androidx.compose.material.samples.BottomNavigationSample
+import androidx.compose.material.samples.BottomNavigationWithOnlySelectedLabelsSample
+import androidx.compose.material.samples.BottomSheetScaffoldSample
+import androidx.compose.material.samples.ButtonSample
+import androidx.compose.material.samples.ButtonWithIconSample
+import androidx.compose.material.samples.CardSample
+import androidx.compose.material.samples.CheckboxSample
+import androidx.compose.material.samples.CircularProgressIndicatorSample
+import androidx.compose.material.samples.ClickableListItems
+import androidx.compose.material.samples.CustomAlertDialogSample
+import androidx.compose.material.samples.FancyIndicatorContainerTabs
+import androidx.compose.material.samples.FancyIndicatorTabs
+import androidx.compose.material.samples.FancyTabs
+import androidx.compose.material.samples.FluidExtendedFab
+import androidx.compose.material.samples.IconTabs
+import androidx.compose.material.samples.LeadingIconTabs
+import androidx.compose.material.samples.LinearProgressIndicatorSample
+import androidx.compose.material.samples.MenuSample
+import androidx.compose.material.samples.ModalBottomSheetSample
+import androidx.compose.material.samples.ModalDrawerSample
+import androidx.compose.material.samples.OneLineListItems
+import androidx.compose.material.samples.OneLineRtlLtrListItems
+import androidx.compose.material.samples.OutlinedButtonSample
+import androidx.compose.material.samples.OutlinedTextFieldSample
+import androidx.compose.material.samples.PasswordTextField
+import androidx.compose.material.samples.RadioButtonSample
+import androidx.compose.material.samples.RadioGroupSample
+import androidx.compose.material.samples.ScaffoldWithCoroutinesSnackbar
+import androidx.compose.material.samples.ScaffoldWithCustomSnackbar
+import androidx.compose.material.samples.ScaffoldWithSimpleSnackbar
+import androidx.compose.material.samples.ScrollingFancyIndicatorContainerTabs
+import androidx.compose.material.samples.ScrollingTextTabs
+import androidx.compose.material.samples.SimpleBottomAppBar
+import androidx.compose.material.samples.SimpleExtendedFabNoIcon
+import androidx.compose.material.samples.SimpleExtendedFabWithIcon
+import androidx.compose.material.samples.SimpleFab
+import androidx.compose.material.samples.SimpleOutlinedTextFieldSample
+import androidx.compose.material.samples.SimpleTextFieldSample
+import androidx.compose.material.samples.SimpleTopAppBar
+import androidx.compose.material.samples.SliderSample
+import androidx.compose.material.samples.StepsSliderSample
+import androidx.compose.material.samples.SwitchSample
+import androidx.compose.material.samples.TextAndIconTabs
+import androidx.compose.material.samples.TextButtonSample
+import androidx.compose.material.samples.TextFieldSample
+import androidx.compose.material.samples.TextFieldWithErrorState
+import androidx.compose.material.samples.TextFieldWithHelperMessage
+import androidx.compose.material.samples.TextFieldWithHideKeyboardOnImeAction
+import androidx.compose.material.samples.TextFieldWithIcons
+import androidx.compose.material.samples.TextFieldWithPlaceholder
+import androidx.compose.material.samples.TextTabs
+import androidx.compose.material.samples.ThreeLineListItems
+import androidx.compose.material.samples.ThreeLineRtlLtrListItems
+import androidx.compose.material.samples.TriStateCheckboxSample
+import androidx.compose.material.samples.TwoLineListItems
+import androidx.compose.material.samples.TwoLineRtlLtrListItems
+import androidx.compose.runtime.Composable
+
+data class Example(
+    val name: String,
+    val description: String,
+    val content: @Composable () -> Unit
+)
+
+private const val AppBarsBottomExampleDescription = "App bars: bottom examples"
+val AppBarsBottomExamples = listOf(
+    Example(
+        name = ::SimpleBottomAppBar.name,
+        description = AppBarsBottomExampleDescription
+    ) {
+        SimpleBottomAppBar()
+    }
+)
+
+private const val AppBarsTopExampleDescription = "App bars: top examples"
+val AppBarsTopExamples = listOf(
+    Example(
+        name = ::SimpleTopAppBar.name,
+        description = AppBarsTopExampleDescription
+    ) {
+        SimpleTopAppBar()
+    }
+)
+
+private const val BackdropExampleDescription = "Backdrop examples"
+val BackdropExamples = listOf(
+    Example(
+        name = ::BackdropScaffoldSample.name,
+        description = BackdropExampleDescription
+    ) {
+        BackdropScaffoldSample()
+    }
+)
+
+private const val BottomNavigationExampleDescription = "Bottom navigation examples"
+val BottomNavigationExamples = listOf(
+    Example(
+        name = ::BottomNavigationSample.name,
+        description = BottomNavigationExampleDescription
+    ) {
+        BottomNavigationSample()
+    },
+    Example(
+        name = ::BottomNavigationWithOnlySelectedLabelsSample.name,
+        description = BottomNavigationExampleDescription
+    ) {
+        BottomNavigationWithOnlySelectedLabelsSample()
+    }
+)
+
+private const val ButtonsExampleDescription = "Buttons examples"
+val ButtonsExamples = listOf(
+    Example(
+        name = ::ButtonSample.name,
+        description = ButtonsExampleDescription
+    ) {
+        ButtonSample()
+    },
+    Example(
+        name = ::OutlinedButtonSample.name,
+        description = ButtonsExampleDescription
+    ) {
+        OutlinedButtonSample()
+    },
+    Example(
+        name = ::TextButtonSample.name,
+        description = ButtonsExampleDescription
+    ) {
+        TextButtonSample()
+    },
+    Example(
+        name = ::ButtonWithIconSample.name,
+        description = ButtonsExampleDescription
+    ) {
+        ButtonWithIconSample()
+    }
+)
+
+private const val ButtonsFloatingActionButtonExampleDescription = "Buttons: floating action " +
+    "button examples"
+val ButtonsFloatingActionButtonExamples = listOf(
+    Example(
+        name = ::SimpleFab.name,
+        description = ButtonsFloatingActionButtonExampleDescription
+    ) {
+        SimpleFab()
+    },
+    Example(
+        name = ::SimpleExtendedFabNoIcon.name,
+        description = ButtonsFloatingActionButtonExampleDescription
+    ) {
+        SimpleExtendedFabNoIcon()
+    },
+    Example(
+        name = ::SimpleExtendedFabWithIcon.name,
+        description = ButtonsFloatingActionButtonExampleDescription
+    ) {
+        SimpleExtendedFabWithIcon()
+    },
+    Example(
+        name = ::FluidExtendedFab.name,
+        description = ButtonsFloatingActionButtonExampleDescription
+    ) {
+        FluidExtendedFab()
+    },
+)
+
+private const val CardsExampleDescription = "Cards examples"
+val CardsExamples = listOf(
+    Example(
+        name = ::CardSample.name,
+        description = CardsExampleDescription
+    ) {
+        CardSample()
+    }
+)
+
+private const val CheckboxesExampleDescription = "Checkboxes examples"
+val CheckboxesExamples = listOf(
+    Example(
+        name = ::CheckboxSample.name,
+        description = CheckboxesExampleDescription
+    ) {
+        CheckboxSample()
+    },
+    Example(
+        name = ::TriStateCheckboxSample.name,
+        description = CheckboxesExampleDescription
+    ) {
+        TriStateCheckboxSample()
+    }
+)
+
+private const val DialogsExampleDescription = "Dialogs examples"
+val DialogsExamples = listOf(
+    Example(
+        name = ::AlertDialogSample.name,
+        description = DialogsExampleDescription
+    ) {
+        AlertDialogSample()
+    },
+    Example(
+        name = ::CustomAlertDialogSample.name,
+        description = DialogsExampleDescription
+    ) {
+        CustomAlertDialogSample()
+    }
+)
+
+// No divider samples
+val DividersExamples = emptyList<Example>()
+
+private const val ListsExampleDescription = "Lists examples"
+val ListsExamples = listOf(
+    Example(
+        name = ::ClickableListItems.name,
+        description = ListsExampleDescription
+    ) {
+        ClickableListItems()
+    },
+    Example(
+        name = ::OneLineListItems.name,
+        description = ListsExampleDescription
+    ) {
+        OneLineListItems()
+    },
+    Example(
+        name = ::TwoLineListItems.name,
+        description = ListsExampleDescription
+    ) {
+        TwoLineListItems()
+    },
+    Example(
+        name = ::ThreeLineListItems.name,
+        description = ListsExampleDescription
+    ) {
+        ThreeLineListItems()
+    },
+    Example(
+        name = ::OneLineRtlLtrListItems.name,
+        description = ListsExampleDescription
+    ) {
+        OneLineRtlLtrListItems()
+    },
+    Example(
+        name = ::TwoLineRtlLtrListItems.name,
+        description = ListsExampleDescription
+    ) {
+        TwoLineRtlLtrListItems()
+    },
+    Example(
+        name = ::ThreeLineRtlLtrListItems.name,
+        description = ListsExampleDescription
+    ) {
+        ThreeLineRtlLtrListItems()
+    }
+)
+
+private const val MenusExampleDescription = "Menus examples"
+val MenusExamples = listOf(
+    Example(
+        name = ::MenuSample.name,
+        description = MenusExampleDescription
+    ) {
+        MenuSample()
+    }
+)
+
+private const val NavigationDrawerExampleDescription = "Navigation drawer examples"
+val NavigationDrawerExamples = listOf(
+    Example(
+        name = ::ModalDrawerSample.name,
+        description = NavigationDrawerExampleDescription
+    ) {
+        ModalDrawerSample()
+    },
+    Example(
+        name = ::BottomDrawerSample.name,
+        description = NavigationDrawerExampleDescription
+    ) {
+        BottomDrawerSample()
+    }
+)
+
+private const val ProgressIndicatorsExampleDescription = "Progress indicators examples"
+val ProgressIndicatorsExamples = listOf(
+    Example(
+        name = ::LinearProgressIndicatorSample.name,
+        description = ProgressIndicatorsExampleDescription
+    ) {
+        LinearProgressIndicatorSample()
+    },
+    Example(
+        name = ::CircularProgressIndicatorSample.name,
+        description = ProgressIndicatorsExampleDescription
+    ) {
+        CircularProgressIndicatorSample()
+    }
+)
+
+private const val RadioButtonsExampleDescription = "Radio buttons examples"
+val RadioButtonsExamples = listOf(
+    Example(
+        name = ::RadioButtonSample.name,
+        description = RadioButtonsExampleDescription
+    ) {
+        RadioButtonSample()
+    },
+    Example(
+        name = ::RadioGroupSample.name,
+        description = RadioButtonsExampleDescription
+    ) {
+        RadioGroupSample()
+    },
+)
+
+private const val SheetsBottomExampleDescription = "Sheets: bottom examples"
+val SheetsBottomExamples = listOf(
+    Example(
+        name = ::BottomSheetScaffoldSample.name,
+        description = SheetsBottomExampleDescription
+    ) {
+        BottomSheetScaffoldSample()
+    },
+    Example(
+        name = ::ModalBottomSheetSample.name,
+        description = SheetsBottomExampleDescription
+    ) {
+        ModalBottomSheetSample()
+    }
+)
+
+private const val SlidersExampleDescription = "Sliders examples"
+val SlidersExamples = listOf(
+    Example(
+        name = ::SliderSample.name,
+        description = SlidersExampleDescription
+    ) {
+        SliderSample()
+    },
+    Example(
+        name = ::StepsSliderSample.name,
+        description = SlidersExampleDescription
+    ) {
+        StepsSliderSample()
+    }
+)
+
+private const val SnackbarsExampleDescription = "Snackbars examples"
+val SnackbarsExamples = listOf(
+    Example(
+        name = ::ScaffoldWithSimpleSnackbar.name,
+        description = SnackbarsExampleDescription
+    ) {
+        ScaffoldWithSimpleSnackbar()
+    },
+    Example(
+        name = ::ScaffoldWithCustomSnackbar.name,
+        description = SnackbarsExampleDescription
+    ) {
+        ScaffoldWithCustomSnackbar()
+    },
+    Example(
+        name = ::ScaffoldWithCoroutinesSnackbar.name,
+        description = SnackbarsExampleDescription
+    ) {
+        ScaffoldWithCoroutinesSnackbar()
+    }
+)
+
+private const val SwitchesExampleDescription = "Switches examples"
+val SwitchesExamples = listOf(
+    Example(
+        name = ::SwitchSample.name,
+        description = SwitchesExampleDescription
+    ) {
+        SwitchSample()
+    }
+)
+
+private const val TabsExampleDescription = "Tabs examples"
+val TabsExamples = listOf(
+    Example(
+        name = ::TextTabs.name,
+        description = TabsExampleDescription
+    ) {
+        TextTabs()
+    },
+    Example(
+        name = ::IconTabs.name,
+        description = TabsExampleDescription
+    ) {
+        IconTabs()
+    },
+    Example(
+        name = ::TextAndIconTabs.name,
+        description = TabsExampleDescription
+    ) {
+        TextAndIconTabs()
+    },
+    Example(
+        name = ::LeadingIconTabs.name,
+        description = TabsExampleDescription
+    ) {
+        LeadingIconTabs()
+    },
+    Example(
+        name = ::ScrollingTextTabs.name,
+        description = TabsExampleDescription
+    ) {
+        ScrollingTextTabs()
+    },
+    Example(
+        name = ::FancyTabs.name,
+        description = TabsExampleDescription
+    ) {
+        FancyTabs()
+    },
+    Example(
+        name = ::FancyIndicatorTabs.name,
+        description = TabsExampleDescription
+    ) {
+        FancyIndicatorTabs()
+    },
+    Example(
+        name = ::FancyIndicatorContainerTabs.name,
+        description = TabsExampleDescription
+    ) {
+        FancyIndicatorContainerTabs()
+    },
+    Example(
+        name = ::ScrollingFancyIndicatorContainerTabs.name,
+        description = TabsExampleDescription
+    ) {
+        ScrollingFancyIndicatorContainerTabs()
+    }
+)
+
+private const val TextFieldsExampleDescription = "Text fields examples"
+val TextFieldsExamples = listOf(
+    Example(
+        name = ::SimpleTextFieldSample.name,
+        description = TextFieldsExampleDescription
+    ) {
+        SimpleTextFieldSample()
+    },
+    Example(
+        name = ::TextFieldSample.name,
+        description = TextFieldsExampleDescription
+    ) {
+        TextFieldSample()
+    },
+    Example(
+        name = ::SimpleOutlinedTextFieldSample.name,
+        description = TextFieldsExampleDescription
+    ) {
+        SimpleOutlinedTextFieldSample()
+    },
+    Example(
+        name = ::OutlinedTextFieldSample.name,
+        description = TextFieldsExampleDescription
+    ) {
+        OutlinedTextFieldSample()
+    },
+    Example(
+        name = ::TextFieldWithIcons.name,
+        description = TextFieldsExampleDescription
+    ) {
+        TextFieldWithIcons()
+    },
+    Example(
+        name = ::TextFieldWithPlaceholder.name,
+        description = TextFieldsExampleDescription
+    ) {
+        TextFieldWithPlaceholder()
+    },
+    Example(
+        name = ::TextFieldWithErrorState.name,
+        description = TextFieldsExampleDescription
+    ) {
+        TextFieldWithErrorState()
+    },
+    Example(
+        name = ::TextFieldWithHelperMessage.name,
+        description = TextFieldsExampleDescription
+    ) {
+        TextFieldWithHelperMessage()
+    },
+    Example(
+        name = ::PasswordTextField.name,
+        description = TextFieldsExampleDescription
+    ) {
+        PasswordTextField()
+    },
+    Example(
+        name = ::TextFieldWithHideKeyboardOnImeAction.name,
+        description = TextFieldsExampleDescription
+    ) {
+        TextFieldWithHideKeyboardOnImeAction()
+    }
+)

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/Border.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/Border.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/Border.kt
new file mode 100644
index 0000000..9d0fc08
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/Border.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.ui.common
+
+import androidx.compose.material.LocalContentColor
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+/**
+ * Draws a stroke border on the inner edges of grid items i.e. bottom as well as end (if not the
+ * last item in a row).
+ *
+ * @param itemIndex The zero-based index of the grid item.
+ * @param cellsCount The number of cells (columns for vertical, rows for horizontal) in the grid.
+ * @param color The color of the border.
+ * @param width The width of the border.
+ */
+fun Modifier.gridItemBorder(
+    itemIndex: Int,
+    cellsCount: Int,
+    color: Color,
+    width: Dp = BorderWidth
+) = drawBehind {
+    val end = itemIndex.inc().rem(cellsCount) == 0
+    drawLine(
+        color = color,
+        strokeWidth = width.toPx(),
+        cap = StrokeCap.Square,
+        start = Offset(0f, size.height),
+        end = Offset(size.width, size.height)
+    )
+    if (!end) drawLine(
+        color = color,
+        strokeWidth = width.toPx(),
+        cap = StrokeCap.Square,
+        start = Offset(size.width, size.height),
+        end = Offset(size.width, 0f)
+    )
+}
+
+/**
+ * Composite of local content color at 12% alpha over background color, used by borders.
+ */
+@Composable
+fun compositeBorderColor(): Color = LocalContentColor.current.copy(alpha = BorderAlpha)
+    .compositeOver(MaterialTheme.colors.background)
+
+val BorderWidth = 1.dp
+private const val BorderAlpha = 0.12f

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/CatalogScaffold.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/CatalogScaffold.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/CatalogScaffold.kt
new file mode 100644
index 0000000..0cb6307
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/CatalogScaffold.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.ui.common
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.material.Scaffold
+import androidx.compose.material.catalog.util.DOCS_URL
+import androidx.compose.material.catalog.util.GUIDELINES_URL
+import androidx.compose.material.catalog.util.ISSUE_URL
+import androidx.compose.material.catalog.util.SOURCE_URL
+import androidx.compose.material.catalog.util.openUrl
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+
+@Composable
+fun CatalogScaffold(
+    topBarTitle: String,
+    showBackNavigationIcon: Boolean = false,
+    onBackClick: () -> Unit = {},
+    content: @Composable (PaddingValues) -> Unit
+) {
+    val context = LocalContext.current
+    Scaffold(
+        topBar = {
+            CatalogTopAppBar(
+                title = topBarTitle,
+                showBackNavigationIcon = showBackNavigationIcon,
+                onBackClick = onBackClick,
+                onGuidelinesClick = { context.openUrl(GUIDELINES_URL) },
+                onDocsClick = { context.openUrl(DOCS_URL) },
+                onSourceClick = { context.openUrl(SOURCE_URL) },
+                onIssueClick = { context.openUrl(ISSUE_URL) }
+            )
+        },
+        content = content
+    )
+}

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/CatalogTopAppBar.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/CatalogTopAppBar.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/CatalogTopAppBar.kt
new file mode 100644
index 0000000..5b3dba8
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/common/CatalogTopAppBar.kt
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.ui.common
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material.AppBarDefaults
+import androidx.compose.material.Divider
+import androidx.compose.material.DropdownMenu
+import androidx.compose.material.DropdownMenuItem
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
+import androidx.compose.material.catalog.R
+import androidx.compose.material.catalog.insets.navigationBarsPadding
+import androidx.compose.material.catalog.insets.statusBarsPadding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.primarySurface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun CatalogTopAppBar(
+    title: String,
+    showBackNavigationIcon: Boolean = false,
+    onBackClick: () -> Unit = {},
+    onThemeClick: () -> Unit = {},
+    onGuidelinesClick: () -> Unit = {},
+    onDocsClick: () -> Unit = {},
+    onSourceClick: () -> Unit = {},
+    onIssueClick: () -> Unit = {},
+) {
+    var moreMenuExpanded by remember { mutableStateOf(false) }
+    // Wrapping in a Surface to handle window insets
+    // https://issuetracker.google.com/issues/183161866
+    Surface(
+        color = MaterialTheme.colors.primarySurface,
+        elevation = AppBarDefaults.TopAppBarElevation
+    ) {
+        TopAppBar(
+            title = {
+                Text(
+                    text = title,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            },
+            actions = {
+                Box {
+                    Row {
+                        IconButton(onClick = onThemeClick) {
+                            Icon(
+                                painter = painterResource(id = R.drawable.ic_palette_24dp),
+                                contentDescription = null
+                            )
+                        }
+                        IconButton(onClick = { moreMenuExpanded = true }) {
+                            Icon(
+                                imageVector = Icons.Default.MoreVert,
+                                contentDescription = null
+                            )
+                        }
+                    }
+                    MoreMenu(
+                        expanded = moreMenuExpanded,
+                        onDismissRequest = { moreMenuExpanded = false },
+                        onGuidelinesClick = {
+                            onGuidelinesClick()
+                            moreMenuExpanded = false
+                        },
+                        onDocsClick = {
+                            onDocsClick()
+                            moreMenuExpanded = false
+                        },
+                        onSourceClick = {
+                            onSourceClick()
+                            moreMenuExpanded = false
+                        },
+                        onIssueClick = {
+                            onIssueClick()
+                            moreMenuExpanded = false
+                        }
+                    )
+                }
+            },
+            navigationIcon = if (showBackNavigationIcon) {
+                {
+                    IconButton(onClick = onBackClick) {
+                        Icon(
+                            imageVector = Icons.Default.ArrowBack,
+                            contentDescription = null
+                        )
+                    }
+                }
+            } else {
+                null
+            },
+            backgroundColor = Color.Transparent,
+            elevation = 0.dp,
+            modifier = Modifier
+                .statusBarsPadding()
+                .navigationBarsPadding(bottom = false)
+        )
+    }
+}
+
+@Composable
+private fun MoreMenu(
+    expanded: Boolean,
+    onDismissRequest: () -> Unit,
+    onGuidelinesClick: () -> Unit,
+    onDocsClick: () -> Unit,
+    onSourceClick: () -> Unit,
+    onIssueClick: () -> Unit
+) {
+    DropdownMenu(
+        expanded = expanded,
+        onDismissRequest = onDismissRequest
+    ) {
+        DropdownMenuItem(onClick = onGuidelinesClick) {
+            Text(stringResource(id = R.string.view_design_guidelines))
+        }
+        DropdownMenuItem(onClick = onDocsClick) {
+            Text(stringResource(id = R.string.view_developer_docs))
+        }
+        DropdownMenuItem(onClick = onSourceClick) {
+            Text(stringResource(id = R.string.view_source_code))
+        }
+        Divider()
+        DropdownMenuItem(onClick = onIssueClick) {
+            Text(stringResource(id = R.string.report_an_issue))
+        }
+    }
+}

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/component/Component.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/component/Component.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/component/Component.kt
new file mode 100644
index 0000000..86a453b
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/component/Component.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.ui.component
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.ContentAlpha
+import androidx.compose.material.Icon
+import androidx.compose.material.LocalContentColor
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.catalog.R
+import androidx.compose.material.catalog.insets.LocalWindowInsets
+import androidx.compose.material.catalog.insets.toPaddingValues
+import androidx.compose.material.catalog.model.Component
+import androidx.compose.material.catalog.model.Example
+import androidx.compose.material.catalog.ui.common.CatalogScaffold
+import androidx.compose.material.catalog.ui.example.ExampleItem
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun Component(
+    component: Component,
+    onExampleClick: (example: Example) -> Unit,
+    onBackClick: () -> Unit
+) {
+    CatalogScaffold(
+        topBarTitle = component.name,
+        showBackNavigationIcon = true,
+        onBackClick = onBackClick
+    ) { paddingValues ->
+        LazyColumn(
+            modifier = Modifier
+                .padding(paddingValues)
+                .padding(horizontal = ComponentPadding),
+            contentPadding = LocalWindowInsets.current.navigationBars.toPaddingValues()
+        ) {
+            item {
+                Icon(
+                    painter = painterResource(id = component.icon),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(ComponentIconHeight)
+                        .padding(vertical = ComponentIconVerticalPadding),
+                    // TODO: Remove tint when using component tile images
+                    tint = LocalContentColor.current.copy(alpha = ContentAlpha.disabled)
+                )
+            }
+            item {
+                Text(
+                    text = stringResource(id = R.string.description),
+                    style = MaterialTheme.typography.body1
+                )
+                Spacer(modifier = Modifier.height(ComponentPadding))
+                Text(
+                    text = component.description,
+                    style = MaterialTheme.typography.body2
+                )
+                Spacer(modifier = Modifier.height(ComponentDescriptionPadding))
+            }
+            item {
+                Text(
+                    text = stringResource(id = R.string.examples),
+                    style = MaterialTheme.typography.body1
+                )
+                Spacer(modifier = Modifier.height(ComponentPadding))
+            }
+            if (component.examples.isNotEmpty()) {
+                items(component.examples) { example ->
+                    ExampleItem(
+                        example = example,
+                        onClick = onExampleClick
+                    )
+                    Spacer(modifier = Modifier.height(ComponentPadding))
+                }
+            } else {
+                item {
+                    Text(
+                        text = stringResource(id = R.string.no_examples),
+                        style = MaterialTheme.typography.body2
+                    )
+                    Spacer(modifier = Modifier.height(ComponentPadding))
+                }
+            }
+        }
+    }
+}
+
+private val ComponentIconHeight = 192.dp
+private val ComponentIconVerticalPadding = 42.dp
+private val ComponentPadding = 16.dp
+private val ComponentDescriptionPadding = 32.dp

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/component/ComponentItem.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/component/ComponentItem.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/component/ComponentItem.kt
new file mode 100644
index 0000000..8d55544
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/component/ComponentItem.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.ui.component
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.ContentAlpha
+import androidx.compose.material.Icon
+import androidx.compose.material.LocalContentColor
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.catalog.model.Component
+import androidx.compose.material.catalog.ui.common.compositeBorderColor
+import androidx.compose.material.catalog.ui.common.gridItemBorder
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ComponentItem(
+    component: Component,
+    onClick: (component: Component) -> Unit,
+    index: Int,
+    cellsCount: Int,
+) {
+    Box(
+        modifier = Modifier
+            .height(ComponentItemHeight)
+            .clickable { onClick(component) }
+            .gridItemBorder(
+                itemIndex = index,
+                cellsCount = cellsCount,
+                color = compositeBorderColor()
+            )
+            .padding(ComponentItemPadding)
+    ) {
+        Icon(
+            painter = painterResource(id = component.icon),
+            contentDescription = null,
+            modifier = Modifier.align(Alignment.Center),
+            // TODO: Remove tint when using component tile images
+            tint = LocalContentColor.current.copy(alpha = ContentAlpha.disabled)
+        )
+        Text(
+            text = component.name,
+            modifier = Modifier.align(Alignment.BottomStart),
+            style = MaterialTheme.typography.caption
+        )
+    }
+}
+
+private val ComponentItemHeight = 164.dp
+private val ComponentItemPadding = 16.dp

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/example/Example.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/example/Example.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/example/Example.kt
new file mode 100644
index 0000000..245bc7e
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/example/Example.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.ui.example
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.catalog.insets.navigationBarsPadding
+import androidx.compose.material.catalog.model.Example
+import androidx.compose.material.catalog.ui.common.CatalogScaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+@Composable
+fun Example(
+    example: Example,
+    onBackClick: () -> Unit
+) {
+    CatalogScaffold(
+        topBarTitle = example.name,
+        showBackNavigationIcon = true,
+        onBackClick = onBackClick
+    ) { paddingValues ->
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(paddingValues)
+                .navigationBarsPadding(),
+            contentAlignment = Alignment.Center
+        ) {
+            example.content()
+        }
+    }
+}

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/example/ExampleItem.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/example/ExampleItem.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/example/ExampleItem.kt
new file mode 100644
index 0000000..874afa1
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/example/ExampleItem.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.ui.example
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.Card
+import androidx.compose.material.ContentAlpha
+import androidx.compose.material.Icon
+import androidx.compose.material.LocalContentAlpha
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.catalog.model.Example
+import androidx.compose.material.catalog.ui.common.BorderWidth
+import androidx.compose.material.catalog.ui.common.compositeBorderColor
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.KeyboardArrowRight
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ExampleItem(
+    example: Example,
+    onClick: (example: Example) -> Unit
+) {
+    Card(
+        elevation = 0.dp,
+        border = BorderStroke(
+            width = BorderWidth,
+            color = compositeBorderColor()
+        ),
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        Row(
+            modifier = Modifier
+                .clickable { onClick(example) }
+                .padding(ExampleItemPadding)
+        ) {
+            Column(modifier = Modifier.weight(1f, fill = true)) {
+                Text(
+                    text = example.name,
+                    style = MaterialTheme.typography.subtitle2
+                )
+                Spacer(modifier = Modifier.height(ExampleItemTextPadding))
+                CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+                    Text(
+                        text = example.description,
+                        style = MaterialTheme.typography.caption
+                    )
+                }
+            }
+            Spacer(modifier = Modifier.width(ExampleItemPadding))
+            Icon(
+                imageVector = Icons.Default.KeyboardArrowRight,
+                contentDescription = null,
+                modifier = Modifier.align(Alignment.CenterVertically)
+            )
+        }
+    }
+}
+
+private val ExampleItemPadding = 16.dp
+private val ExampleItemTextPadding = 8.dp

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/home/Home.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/home/Home.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/home/Home.kt
new file mode 100644
index 0000000..ad30d01
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/home/Home.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.ui.home
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.GridCells
+import androidx.compose.foundation.lazy.LazyVerticalGrid
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material.catalog.R
+import androidx.compose.material.catalog.insets.LocalWindowInsets
+import androidx.compose.material.catalog.insets.toPaddingValues
+import androidx.compose.material.catalog.model.Component
+import androidx.compose.material.catalog.ui.common.CatalogScaffold
+import androidx.compose.material.catalog.ui.component.ComponentItem
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+
+@Composable
+@OptIn(ExperimentalFoundationApi::class)
+fun Home(
+    components: List<Component>,
+    onComponentClick: (component: Component) -> Unit
+) {
+    CatalogScaffold(
+        topBarTitle = stringResource(id = R.string.material_components)
+    ) { paddingValues ->
+        BoxWithConstraints(modifier = Modifier.padding(paddingValues)) {
+            val cellsCount = maxOf((maxWidth / HomeCellMinSize).toInt(), 1)
+            LazyVerticalGrid(
+                // LazyGridScope doesn't expose nColumns from LazyVerticalGrid
+                // https://issuetracker.google.com/issues/183187002
+                cells = GridCells.Fixed(count = cellsCount),
+                content = {
+                    itemsIndexed(components) { index, component ->
+                        ComponentItem(
+                            component = component,
+                            onClick = onComponentClick,
+                            index = index,
+                            cellsCount = cellsCount
+                        )
+                    }
+                },
+                contentPadding = LocalWindowInsets.current.navigationBars.toPaddingValues()
+            )
+        }
+    }
+}
+
+private val HomeCellMinSize = 180.dp

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/theme/Theme.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/theme/Theme.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/theme/Theme.kt
new file mode 100644
index 0000000..5432380
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/theme/Theme.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.ui.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
+import androidx.compose.runtime.Composable
+
+@Composable
+fun CatalogTheme(content: @Composable () -> Unit) {
+    MaterialTheme(
+        colors = if (isSystemInDarkTheme()) {
+            darkColors()
+        } else {
+            lightColors()
+        },
+        content = content
+    )
+}

compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/util/Url.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/util/Url.kt b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/util/Url.kt
new file mode 100644
index 0000000..6bd63ad
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/util/Url.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.material.catalog.util
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+
+fun Context.openUrl(url: String) {
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+    startActivity(intent)
+}
+
+const val GUIDELINES_URL = "https://material.io/components"
+const val DOCS_URL = "https://developer.android.com/jetpack/androidx/releases/compose-material"
+const val SOURCE_URL = "https://cs.android.com/androidx/platform/frameworks/support/+/" +
+    "androidx-main:compose/material/"
+const val ISSUE_URL = "https://issuetracker.google.com/issues/new?component=742043"

compose/material/material/integration-tests/material-catalog/src/main/res/drawable/ic_component.xml

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/res/drawable/ic_component.xml b/compose/material/material/integration-tests/material-catalog/src/main/res/drawable/ic_component.xml
new file mode 100644
index 0000000..84894df
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/res/drawable/ic_component.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="52dp"
+    android:height="53dp"
+    android:viewportWidth="52"
+    android:viewportHeight="53">
+  <!-- Long path to avoid Icon stroke line join bevel bug -->
+  <!-- https://issuetracker.google.com/issues/182794035 -->
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M32,0L32.0002,16.0599C32.4949,16.0202 32.9951,16 33.5,16C43.7173,16
+      52,24.2827 52,34.5C52,44.7173 43.7173,53 33.5,53C23.2827,53 15,44.7173 15,34.5C15,33.6522
+      15.057,32.8178 15.1675,32.0002L0,32L0,0L32,0ZM33.5,18.5C32.9944,18.5 32.4944,18.5234
+      32.0008,18.5693L32,32L17.6941,32.0004C17.5663,32.8149 17.5,33.6497 17.5,34.5C17.5,43.3366
+      24.6634,50.5 33.5,50.5C42.3366,50.5 49.5,43.3366 49.5,34.5C49.5,25.6634 42.3366,18.5
+      33.5,18.5ZM29.5002,2.5L2.5,2.5L2.5,29.5L15.6835,29.5003C17.5115,22.9726 22.8306,17.9035
+      29.5002,16.4335L29.5002,2.5ZM18.2968,29.5L29.5,29.5L29.5007,19.0039C24.2157,20.3639
+      19.9874,24.3562 18.2968,29.5Z" />
+</vector>

compose/material/material/integration-tests/material-catalog/src/main/res/drawable/ic_palette_24dp.xml

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/res/drawable/ic_palette_24dp.xml b/compose/material/material/integration-tests/material-catalog/src/main/res/drawable/ic_palette_24dp.xml
new file mode 100644
index 0000000..b9e640b
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/res/drawable/ic_palette_24dp.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,22C6.49,22 2,17.51 2,12S6.49,2 12,2s10,4.04 10,9c0,3.31 -2.69,6
+      -6,6h-1.77c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.12 0.05,0.23 0.13,0.33 0.41,0.47 0.64,1.06
+      0.64,1.67 0,1.38 -1.12,2.5 -2.5,2.5zM12,4c-4.41,0 -8,3.59 -8,8s3.59,8 8,8c0.28,0 0.5,-0.22
+      0.5,-0.5 0,-0.16 -0.08,-0.28 -0.14,-0.35 -0.41,-0.46 -0.63,-1.05 -0.63,-1.65 0,-1.38
+      1.12,-2.5 2.5,-2.5L16,15c2.21,0 4,-1.79 4,-4 0,-3.86 -3.59,-7 -8,-7z" />
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M6.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M9.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M14.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M17.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
+</vector>

compose/material/material/integration-tests/material-catalog/src/main/res/values-night/themes.xml

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/res/values-night/themes.xml b/compose/material/material/integration-tests/material-catalog/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..62234c3
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/res/values-night/themes.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="Theme.Catalog" parent="@android:style/Theme.Material.NoActionBar">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
+    </style>
+
+</resources>

compose/material/material/integration-tests/material-catalog/src/main/res/values/strings.xml

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/res/values/strings.xml b/compose/material/material/integration-tests/material-catalog/src/main/res/values/strings.xml
new file mode 100644
index 0000000..6db56d476
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/res/values/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+
+    <string name="app_name">Compose Material catalog</string>
+
+    <string name="material_components">Material Components</string>
+
+    <string name="description">Description</string>
+    <string name="examples">Examples</string>
+    <string name="no_examples">No examples</string>
+
+    <string name="view_design_guidelines">View design guidelines</string>
+    <string name="view_developer_docs">View developer docs</string>
+    <string name="view_source_code">View source code</string>
+    <string name="report_an_issue">Report an issue</string>
+
+</resources>

compose/material/material/integration-tests/material-catalog/src/main/res/values/themes.xml

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/res/values/themes.xml b/compose/material/material/integration-tests/material-catalog/src/main/res/values/themes.xml
new file mode 100644
index 0000000..4661c15
--- /dev/null
+++ b/compose/material/material/integration-tests/material-catalog/src/main/res/values/themes.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="Theme.Catalog" parent="@android:style/Theme.Material.Light.NoActionBar">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+</resources>

compose/material/material/samples/src/main/java/androidx/compose/material/samples/TextFieldSamples.kt

diff --git a/compose/material/material/samples/src/main/java/androidx/compose/material/samples/TextFieldSamples.kt b/compose/material/material/samples/src/main/java/androidx/compose/material/samples/TextFieldSamples.kt
index 51f0eb4..021cac7 100644
--- a/compose/material/material/samples/src/main/java/androidx/compose/material/samples/TextFieldSamples.kt
+++ b/compose/material/material/samples/src/main/java/androidx/compose/material/samples/TextFieldSamples.kt
@@ -197,7 +197,7 @@
         keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
         keyboardActions = KeyboardActions(
             onDone = {
-                keyboardController?.hideSoftwareKeyboard()
+                keyboardController?.hide()
                 // do something here
             }
         )

compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/DrawerTest.kt

diff --git a/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/DrawerTest.kt b/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/DrawerTest.kt
index 6f885b0..5d9c108 100644
--- a/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/DrawerTest.kt
+++ b/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/DrawerTest.kt
@@ -32,6 +32,7 @@
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.assert
+import androidx.compose.ui.test.assertHasClickAction
 import androidx.compose.ui.test.assertLeftPositionInRootIsEqualTo
 import androidx.compose.ui.test.assertTopPositionInRootIsEqualTo
 import androidx.compose.ui.test.assertWidthIsEqualTo
@@ -39,6 +40,7 @@
 import androidx.compose.ui.test.centerLeft
 import androidx.compose.ui.test.click
 import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onChildAt
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onParent
 import androidx.compose.ui.test.performClick
@@ -57,6 +59,7 @@
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.runBlocking
 import org.junit.Ignore
+import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -833,4 +836,73 @@
         // Then the drawer should be closed
         rule.onNodeWithTag(bottomDrawerTag).assertTopPositionInRootIsEqualTo(topWhenClosed)
     }
+
+    @Test
+    fun modalDrawer_scrimNode_reportToSemanticsWhenOpen_notReportToSemanticsWhenClosed() {
+        val topTag = "ModalDrawer"
+        rule.setMaterialContent {
+            ModalDrawer(
+                modifier = Modifier.testTag(topTag),
+                drawerState = rememberDrawerState(DrawerValue.Open),
+                drawerContent = {
+                    Box(Modifier.fillMaxSize().testTag("drawer"))
+                },
+                content = {
+                    Box(Modifier.fillMaxSize().testTag("body"))
+                }
+            )
+        }
+
+        // The drawer should be opened
+        rule.onNodeWithTag("drawer").assertLeftPositionInRootIsEqualTo(0.dp)
+
+        var topNode = rule.onNodeWithTag(topTag).fetchSemanticsNode()
+        assertEquals(3, topNode.children.size)
+        rule.onNodeWithTag(topTag)
+            .onChildAt(1)
+            .assertHasClickAction()
+            .performSemanticsAction(SemanticsActions.OnClick)
+
+        // Then the drawer should be closed
+        rule.onNodeWithTag("drawer").assertLeftPositionInRootIsEqualTo(-rule.rootWidth())
+
+        topNode = rule.onNodeWithTag(topTag).fetchSemanticsNode()
+        assertEquals(2, topNode.children.size)
+    }
+
+    @Test
+    fun bottomDrawer_scrimNode_reportToSemanticsWhenOpen_notReportToSemanticsWhenClosed() {
+        val topTag = "BottomDrawer"
+        rule.setMaterialContent {
+            BottomDrawer(
+                modifier = Modifier.testTag(topTag),
+                drawerState = rememberBottomDrawerState(BottomDrawerValue.Open),
+                drawerContent = {
+                    Box(Modifier.height(shortBottomDrawerHeight).testTag(bottomDrawerTag))
+                },
+                content = {
+                    Box(Modifier.fillMaxSize().testTag("body"))
+                }
+            )
+        }
+
+        val height = rule.rootHeight()
+        val topWhenOpened = height - shortBottomDrawerHeight
+
+        // The drawer should be opened
+        rule.onNodeWithTag(bottomDrawerTag).assertTopPositionInRootIsEqualTo(topWhenOpened)
+
+        var topNode = rule.onNodeWithTag(topTag).fetchSemanticsNode()
+        assertEquals(3, topNode.children.size)
+        rule.onNodeWithTag(topTag)
+            .onChildAt(1)
+            .assertHasClickAction()
+            .performSemanticsAction(SemanticsActions.OnClick)
+
+        // Then the drawer should be closed
+        rule.onNodeWithTag(bottomDrawerTag).assertTopPositionInRootIsEqualTo(height)
+
+        topNode = rule.onNodeWithTag(topTag).fetchSemanticsNode()
+        assertEquals(2, topNode.children.size)
+    }
 }

compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/ModalBottomSheetTest.kt

diff --git a/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/ModalBottomSheetTest.kt b/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/ModalBottomSheetTest.kt
index c73ec0f..bdd3893 100644
--- a/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/ModalBottomSheetTest.kt
+++ b/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/ModalBottomSheetTest.kt
@@ -25,8 +25,10 @@
 import androidx.compose.ui.semantics.SemanticsActions
 import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.assert
+import androidx.compose.ui.test.assertHasClickAction
 import androidx.compose.ui.test.assertTopPositionInRootIsEqualTo
 import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onChildAt
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onParent
 import androidx.compose.ui.test.performGesture
@@ -38,6 +40,7 @@
 import androidx.test.filters.MediumTest
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -483,4 +486,34 @@
             assertThat(sheetState.currentValue).isEqualTo(ModalBottomSheetValue.Expanded)
         }
     }
-}
\ No newline at end of file
+
+    @Test
+    fun modalBottomSheet_scrimNode_reportToSemanticsWhenShow_tallBottomSheet() {
+        val topTag = "ModalBottomSheetLayout"
+        rule.setMaterialContent {
+            ModalBottomSheetLayout(
+                modifier = Modifier.testTag(topTag),
+                sheetState = rememberModalBottomSheetState(ModalBottomSheetValue.HalfExpanded),
+                content = { Box(Modifier.fillMaxSize().testTag("content")) },
+                sheetContent = { Box(Modifier.fillMaxSize().testTag(sheetTag)) }
+            )
+        }
+
+        val height = rule.rootHeight()
+        rule.onNodeWithTag(sheetTag)
+            .assertTopPositionInRootIsEqualTo(height / 2)
+        var topNode = rule.onNodeWithTag(topTag).fetchSemanticsNode()
+        assertEquals(3, topNode.children.size)
+        rule.onNodeWithTag(topTag)
+            .onChildAt(1)
+            .assertHasClickAction()
+            .performSemanticsAction(SemanticsActions.OnClick)
+
+        advanceClock()
+
+        rule.onNodeWithTag(sheetTag)
+            .assertTopPositionInRootIsEqualTo(height)
+        topNode = rule.onNodeWithTag(topTag).fetchSemanticsNode()
+        assertEquals(2, topNode.children.size)
+    }
+}

compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SnackbarHostTest.kt

diff --git a/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SnackbarHostTest.kt b/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SnackbarHostTest.kt
index 420e85d..6d91565 100644
--- a/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SnackbarHostTest.kt
+++ b/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SnackbarHostTest.kt
@@ -20,9 +20,16 @@
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.platform.AccessibilityManager
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.SemanticsActions
+import androidx.compose.ui.semantics.SemanticsProperties
+import androidx.compose.ui.test.SemanticsMatcher
+import androidx.compose.ui.test.assert
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.onParent
 import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performSemanticsAction
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.filters.MediumTest
@@ -161,6 +168,30 @@
     }
 
     @Test
+    fun snackbarHost_semantics() {
+        val hostState = SnackbarHostState()
+        lateinit var scope: CoroutineScope
+        rule.setContent {
+            scope = rememberCoroutineScope()
+            SnackbarHost(hostState) { data ->
+                Snackbar(data)
+            }
+        }
+        val job1 = scope.launch {
+            val result = hostState.showSnackbar("1", actionLabel = "press")
+            Truth.assertThat(result).isEqualTo(SnackbarResult.Dismissed)
+        }
+        rule.onNodeWithText("1").onParent()
+            .assert(
+                SemanticsMatcher.expectValue(SemanticsProperties.LiveRegion, LiveRegionMode.Polite)
+            )
+            .assert(SemanticsMatcher.keyIsDefined(SemanticsActions.Dismiss))
+            .performSemanticsAction(SemanticsActions.Dismiss)
+
+        rule.waitUntil { job1.isCompleted }
+    }
+
+    @Test
     fun snackbarDuration_toMillis_nonNullAccessibilityManager() {
         val mockDurationControl = 10000L
         val mockDurationNonControl = 5000L

compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/textfield/TextFieldTest.kt

diff --git a/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/textfield/TextFieldTest.kt b/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/textfield/TextFieldTest.kt
index 969ccea..8e21331 100644
--- a/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/textfield/TextFieldTest.kt
+++ b/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/textfield/TextFieldTest.kt
@@ -324,7 +324,7 @@
         rule.runOnIdle { assertThat(hostView.isSoftwareKeyboardShown).isTrue() }
 
         // Hide keyboard.
-        rule.runOnIdle { softwareKeyboardController?.hideSoftwareKeyboard() }
+        rule.runOnIdle { softwareKeyboardController?.hide() }
 
         // Clicking on the text field shows the keyboard.
         rule.onNodeWithTag(TextfieldTag).performClick()

compose/material/material/src/commonMain/kotlin/androidx/compose/material/Drawer.kt

diff --git a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Drawer.kt b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Drawer.kt
index e0455ee..e623c4d 100644
--- a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Drawer.kt
+++ b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Drawer.kt
@@ -46,7 +46,9 @@
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.dismiss
+import androidx.compose.ui.semantics.onClick
 import androidx.compose.ui.semantics.paneTitle
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.Dp
@@ -531,9 +533,14 @@
             animationSpec = TweenSpec()
         )
         val dismissModifier = if (visible) {
-            Modifier.pointerInput(onDismiss) {
-                detectTapGestures { onDismiss() }
-            }
+            Modifier
+                .pointerInput(onDismiss) {
+                    detectTapGestures { onDismiss() }
+                }
+                .semantics(mergeDescendants = true) {
+                    contentDescription = Strings.CloseDrawer
+                    onClick { onDismiss(); true }
+                }
         } else {
             Modifier
         }
@@ -556,7 +563,12 @@
     color: Color
 ) {
     val dismissDrawer = if (open) {
-        Modifier.pointerInput(onClose) { detectTapGestures { onClose() } }
+        Modifier
+            .pointerInput(onClose) { detectTapGestures { onClose() } }
+            .semantics(mergeDescendants = true) {
+                contentDescription = Strings.CloseDrawer
+                onClick { onClose(); true }
+            }
     } else {
         Modifier
     }

compose/material/material/src/commonMain/kotlin/androidx/compose/material/ModalBottomSheet.kt

diff --git a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/ModalBottomSheet.kt b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/ModalBottomSheet.kt
index e3ca819..282c8b6 100644
--- a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/ModalBottomSheet.kt
+++ b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/ModalBottomSheet.kt
@@ -41,8 +41,10 @@
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.SubcomposeLayout
 import androidx.compose.ui.semantics.collapse
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.dismiss
 import androidx.compose.ui.semantics.expand
+import androidx.compose.ui.semantics.onClick
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
@@ -312,7 +314,12 @@
             animationSpec = TweenSpec()
         )
         val dismissModifier = if (visible) {
-            Modifier.pointerInput(onDismiss) { detectTapGestures { onDismiss() } }
+            Modifier
+                .pointerInput(onDismiss) { detectTapGestures { onDismiss() } }
+                .semantics(mergeDescendants = true) {
+                    contentDescription = Strings.CloseSheet
+                    onClick { onDismiss(); true }
+                }
         } else {
             Modifier
         }

compose/material/material/src/commonMain/kotlin/androidx/compose/material/Scaffold.kt

diff --git a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Scaffold.kt b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Scaffold.kt
index 2819fda..b1d5f24 100644
--- a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Scaffold.kt
+++ b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Scaffold.kt
@@ -19,8 +19,8 @@
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
@@ -240,16 +240,16 @@
 
             val snackbarHeight = snackbarPlaceables.fastMaxBy { it.height }?.height ?: 0
 
-            val fabPlaceables = subcompose(ScaffoldLayoutContent.Fab, fab).fastMap {
-                it.measure(looseConstraints)
-            }
+            val fabPlaceables =
+                subcompose(ScaffoldLayoutContent.Fab, fab).mapNotNull { measurable ->
+                    measurable.measure(looseConstraints).takeIf { it.height != 0 && it.width != 0 }
+                }
 
-            val fabWidth = fabPlaceables.fastMaxBy { it.width }?.width ?: 0
-            val fabHeight = fabPlaceables.fastMaxBy { it.height }?.height ?: 0
-
-            // FAB distance from the left of the layout, taking into account LTR / RTL
-            val fabLeftOffset = if (fabWidth != 0 && fabHeight != 0) {
-                if (fabPosition == FabPosition.End) {
+            val fabPlacement = if (fabPlaceables.isNotEmpty()) {
+                val fabWidth = fabPlaceables.fastMaxBy { it.width }!!.width
+                val fabHeight = fabPlaceables.fastMaxBy { it.height }!!.height
+                // FAB distance from the left of the layout, taking into account LTR / RTL
+                val fabLeftOffset = if (fabPosition == FabPosition.End) {
                     if (layoutDirection == LayoutDirection.Ltr) {
                         layoutWidth - FabSpacing.roundToPx() - fabWidth
                     } else {
@@ -258,11 +258,7 @@
                 } else {
                     (layoutWidth - fabWidth) / 2
                 }
-            } else {
-                0
-            }
 
-            val fabPlacement = if (fabWidth != 0 && fabHeight != 0) {
                 FabPlacement(
                     isDocked = isFabDocked,
                     left = fabLeftOffset,
@@ -281,30 +277,23 @@
             }.fastMap { it.measure(looseConstraints) }
 
             val bottomBarHeight = bottomBarPlaceables.fastMaxBy { it.height }?.height ?: 0
-
-            val fabOffsetFromBottom = if (fabWidth != 0 && fabHeight != 0) {
+            val fabOffsetFromBottom = fabPlacement?.let {
                 if (bottomBarHeight == 0) {
-                    fabHeight + FabSpacing.roundToPx()
+                    it.height + FabSpacing.roundToPx()
                 } else {
                     if (isFabDocked) {
                         // Total height is the bottom bar height + half the FAB height
-                        bottomBarHeight + (fabHeight / 2)
+                        bottomBarHeight + (it.height / 2)
                     } else {
                         // Total height is the bottom bar height + the FAB height + the padding
                         // between the FAB and bottom bar
-                        bottomBarHeight + fabHeight + FabSpacing.roundToPx()
+                        bottomBarHeight + it.height + FabSpacing.roundToPx()
                     }
                 }
-            } else {
-                0
             }
 
             val snackbarOffsetFromBottom = if (snackbarHeight != 0) {
-                snackbarHeight + if (fabOffsetFromBottom != 0) {
-                    fabOffsetFromBottom
-                } else {
-                    bottomBarHeight
-                }
+                snackbarHeight + (fabOffsetFromBottom ?: bottomBarHeight)
             } else {
                 0
             }
@@ -332,8 +321,10 @@
                 it.place(0, layoutHeight - bottomBarHeight)
             }
             // Explicitly not using placeRelative here as `leftOffset` already accounts for RTL
-            fabPlaceables.fastForEach {
-                it.place(fabLeftOffset, layoutHeight - fabOffsetFromBottom)
+            fabPlacement?.let { placement ->
+                fabPlaceables.fastForEach {
+                    it.place(placement.left, layoutHeight - fabOffsetFromBottom!!)
+                }
             }
         }
     }

compose/material/material/src/commonMain/kotlin/androidx/compose/material/SnackbarHost.kt

diff --git a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/SnackbarHost.kt b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/SnackbarHost.kt
index d760e94..5e00644 100644
--- a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/SnackbarHost.kt
+++ b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/SnackbarHost.kt
@@ -37,6 +37,10 @@
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.AccessibilityManager
 import androidx.compose.ui.platform.LocalAccessibilityManager
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.dismiss
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.util.fastForEach
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.delay
@@ -299,6 +303,10 @@
                             scaleY = scale.value,
                             alpha = opacity.value
                         )
+                        .semantics {
+                            liveRegion = LiveRegionMode.Polite
+                            dismiss { key.dismiss(); true }
+                        }
                 ) {
                     children()
                 }

compose/material/material/src/commonMain/kotlin/androidx/compose/material/Strings.kt

diff --git a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Strings.kt b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Strings.kt
index 0dc4b28..48969de 100644
--- a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Strings.kt
+++ b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Strings.kt
@@ -20,4 +20,6 @@
 //  then delete this class
 internal object Strings {
     const val NavigationMenu = "Navigation menu"
+    const val CloseDrawer = "Close navigation menu"
+    const val CloseSheet = "Close sheet"
 }

compose/runtime/runtime-lint/src/main/java/androidx/compose/runtime/lint/RuntimeIssueRegistry.kt

diff --git a/compose/runtime/runtime-lint/src/main/java/androidx/compose/runtime/lint/RuntimeIssueRegistry.kt b/compose/runtime/runtime-lint/src/main/java/androidx/compose/runtime/lint/RuntimeIssueRegistry.kt
index b550b50..ebd20f1 100644
--- a/compose/runtime/runtime-lint/src/main/java/androidx/compose/runtime/lint/RuntimeIssueRegistry.kt
+++ b/compose/runtime/runtime-lint/src/main/java/androidx/compose/runtime/lint/RuntimeIssueRegistry.kt
@@ -34,6 +34,7 @@
         ComposableLambdaParameterDetector.ComposableLambdaParameterPosition,
         ComposableNamingDetector.ComposableNaming,
         CompositionLocalNamingDetector.CompositionLocalNaming,
-        RememberDetector.RememberReturnType
+        RememberDetector.RememberReturnType,
+        UnrememberedMutableStateDetector.UnrememberedMutableState
     )
 }

compose/runtime/runtime-lint/src/main/java/androidx/compose/runtime/lint/UnrememberedMutableStateDetector.kt

diff --git a/compose/runtime/runtime-lint/src/main/java/androidx/compose/runtime/lint/UnrememberedMutableStateDetector.kt b/compose/runtime/runtime-lint/src/main/java/androidx/compose/runtime/lint/UnrememberedMutableStateDetector.kt
new file mode 100644
index 0000000..1310a6c
--- /dev/null
+++ b/compose/runtime/runtime-lint/src/main/java/androidx/compose/runtime/lint/UnrememberedMutableStateDetector.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("UnstableApiUsage")
+
+package androidx.compose.runtime.lint
+
+import androidx.compose.lint.Names
+import androidx.compose.lint.isInPackageName
+import androidx.compose.lint.invokedInComposableBodyAndNotRemembered
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.Severity
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.intellij.psi.PsiMethod
+import org.jetbrains.uast.UCallExpression
+import java.util.EnumSet
+
+/**
+ * [Detector] that checks `mutableStateOf`, `mutableStateListOf`, and `mutableStateMapOf` calls to
+ * make sure that if they are called inside a Composable body, they are `remember`ed.
+ */
+class UnrememberedMutableStateDetector : Detector(), SourceCodeScanner {
+    override fun getApplicableMethodNames(): List<String> = listOf(
+        Names.Runtime.MutableStateOf.shortName,
+        Names.Runtime.MutableStateListOf.shortName,
+        Names.Runtime.MutableStateMapOf.shortName,
+    )
+
+    override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) {
+        if (!method.isInPackageName(Names.Runtime.PackageName)) return
+
+        if (node.invokedInComposableBodyAndNotRemembered()) {
+            context.report(
+                UnrememberedMutableState,
+                node,
+                context.getNameLocation(node),
+                "Creating a state object during composition without using `remember`"
+            )
+        }
+    }
+
+    companion object {
+        val UnrememberedMutableState = Issue.create(
+            "UnrememberedMutableState",
+            "Creating a state object during composition without using `remember`",
+            "State objects created during composition need to be `remember`ed, otherwise " +
+                "they will be recreated during recomposition, and lose their state. Either hoist " +
+                "the state to an object that is not created during composition, or wrap the " +
+                "state in a call to `remember`.",
+            Category.CORRECTNESS, 3, Severity.ERROR,
+            Implementation(
+                UnrememberedMutableStateDetector::class.java,
+                EnumSet.of(Scope.JAVA_FILE, Scope.TEST_SOURCES)
+            )
+        )
+    }
+}

compose/runtime/runtime-lint/src/test/java/androidx/compose/runtime/lint/ComposableCoroutineCreationDetectorTest.kt

diff --git a/compose/runtime/runtime-lint/src/test/java/androidx/compose/runtime/lint/ComposableCoroutineCreationDetectorTest.kt b/compose/runtime/runtime-lint/src/test/java/androidx/compose/runtime/lint/ComposableCoroutineCreationDetectorTest.kt
index c3a1f89..986df63 100644
--- a/compose/runtime/runtime-lint/src/test/java/androidx/compose/runtime/lint/ComposableCoroutineCreationDetectorTest.kt
+++ b/compose/runtime/runtime-lint/src/test/java/androidx/compose/runtime/lint/ComposableCoroutineCreationDetectorTest.kt
@@ -165,127 +165,6 @@
     }
 
     @Test
-    fun errors_inlineFunctions() {
-        lint().files(
-            kotlin(
-                """
-                package androidx.compose.runtime.foo
-
-                import androidx.compose.runtime.Composable
-                import kotlinx.coroutines.*
-
-                @Composable
-                fun Test() {
-                    run {
-                        CoroutineScope.async {}
-                        CoroutineScope.launch {}
-                    }
-                }
-
-                val lambda = @Composable {
-                    run {
-                        CoroutineScope.async {}
-                        CoroutineScope.launch {}
-                    }
-                }
-
-                val lambda2: @Composable () -> Unit = {
-                    run {
-                        CoroutineScope.async {}
-                        CoroutineScope.launch {}
-                    }
-                }
-
-                @Composable
-                fun LambdaParameter(content: @Composable () -> Unit) {}
-
-                @Composable
-                fun Test2() {
-                    LambdaParameter(content = {
-                        run {
-                            CoroutineScope.async {}
-                            CoroutineScope.launch {}
-                        }
-                    })
-                    LambdaParameter {
-                        run {
-                            CoroutineScope.async {}
-                            CoroutineScope.launch {}
-                        }
-                    }
-                }
-
-                fun test3() {
-                    val localLambda1 = @Composable {
-                        run {
-                            CoroutineScope.async {}
-                            CoroutineScope.launch {}
-                        }
-                    }
-
-                    val localLambda2: @Composable () -> Unit = {
-                        run {
-                            CoroutineScope.async {}
-                            CoroutineScope.launch {}
-                        }
-                    }
-                }
-            """
-            ),
-            kotlin(Stubs.Composable),
-            coroutineBuildersStub
-        )
-            .run()
-            .expect(
-                """
-src/androidx/compose/runtime/foo/test.kt:10: Error: Calls to async should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                        CoroutineScope.async {}
-                                       ~~~~~
-src/androidx/compose/runtime/foo/test.kt:11: Error: Calls to launch should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                        CoroutineScope.launch {}
-                                       ~~~~~~
-src/androidx/compose/runtime/foo/test.kt:17: Error: Calls to async should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                        CoroutineScope.async {}
-                                       ~~~~~
-src/androidx/compose/runtime/foo/test.kt:18: Error: Calls to launch should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                        CoroutineScope.launch {}
-                                       ~~~~~~
-src/androidx/compose/runtime/foo/test.kt:24: Error: Calls to async should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                        CoroutineScope.async {}
-                                       ~~~~~
-src/androidx/compose/runtime/foo/test.kt:25: Error: Calls to launch should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                        CoroutineScope.launch {}
-                                       ~~~~~~
-src/androidx/compose/runtime/foo/test.kt:36: Error: Calls to async should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                            CoroutineScope.async {}
-                                           ~~~~~
-src/androidx/compose/runtime/foo/test.kt:37: Error: Calls to launch should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                            CoroutineScope.launch {}
-                                           ~~~~~~
-src/androidx/compose/runtime/foo/test.kt:42: Error: Calls to async should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                            CoroutineScope.async {}
-                                           ~~~~~
-src/androidx/compose/runtime/foo/test.kt:43: Error: Calls to launch should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                            CoroutineScope.launch {}
-                                           ~~~~~~
-src/androidx/compose/runtime/foo/test.kt:51: Error: Calls to async should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                            CoroutineScope.async {}
-                                           ~~~~~
-src/androidx/compose/runtime/foo/test.kt:52: Error: Calls to launch should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                            CoroutineScope.launch {}
-                                           ~~~~~~
-src/androidx/compose/runtime/foo/test.kt:58: Error: Calls to async should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                            CoroutineScope.async {}
-                                           ~~~~~
-src/androidx/compose/runtime/foo/test.kt:59: Error: Calls to launch should happen inside a LaunchedEffect and not composition [CoroutineCreationDuringComposition]
-                            CoroutineScope.launch {}
-                                           ~~~~~~
-14 errors, 0 warnings
-            """
-            )
-    }
-
-    @Test
     fun noErrors() {
         lint().files(
             kotlin(

compose/runtime/runtime-lint/src/test/java/androidx/compose/runtime/lint/UnrememberedMutableStateDetectorTest.kt

diff --git a/compose/runtime/runtime-lint/src/test/java/androidx/compose/runtime/lint/UnrememberedMutableStateDetectorTest.kt b/compose/runtime/runtime-lint/src/test/java/androidx/compose/runtime/lint/UnrememberedMutableStateDetectorTest.kt
new file mode 100644
index 0000000..4903dbb0
--- /dev/null
+++ b/compose/runtime/runtime-lint/src/test/java/androidx/compose/runtime/lint/UnrememberedMutableStateDetectorTest.kt
@@ -0,0 +1,371 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("UnstableApiUsage")
+
+package androidx.compose.runtime.lint
+
+import androidx.compose.lint.Stubs
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Issue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+/* ktlint-disable max-line-length */
+@RunWith(JUnit4::class)
+
+/**
+ * Test for [UnrememberedMutableStateDetector].
+ */
+class UnrememberedMutableStateDetectorTest : LintDetectorTest() {
+    override fun getDetector(): Detector = UnrememberedMutableStateDetector()
+
+    override fun getIssues(): MutableList<Issue> =
+        mutableListOf(UnrememberedMutableStateDetector.UnrememberedMutableState)
+
+    @Test
+    fun notRemembered() {
+        lint().files(
+            kotlin(
+                """
+                package androidx.compose.runtime.foo
+
+                import androidx.compose.runtime.*
+
+                @Composable
+                fun Test() {
+                    val foo = mutableStateOf(0)
+                    val bar = mutableStateListOf<Int>()
+                    val baz = mutableStateMapOf<Int, Float>()
+                }
+
+                val lambda = @Composable {
+                    val foo = mutableStateOf(0)
+                    val bar = mutableStateListOf<Int>()
+                    val baz = mutableStateMapOf<Int, Float>()
+                }
+
+                val lambda2: @Composable () -> Unit = {
+                    val foo = mutableStateOf(0)
+                    val bar = mutableStateListOf<Int>()
+                    val baz = mutableStateMapOf<Int, Float>()
+                }
+
+                @Composable
+                fun LambdaParameter(content: @Composable () -> Unit) {}
+
+                @Composable
+                fun Test2() {
+                    LambdaParameter(content = {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    })
+                    LambdaParameter {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    }
+                }
+
+                fun test3() {
+                    val localLambda1 = @Composable {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    }
+
+                    val localLambda2: @Composable () -> Unit = {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    }
+                }
+
+                @Composable
+                fun Test4() {
+                    val localObject = object {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    }
+                }
+            """
+            ),
+            kotlin(Stubs.Composable),
+            kotlin(Stubs.MutableState),
+            kotlin(Stubs.Remember)
+        )
+            .run()
+            .expect(
+                """
+src/androidx/compose/runtime/foo/{.kt:8: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                    val foo = mutableStateOf(0)
+                              ~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:9: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                    val bar = mutableStateListOf<Int>()
+                              ~~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:10: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                    val baz = mutableStateMapOf<Int, Float>()
+                              ~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:14: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                    val foo = mutableStateOf(0)
+                              ~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:15: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                    val bar = mutableStateListOf<Int>()
+                              ~~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:16: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                    val baz = mutableStateMapOf<Int, Float>()
+                              ~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:20: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                    val foo = mutableStateOf(0)
+                              ~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:21: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                    val bar = mutableStateListOf<Int>()
+                              ~~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:22: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                    val baz = mutableStateMapOf<Int, Float>()
+                              ~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:31: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val foo = mutableStateOf(0)
+                                  ~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:32: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val bar = mutableStateListOf<Int>()
+                                  ~~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:33: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val baz = mutableStateMapOf<Int, Float>()
+                                  ~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:36: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val foo = mutableStateOf(0)
+                                  ~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:37: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val bar = mutableStateListOf<Int>()
+                                  ~~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:38: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val baz = mutableStateMapOf<Int, Float>()
+                                  ~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:44: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val foo = mutableStateOf(0)
+                                  ~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:45: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val bar = mutableStateListOf<Int>()
+                                  ~~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:46: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val baz = mutableStateMapOf<Int, Float>()
+                                  ~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:50: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val foo = mutableStateOf(0)
+                                  ~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:51: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val bar = mutableStateListOf<Int>()
+                                  ~~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:52: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val baz = mutableStateMapOf<Int, Float>()
+                                  ~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:59: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val foo = mutableStateOf(0)
+                                  ~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:60: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val bar = mutableStateListOf<Int>()
+                                  ~~~~~~~~~~~~~~~~~~
+src/androidx/compose/runtime/foo/{.kt:61: Error: Creating a state object during composition without using remember [UnrememberedMutableState]
+                        val baz = mutableStateMapOf<Int, Float>()
+                                  ~~~~~~~~~~~~~~~~~
+24 errors, 0 warnings
+            """
+            )
+    }
+
+    @Test
+    fun rememberedInsideComposableBody() {
+        lint().files(
+            kotlin(
+                """
+                package androidx.compose.runtime.foo
+
+                import androidx.compose.runtime.*
+
+                @Composable
+                fun Test() {
+                    val foo = remember { mutableStateOf(0) }
+                    val bar = remember { mutableStateListOf<Int>() }
+                    val baz = remember {
+                        val test = "test"
+                        mutableStateMapOf<Int, Float>()
+                    }
+                }
+
+                val lambda = @Composable {
+                    val foo = remember { mutableStateOf(0) }
+                    val bar = remember { mutableStateListOf<Int>() }
+                    val baz = remember {
+                        val test = "test"
+                        mutableStateMapOf<Int, Float>()
+                    }
+                }
+
+                val lambda2: @Composable () -> Unit = {
+                    val foo = remember { mutableStateOf(0) }
+                    val bar = remember { mutableStateListOf<Int>() }
+                    val baz = remember {
+                        val test = "test"
+                        mutableStateMapOf<Int, Float>()
+                    }
+                }
+
+                @Composable
+                fun LambdaParameter(content: @Composable () -> Unit) {}
+
+                @Composable
+                fun Test2() {
+                    LambdaParameter(content = {
+                        val foo = remember { mutableStateOf(0) }
+                        val bar = remember { mutableStateListOf<Int>() }
+                        val baz = remember {
+                            val test = "test"
+                            mutableStateMapOf<Int, Float>()
+                        }
+                    })
+                    LambdaParameter {
+                        val foo = remember { mutableStateOf(0) }
+                        val bar = remember { mutableStateListOf<Int>() }
+                        val baz = remember {
+                            val test = "test"
+                            mutableStateMapOf<Int, Float>()
+                        }
+                    }
+                }
+
+                fun test3() {
+                    val localLambda1 = @Composable {
+                        val foo = remember { mutableStateOf(0) }
+                        val bar = remember { mutableStateListOf<Int>() }
+                        val baz = remember {
+                            val test = "test"
+                            mutableStateMapOf<Int, Float>()
+                        }
+                    }
+
+                    val localLambda2: @Composable () -> Unit = {
+                        val foo = remember { mutableStateOf(0) }
+                        val bar = remember { mutableStateListOf<Int>() }
+                        val baz = remember {
+                            val test = "test"
+                            mutableStateMapOf<Int, Float>()
+                        }
+                    }
+                }
+            """
+            ),
+            kotlin(Stubs.Composable),
+            kotlin(Stubs.MutableState),
+            kotlin(Stubs.Remember)
+        )
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun noErrors() {
+        lint().files(
+            kotlin(
+                """
+                package androidx.compose.runtime.foo
+
+                import androidx.compose.runtime.*
+
+                fun test() {
+                    val foo = mutableStateOf(0)
+                    val bar = mutableStateListOf<Int>()
+                    val baz = mutableStateMapOf<Int, Float>()
+                }
+
+                val lambda = {
+                    val foo = mutableStateOf(0)
+                    val bar = mutableStateListOf<Int>()
+                    val baz = mutableStateMapOf<Int, Float>()
+                }
+
+                val lambda2: () -> Unit = {
+                    val foo = mutableStateOf(0)
+                    val bar = mutableStateListOf<Int>()
+                    val baz = mutableStateMapOf<Int, Float>()
+                }
+
+                fun LambdaParameter(content: () -> Unit) {}
+
+                fun test2() {
+                    LambdaParameter(content = {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    })
+                    LambdaParameter {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    }
+                }
+
+                fun test3() {
+                    val localLambda1 = {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    }
+
+                    val localLambda2: () -> Unit = {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    }
+                }
+
+                fun test3() {
+                    class Foo {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    }
+
+                    val localObject = object {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    }
+                }
+
+                @Composable
+                fun Test4() {
+                    class Foo {
+                        val foo = mutableStateOf(0)
+                        val bar = mutableStateListOf<Int>()
+                        val baz = mutableStateMapOf<Int, Float>()
+                    }
+                }
+            """
+            ),
+            kotlin(Stubs.Composable),
+            kotlin(Stubs.MutableState),
+            kotlin(Stubs.Remember)
+        )
+            .run()
+            .expectClean()
+    }
+}
+/* ktlint-enable max-line-length */

compose/runtime/runtime-livedata/api/1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-livedata/api/1.0.0-beta04.txt b/compose/runtime/runtime-livedata/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..e004a29
--- /dev/null
+++ b/compose/runtime/runtime-livedata/api/1.0.0-beta04.txt
@@ -0,0 +1,10 @@
+// Signature format: 4.0
+package androidx.compose.runtime.livedata {
+
+  public final class LiveDataAdapterKt {
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> observeAsState(androidx.lifecycle.LiveData<T>);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> observeAsState(androidx.lifecycle.LiveData<T>, R? initial);
+  }
+
+}
+

compose/runtime/runtime-livedata/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-livedata/api/public_plus_experimental_1.0.0-beta04.txt b/compose/runtime/runtime-livedata/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..e004a29
--- /dev/null
+++ b/compose/runtime/runtime-livedata/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,10 @@
+// Signature format: 4.0
+package androidx.compose.runtime.livedata {
+
+  public final class LiveDataAdapterKt {
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> observeAsState(androidx.lifecycle.LiveData<T>);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> observeAsState(androidx.lifecycle.LiveData<T>, R? initial);
+  }
+
+}
+

compose/runtime/runtime-livedata/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/runtime/runtime-livedata/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/runtime/runtime-livedata/api/res-1.0.0-beta04.txt

compose/runtime/runtime-livedata/api/restricted_1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-livedata/api/restricted_1.0.0-beta04.txt b/compose/runtime/runtime-livedata/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..e004a29
--- /dev/null
+++ b/compose/runtime/runtime-livedata/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,10 @@
+// Signature format: 4.0
+package androidx.compose.runtime.livedata {
+
+  public final class LiveDataAdapterKt {
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> observeAsState(androidx.lifecycle.LiveData<T>);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> observeAsState(androidx.lifecycle.LiveData<T>, R? initial);
+  }
+
+}
+

compose/runtime/runtime-rxjava2/api/1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-rxjava2/api/1.0.0-beta04.txt b/compose/runtime/runtime-rxjava2/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..fb30f38
--- /dev/null
+++ b/compose/runtime/runtime-rxjava2/api/1.0.0-beta04.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava2 {
+
+  public final class RxJava2AdapterKt {
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Observable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Flowable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Single<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Maybe<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.Completable);
+  }
+
+}
+

compose/runtime/runtime-rxjava2/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-rxjava2/api/public_plus_experimental_1.0.0-beta04.txt b/compose/runtime/runtime-rxjava2/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..fb30f38
--- /dev/null
+++ b/compose/runtime/runtime-rxjava2/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava2 {
+
+  public final class RxJava2AdapterKt {
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Observable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Flowable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Single<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Maybe<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.Completable);
+  }
+
+}
+

compose/runtime/runtime-rxjava2/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/runtime/runtime-rxjava2/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/runtime/runtime-rxjava2/api/res-1.0.0-beta04.txt

compose/runtime/runtime-rxjava2/api/restricted_1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-rxjava2/api/restricted_1.0.0-beta04.txt b/compose/runtime/runtime-rxjava2/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..fb30f38
--- /dev/null
+++ b/compose/runtime/runtime-rxjava2/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava2 {
+
+  public final class RxJava2AdapterKt {
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Observable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Flowable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Single<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Maybe<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.Completable);
+  }
+
+}
+

compose/runtime/runtime-rxjava3/api/1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-rxjava3/api/1.0.0-beta04.txt b/compose/runtime/runtime-rxjava3/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..1930cc8
--- /dev/null
+++ b/compose/runtime/runtime-rxjava3/api/1.0.0-beta04.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava3 {
+
+  public final class RxJava3AdapterKt {
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Observable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Flowable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Single<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Maybe<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.rxjava3.core.Completable);
+  }
+
+}
+

compose/runtime/runtime-rxjava3/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-rxjava3/api/public_plus_experimental_1.0.0-beta04.txt b/compose/runtime/runtime-rxjava3/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..1930cc8
--- /dev/null
+++ b/compose/runtime/runtime-rxjava3/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava3 {
+
+  public final class RxJava3AdapterKt {
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Observable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Flowable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Single<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Maybe<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.rxjava3.core.Completable);
+  }
+
+}
+

compose/runtime/runtime-rxjava3/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/runtime/runtime-rxjava3/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/runtime/runtime-rxjava3/api/res-1.0.0-beta04.txt

compose/runtime/runtime-rxjava3/api/restricted_1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-rxjava3/api/restricted_1.0.0-beta04.txt b/compose/runtime/runtime-rxjava3/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..1930cc8
--- /dev/null
+++ b/compose/runtime/runtime-rxjava3/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava3 {
+
+  public final class RxJava3AdapterKt {
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Observable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Flowable<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Single<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Maybe<T>, R? initial);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.rxjava3.core.Completable);
+  }
+
+}
+

compose/runtime/runtime-saveable/api/1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-saveable/api/1.0.0-beta04.txt b/compose/runtime/runtime-saveable/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..9622306
--- /dev/null
+++ b/compose/runtime/runtime-saveable/api/1.0.0-beta04.txt
@@ -0,0 +1,57 @@
+// Signature format: 4.0
+package androidx.compose.runtime.saveable {
+
+  public final class ListSaverKt {
+    method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,java.lang.Object> listSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends java.util.List<? extends Saveable>> save, kotlin.jvm.functions.Function1<? super java.util.List<? extends Saveable>,? extends Original> restore);
+  }
+
+  public final class MapSaverKt {
+    method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> mapSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super T,? extends java.util.Map<java.lang.String,?>> save, kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,?>,? extends T> restore);
+  }
+
+  public final class RememberSaveableKt {
+    method @androidx.compose.runtime.Composable public static <T> T rememberSaveable(Object![]? inputs, optional androidx.compose.runtime.saveable.Saver<T,?> saver, optional String? key, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.MutableState<T> rememberSaveable(Object![]? inputs, androidx.compose.runtime.saveable.Saver<T,?> stateSaver, optional String? key, kotlin.jvm.functions.Function0<? extends androidx.compose.runtime.MutableState<T>> init);
+  }
+
+  public interface SaveableStateHolder {
+    method @androidx.compose.runtime.Composable public void SaveableStateProvider(Object key, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public void removeState(Object key);
+  }
+
+  public final class SaveableStateHolderKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.saveable.SaveableStateHolder rememberSaveableStateHolder();
+  }
+
+  public interface SaveableStateRegistry {
+    method public boolean canBeSaved(Object value);
+    method public Object? consumeRestored(String key);
+    method public java.util.Map<java.lang.String,java.util.List<java.lang.Object>> performSave();
+    method public androidx.compose.runtime.saveable.SaveableStateRegistry.Entry registerProvider(String key, kotlin.jvm.functions.Function0<?> valueProvider);
+  }
+
+  public static interface SaveableStateRegistry.Entry {
+    method public void unregister();
+  }
+
+  public final class SaveableStateRegistryKt {
+    method public static androidx.compose.runtime.saveable.SaveableStateRegistry SaveableStateRegistry(java.util.Map<java.lang.String,? extends java.util.List<?>>? restoredValues, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> canBeSaved);
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.runtime.saveable.SaveableStateRegistry> getLocalSaveableStateRegistry();
+  }
+
+  public interface Saver<Original, Saveable> {
+    method public Original? restore(Saveable value);
+    method public Saveable? save(androidx.compose.runtime.saveable.SaverScope, Original? value);
+  }
+
+  public final class SaverKt {
+    method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,Saveable> Saver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends Saveable> save, kotlin.jvm.functions.Function1<? super Saveable,? extends Original> restore);
+    method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> autoSaver();
+  }
+
+  public fun interface SaverScope {
+    method public boolean canBeSaved(Object value);
+  }
+
+}
+

compose/runtime/runtime-saveable/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-saveable/api/public_plus_experimental_1.0.0-beta04.txt b/compose/runtime/runtime-saveable/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..9622306
--- /dev/null
+++ b/compose/runtime/runtime-saveable/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,57 @@
+// Signature format: 4.0
+package androidx.compose.runtime.saveable {
+
+  public final class ListSaverKt {
+    method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,java.lang.Object> listSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends java.util.List<? extends Saveable>> save, kotlin.jvm.functions.Function1<? super java.util.List<? extends Saveable>,? extends Original> restore);
+  }
+
+  public final class MapSaverKt {
+    method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> mapSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super T,? extends java.util.Map<java.lang.String,?>> save, kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,?>,? extends T> restore);
+  }
+
+  public final class RememberSaveableKt {
+    method @androidx.compose.runtime.Composable public static <T> T rememberSaveable(Object![]? inputs, optional androidx.compose.runtime.saveable.Saver<T,?> saver, optional String? key, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.MutableState<T> rememberSaveable(Object![]? inputs, androidx.compose.runtime.saveable.Saver<T,?> stateSaver, optional String? key, kotlin.jvm.functions.Function0<? extends androidx.compose.runtime.MutableState<T>> init);
+  }
+
+  public interface SaveableStateHolder {
+    method @androidx.compose.runtime.Composable public void SaveableStateProvider(Object key, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public void removeState(Object key);
+  }
+
+  public final class SaveableStateHolderKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.saveable.SaveableStateHolder rememberSaveableStateHolder();
+  }
+
+  public interface SaveableStateRegistry {
+    method public boolean canBeSaved(Object value);
+    method public Object? consumeRestored(String key);
+    method public java.util.Map<java.lang.String,java.util.List<java.lang.Object>> performSave();
+    method public androidx.compose.runtime.saveable.SaveableStateRegistry.Entry registerProvider(String key, kotlin.jvm.functions.Function0<?> valueProvider);
+  }
+
+  public static interface SaveableStateRegistry.Entry {
+    method public void unregister();
+  }
+
+  public final class SaveableStateRegistryKt {
+    method public static androidx.compose.runtime.saveable.SaveableStateRegistry SaveableStateRegistry(java.util.Map<java.lang.String,? extends java.util.List<?>>? restoredValues, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> canBeSaved);
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.runtime.saveable.SaveableStateRegistry> getLocalSaveableStateRegistry();
+  }
+
+  public interface Saver<Original, Saveable> {
+    method public Original? restore(Saveable value);
+    method public Saveable? save(androidx.compose.runtime.saveable.SaverScope, Original? value);
+  }
+
+  public final class SaverKt {
+    method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,Saveable> Saver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends Saveable> save, kotlin.jvm.functions.Function1<? super Saveable,? extends Original> restore);
+    method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> autoSaver();
+  }
+
+  public fun interface SaverScope {
+    method public boolean canBeSaved(Object value);
+  }
+
+}
+

compose/runtime/runtime-saveable/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/runtime/runtime-saveable/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/runtime/runtime-saveable/api/res-1.0.0-beta04.txt

compose/runtime/runtime-saveable/api/restricted_1.0.0-beta04.txt

diff --git a/compose/runtime/runtime-saveable/api/restricted_1.0.0-beta04.txt b/compose/runtime/runtime-saveable/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..9622306
--- /dev/null
+++ b/compose/runtime/runtime-saveable/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,57 @@
+// Signature format: 4.0
+package androidx.compose.runtime.saveable {
+
+  public final class ListSaverKt {
+    method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,java.lang.Object> listSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends java.util.List<? extends Saveable>> save, kotlin.jvm.functions.Function1<? super java.util.List<? extends Saveable>,? extends Original> restore);
+  }
+
+  public final class MapSaverKt {
+    method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> mapSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super T,? extends java.util.Map<java.lang.String,?>> save, kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,?>,? extends T> restore);
+  }
+
+  public final class RememberSaveableKt {
+    method @androidx.compose.runtime.Composable public static <T> T rememberSaveable(Object![]? inputs, optional androidx.compose.runtime.saveable.Saver<T,?> saver, optional String? key, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.MutableState<T> rememberSaveable(Object![]? inputs, androidx.compose.runtime.saveable.Saver<T,?> stateSaver, optional String? key, kotlin.jvm.functions.Function0<? extends androidx.compose.runtime.MutableState<T>> init);
+  }
+
+  public interface SaveableStateHolder {
+    method @androidx.compose.runtime.Composable public void SaveableStateProvider(Object key, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public void removeState(Object key);
+  }
+
+  public final class SaveableStateHolderKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.saveable.SaveableStateHolder rememberSaveableStateHolder();
+  }
+
+  public interface SaveableStateRegistry {
+    method public boolean canBeSaved(Object value);
+    method public Object? consumeRestored(String key);
+    method public java.util.Map<java.lang.String,java.util.List<java.lang.Object>> performSave();
+    method public androidx.compose.runtime.saveable.SaveableStateRegistry.Entry registerProvider(String key, kotlin.jvm.functions.Function0<?> valueProvider);
+  }
+
+  public static interface SaveableStateRegistry.Entry {
+    method public void unregister();
+  }
+
+  public final class SaveableStateRegistryKt {
+    method public static androidx.compose.runtime.saveable.SaveableStateRegistry SaveableStateRegistry(java.util.Map<java.lang.String,? extends java.util.List<?>>? restoredValues, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> canBeSaved);
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.runtime.saveable.SaveableStateRegistry> getLocalSaveableStateRegistry();
+  }
+
+  public interface Saver<Original, Saveable> {
+    method public Original? restore(Saveable value);
+    method public Saveable? save(androidx.compose.runtime.saveable.SaverScope, Original? value);
+  }
+
+  public final class SaverKt {
+    method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,Saveable> Saver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends Saveable> save, kotlin.jvm.functions.Function1<? super Saveable,? extends Original> restore);
+    method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> autoSaver();
+  }
+
+  public fun interface SaverScope {
+    method public boolean canBeSaved(Object value);
+  }
+
+}
+

compose/runtime/runtime/api/1.0.0-beta04.txt

diff --git a/compose/runtime/runtime/api/1.0.0-beta04.txt b/compose/runtime/runtime/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..329d523
--- /dev/null
+++ b/compose/runtime/runtime/api/1.0.0-beta04.txt
@@ -0,0 +1,680 @@
+// Signature format: 4.0
+package androidx.compose.runtime {
+
+  public abstract class AbstractApplier<T> implements androidx.compose.runtime.Applier<T> {
+    ctor public AbstractApplier(T? root);
+    method public final void clear();
+    method public void down(T? node);
+    method public T! getCurrent();
+    method public final T! getRoot();
+    method protected final void move(java.util.List<T>, int from, int to, int count);
+    method protected abstract void onClear();
+    method protected final void remove(java.util.List<T>, int index, int count);
+    method protected void setCurrent(T! p);
+    method public void up();
+    property public T! current;
+    property public final T! root;
+  }
+
+  public final class ActualAndroid_androidKt {
+    method @Deprecated public static androidx.compose.runtime.MonotonicFrameClock getDefaultMonotonicFrameClock();
+  }
+
+  public final class ActualJvm_jvmKt {
+  }
+
+  public interface Applier<N> {
+    method public void clear();
+    method public void down(N? node);
+    method public N! getCurrent();
+    method public void insertBottomUp(int index, N? instance);
+    method public void insertTopDown(int index, N? instance);
+    method public void move(int from, int to, int count);
+    method public default void onBeginChanges();
+    method public default void onEndChanges();
+    method public void remove(int index, int count);
+    method public void up();
+    property public abstract N! current;
+  }
+
+  public final class BitwiseOperatorsKt {
+  }
+
+  public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
+    method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
+    method public boolean getHasAwaiters();
+    method public void sendFrame(long timeNanos);
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final boolean hasAwaiters;
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface Composable {
+  }
+
+  public final class ComposablesKt {
+    method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update);
+    method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline <T, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.SkippableUpdater<T>,? extends kotlin.Unit> skippableUpdate, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.Composer getCurrentComposer();
+    method @androidx.compose.runtime.Composable public static int getCurrentCompositeKeyHash();
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.RecomposeScope getCurrentRecomposeScope();
+    method @androidx.compose.runtime.Composable public static inline <T> T! key(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> block);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.CompositionContext rememberCompositionContext();
+  }
+
+  public interface Composer {
+    method public androidx.compose.runtime.Applier<?> getApplier();
+    method @org.jetbrains.annotations.TestOnly public kotlin.coroutines.CoroutineContext getApplyCoroutineContext();
+    method @org.jetbrains.annotations.TestOnly public androidx.compose.runtime.ControlledComposition getComposition();
+    method public androidx.compose.runtime.tooling.CompositionData getCompositionData();
+    method public int getCompoundKeyHash();
+    method public boolean getDefaultsInvalid();
+    method public boolean getInserting();
+    method public androidx.compose.runtime.RecomposeScope? getRecomposeScope();
+    method public boolean getSkipping();
+    property public abstract androidx.compose.runtime.Applier<?> applier;
+    property @org.jetbrains.annotations.TestOnly public abstract kotlin.coroutines.CoroutineContext applyCoroutineContext;
+    property @org.jetbrains.annotations.TestOnly public abstract androidx.compose.runtime.ControlledComposition composition;
+    property public abstract androidx.compose.runtime.tooling.CompositionData compositionData;
+    property public abstract int compoundKeyHash;
+    property public abstract boolean defaultsInvalid;
+    property public abstract boolean inserting;
+    property public abstract androidx.compose.runtime.RecomposeScope? recomposeScope;
+    property public abstract boolean skipping;
+    field public static final androidx.compose.runtime.Composer.Companion Companion;
+  }
+
+  public static final class Composer.Companion {
+    method public Object getEmpty();
+    property public final Object Empty;
+  }
+
+  public final class ComposerKt {
+  }
+
+  public interface Composition {
+    method public void dispose();
+    method public boolean getHasInvalidations();
+    method public boolean isDisposed();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    property public abstract boolean hasInvalidations;
+    property public abstract boolean isDisposed;
+  }
+
+  public abstract class CompositionContext {
+  }
+
+  public final class CompositionContextKt {
+  }
+
+  public final class CompositionKt {
+    method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+    method @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+  }
+
+  @androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
+  }
+
+  public final class CompositionLocalKt {
+    method @androidx.compose.runtime.Composable public static void CompositionLocalProvider(androidx.compose.runtime.ProvidedValue<?>![] values, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> compositionLocalOf(optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy, kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+    method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> staticCompositionLocalOf(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+  }
+
+  public interface ControlledComposition extends androidx.compose.runtime.Composition {
+    method public void applyChanges();
+    method public void composeContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public boolean getHasPendingChanges();
+    method public void invalidateAll();
+    method public boolean isComposing();
+    method public boolean recompose();
+    method public void recordModificationsOf(java.util.Set<?> values);
+    method public void recordReadOf(Object value);
+    method public void recordWriteOf(Object value);
+    property public abstract boolean hasPendingChanges;
+    property public abstract boolean isComposing;
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface DisallowComposableCalls {
+  }
+
+  public interface DisposableEffectResult {
+    method public void dispose();
+  }
+
+  public final class DisposableEffectScope {
+    ctor public DisposableEffectScope();
+    method public inline androidx.compose.runtime.DisposableEffectResult onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDisposeEffect);
+  }
+
+  public final class EffectsKt {
+    method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object![]? keys, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @Deprecated @androidx.compose.runtime.Composable public static void LaunchedEffect(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object![]? keys, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void SideEffect(kotlin.jvm.functions.Function0<kotlin.Unit> effect);
+    method @androidx.compose.runtime.Composable public static inline kotlinx.coroutines.CoroutineScope rememberCoroutineScope(optional kotlin.jvm.functions.Function0<? extends kotlin.coroutines.CoroutineContext> getContext);
+  }
+
+  public final class ExpectKt {
+  }
+
+  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ExplicitGroupsComposable {
+  }
+
+  @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Immutable {
+  }
+
+  public interface MonotonicFrameClock extends kotlin.coroutines.CoroutineContext.Element {
+    method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+    field public static final androidx.compose.runtime.MonotonicFrameClock.Key Key;
+  }
+
+  public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.MonotonicFrameClock> {
+  }
+
+  public final class MonotonicFrameClockKt {
+    method public static androidx.compose.runtime.MonotonicFrameClock getMonotonicFrameClock(kotlin.coroutines.CoroutineContext);
+    method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  @androidx.compose.runtime.Stable public interface MutableState<T> extends androidx.compose.runtime.State<T> {
+    method public operator T! component1();
+    method public operator kotlin.jvm.functions.Function1<T,kotlin.Unit> component2();
+    method public void setValue(T! p);
+    property public abstract T! value;
+  }
+
+  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface NoLiveLiterals {
+  }
+
+  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface NonRestartableComposable {
+  }
+
+  public final class PausableMonotonicFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public PausableMonotonicFrameClock(androidx.compose.runtime.MonotonicFrameClock frameClock);
+    method public boolean isPaused();
+    method public void pause();
+    method public void resume();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final boolean isPaused;
+  }
+
+  public interface ProduceStateScope<T> extends androidx.compose.runtime.MutableState<T> kotlinx.coroutines.CoroutineScope {
+    method public suspend Object? awaitDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDispose, kotlin.coroutines.Continuation<?> p);
+  }
+
+  @androidx.compose.runtime.Stable public abstract class ProvidableCompositionLocal<T> extends androidx.compose.runtime.CompositionLocal<T> {
+    method public final infix androidx.compose.runtime.ProvidedValue<T> provides(T? value);
+    method public final infix androidx.compose.runtime.ProvidedValue<T> providesDefault(T? value);
+  }
+
+  public final class ProvidedValue<T> {
+    method public boolean getCanOverride();
+    method public androidx.compose.runtime.CompositionLocal<T> getCompositionLocal();
+    method public T! getValue();
+    property public final boolean canOverride;
+    property public final androidx.compose.runtime.CompositionLocal<T> compositionLocal;
+    property public final T! value;
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ReadOnlyComposable {
+  }
+
+  public interface RecomposeScope {
+    method public void invalidate();
+  }
+
+  public final class Recomposer extends androidx.compose.runtime.CompositionContext {
+    ctor public Recomposer(kotlin.coroutines.CoroutineContext effectCoroutineContext);
+    method public androidx.compose.runtime.RecomposerInfo asRecomposerInfo();
+    method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public void cancel();
+    method public void close();
+    method public long getChangeCount();
+    method public boolean getHasPendingWork();
+    method public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+    method public suspend Object? join(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final long changeCount;
+    property public final boolean hasPendingWork;
+    property public final kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+    field public static final androidx.compose.runtime.Recomposer.Companion Companion;
+  }
+
+  public static final class Recomposer.Companion {
+    method public kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> getRunningRecomposers();
+    property public final kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> runningRecomposers;
+  }
+
+  public enum Recomposer.State {
+    enum_constant public static final androidx.compose.runtime.Recomposer.State Idle;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State Inactive;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State InactivePendingWork;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State PendingWork;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State ShutDown;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State ShuttingDown;
+  }
+
+  public interface RecomposerInfo {
+    method public long getChangeCount();
+    method public boolean getHasPendingWork();
+    method public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+    property public abstract long changeCount;
+    property public abstract boolean hasPendingWork;
+    property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+  }
+
+  public final class RecomposerKt {
+    method public static suspend <R> Object? withRunningRecomposer(kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.runtime.Recomposer,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  public interface RememberObserver {
+    method public void onAbandoned();
+    method public void onForgotten();
+    method public void onRemembered();
+  }
+
+  public final inline class SkippableUpdater<T> {
+    ctor public SkippableUpdater();
+    method public static androidx.compose.runtime.Composer! constructor-impl(androidx.compose.runtime.Composer composer);
+    method public static inline boolean equals-impl(androidx.compose.runtime.Composer! p, Object? p1);
+    method public static boolean equals-impl0(androidx.compose.runtime.Composer p1, androidx.compose.runtime.Composer p2);
+    method public static inline int hashCode-impl(androidx.compose.runtime.Composer! p);
+    method public static inline String! toString-impl(androidx.compose.runtime.Composer! p);
+    method public static inline void update-impl(androidx.compose.runtime.Composer $this, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
+  }
+
+  public final class SlotTableKt {
+  }
+
+  public interface SnapshotMutationPolicy<T> {
+    method public boolean equivalent(T? a, T? b);
+    method public default T? merge(T? previous, T? current, T? applied);
+  }
+
+  public final class SnapshotStateKt {
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+    method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+    method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+    method public static inline operator <T> T! getValue(androidx.compose.runtime.State<T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+    method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+    method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+    method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+    method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+    method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+    method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+    method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+    method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+    method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+    method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+    method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+  }
+
+  @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface Stable {
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface StableMarker {
+  }
+
+  @androidx.compose.runtime.Stable public interface State<T> {
+    method public T! getValue();
+    property public abstract T! value;
+  }
+
+  public final class TraceKt {
+  }
+
+  public final inline class Updater<T> {
+    ctor public Updater();
+    method public static androidx.compose.runtime.Composer! constructor-impl(androidx.compose.runtime.Composer composer);
+    method public static inline boolean equals-impl(androidx.compose.runtime.Composer! p, Object? p1);
+    method public static boolean equals-impl0(androidx.compose.runtime.Composer p1, androidx.compose.runtime.Composer p2);
+    method public static inline int hashCode-impl(androidx.compose.runtime.Composer! p);
+    method public static void init-impl(androidx.compose.runtime.Composer $this, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public static void reconcile-impl(androidx.compose.runtime.Composer $this, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public static inline void set-impl(androidx.compose.runtime.Composer $this, int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public static <V> void set-impl(androidx.compose.runtime.Composer? $this, V value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+    method public static inline String! toString-impl(androidx.compose.runtime.Composer! p);
+    method public static inline void update-impl(androidx.compose.runtime.Composer $this, int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public static <V> void update-impl(androidx.compose.runtime.Composer? $this, V value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+  }
+
+}
+
+package androidx.compose.runtime.collection {
+
+  public final class MutableVector<T> implements java.util.RandomAccess {
+    method public boolean add(T? element);
+    method public void add(int index, T? element);
+    method public boolean addAll(int index, java.util.List<? extends T> elements);
+    method public boolean addAll(int index, androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public inline boolean addAll(java.util.List<? extends T> elements);
+    method public inline boolean addAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public boolean addAll(T![] elements);
+    method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+    method public boolean addAll(java.util.Collection<? extends T> elements);
+    method public inline boolean any(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public java.util.List<T> asMutableList();
+    method public void clear();
+    method public operator boolean contains(T? element);
+    method public boolean containsAll(java.util.List<? extends T> elements);
+    method public boolean containsAll(java.util.Collection<? extends T> elements);
+    method public boolean containsAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public boolean contentEquals(androidx.compose.runtime.collection.MutableVector<T> other);
+    method public void ensureCapacity(int capacity);
+    method public T! first();
+    method public inline T! first(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline T? firstOrNull();
+    method public inline T? firstOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline <R> R! fold(R? initial, kotlin.jvm.functions.Function2<? super R,? super T,? extends R> operation);
+    method public inline <R> R! foldIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super R,? super T,? extends R> operation);
+    method public inline <R> R! foldRight(R? initial, kotlin.jvm.functions.Function2<? super T,? super R,? extends R> operation);
+    method public inline <R> R! foldRightIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super T,? super R,? extends R> operation);
+    method public inline void forEach(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public inline void forEachIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+    method public inline void forEachReversed(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public inline void forEachReversedIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+    method public inline operator T! get(int index);
+    method public inline kotlin.ranges.IntRange getIndices();
+    method public inline int getLastIndex();
+    method public int getSize();
+    method public int indexOf(T? element);
+    method public inline int indexOfFirst(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline int indexOfLast(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public boolean isEmpty();
+    method public boolean isNotEmpty();
+    method public T! last();
+    method public inline T! last(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public int lastIndexOf(T? element);
+    method public inline T? lastOrNull();
+    method public inline T? lastOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline <reified R> R![]! map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public inline <reified R> R![]! mapIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+    method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapIndexedNotNull(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+    method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapNotNull(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public inline operator void minusAssign(T? element);
+    method public inline operator void plusAssign(T? element);
+    method public boolean remove(T? element);
+    method public boolean removeAll(java.util.List<? extends T> elements);
+    method public boolean removeAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public boolean removeAll(java.util.Collection<? extends T> elements);
+    method public T! removeAt(int index);
+    method public void removeRange(int start, int end);
+    method public boolean retainAll(java.util.Collection<? extends T> elements);
+    method public inline boolean reversedAny(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public operator T! set(int index, T? element);
+    method public void sortWith(java.util.Comparator<T> comparator);
+    method public inline int sumBy(kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+    property public final inline kotlin.ranges.IntRange indices;
+    property public final inline int lastIndex;
+    property public final int size;
+  }
+
+  public final class MutableVectorKt {
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(optional int capacity);
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(int size, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends T> init);
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf();
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf(T? elements);
+  }
+
+}
+
+package androidx.compose.runtime.internal {
+
+  public final class ComposableLambdaKt {
+  }
+
+  public final class ComposableLambdaN_jvmKt {
+  }
+
+  public final class LiveLiteralKt {
+    method public static boolean isLiveLiteralsEnabled();
+  }
+
+  public final class ThreadMapKt {
+  }
+
+}
+
+package androidx.compose.runtime.snapshots {
+
+  public final class ListUtilsKt {
+  }
+
+  public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
+    method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
+    method public void close$metalava_module();
+    method public java.util.Set<androidx.compose.runtime.snapshots.StateObject>? getModified$metalava_module();
+    method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver$metalava_module();
+    method public boolean getReadOnly();
+    method public androidx.compose.runtime.snapshots.Snapshot getRoot();
+    method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getWriteObserver$metalava_module();
+    method public boolean hasPendingChanges();
+    method public void nestedActivated$metalava_module(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public void nestedDeactivated$metalava_module(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public void notifyObjectsInitialized$metalava_module();
+    method public void recordModified$metalava_module(androidx.compose.runtime.snapshots.StateObject state);
+    method public void setModified(java.util.Set<androidx.compose.runtime.snapshots.StateObject>? p);
+    method public androidx.compose.runtime.snapshots.MutableSnapshot takeNestedMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+    method public androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+    property public java.util.Set<androidx.compose.runtime.snapshots.StateObject>? modified;
+    property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver;
+    property public boolean readOnly;
+    property public androidx.compose.runtime.snapshots.Snapshot root;
+    property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver;
+  }
+
+  public fun interface ObserverHandle {
+    method public void dispose();
+  }
+
+  public abstract sealed class Snapshot {
+    method public void dispose();
+    method public final inline <T> T! enter(kotlin.jvm.functions.Function0<? extends T> block);
+    method public int getId();
+    method public abstract boolean getReadOnly();
+    method public abstract androidx.compose.runtime.snapshots.Snapshot getRoot();
+    method public abstract boolean hasPendingChanges();
+    method public abstract androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+    property public int id;
+    property public abstract boolean readOnly;
+    property public abstract androidx.compose.runtime.snapshots.Snapshot root;
+    field public static final androidx.compose.runtime.snapshots.Snapshot.Companion Companion;
+  }
+
+  public static final class Snapshot.Companion {
+    method public androidx.compose.runtime.snapshots.Snapshot! getCurrent();
+    method public inline <T> T! global(kotlin.jvm.functions.Function0<? extends T> block);
+    method public void notifyObjectsInitialized();
+    method public <T> T! observe(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver, kotlin.jvm.functions.Function0<? extends T> block);
+    method public androidx.compose.runtime.snapshots.ObserverHandle registerApplyObserver(kotlin.jvm.functions.Function2<? super java.util.Set<?>,? super androidx.compose.runtime.snapshots.Snapshot,kotlin.Unit> observer);
+    method public androidx.compose.runtime.snapshots.ObserverHandle registerGlobalWriteObserver(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit> observer);
+    method public void sendApplyNotifications();
+    method public androidx.compose.runtime.snapshots.MutableSnapshot takeMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+    method public androidx.compose.runtime.snapshots.Snapshot takeSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+    method public inline <R> R! withMutableSnapshot(kotlin.jvm.functions.Function0<? extends R> block);
+    property public final androidx.compose.runtime.snapshots.Snapshot! current;
+  }
+
+  public final class SnapshotApplyConflictException extends java.lang.Exception {
+    ctor public SnapshotApplyConflictException(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+    property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+  }
+
+  public abstract sealed class SnapshotApplyResult {
+    method public abstract void check();
+    method public abstract boolean getSucceeded();
+    property public abstract boolean succeeded;
+  }
+
+  public static final class SnapshotApplyResult.Failure extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+    ctor public SnapshotApplyResult.Failure(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public void check();
+    method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+    method public boolean getSucceeded();
+    property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+    property public boolean succeeded;
+  }
+
+  public static final class SnapshotApplyResult.Success extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+    method public void check();
+    method public boolean getSucceeded();
+    property public boolean succeeded;
+    field public static final androidx.compose.runtime.snapshots.SnapshotApplyResult.Success INSTANCE;
+  }
+
+  public final class SnapshotIdSetKt {
+  }
+
+  public final class SnapshotKt {
+    method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state);
+    method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! withCurrent(T, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+    method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+    method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+  }
+
+  public interface SnapshotMutableState<T> extends androidx.compose.runtime.MutableState<T> {
+    method public androidx.compose.runtime.SnapshotMutationPolicy<T> getPolicy();
+    property public abstract androidx.compose.runtime.SnapshotMutationPolicy<T> policy;
+  }
+
+  @androidx.compose.runtime.Stable public final class SnapshotStateList<T> implements kotlin.jvm.internal.markers.KMutableList java.util.List<T> androidx.compose.runtime.snapshots.StateObject {
+    ctor public SnapshotStateList();
+    method public boolean add(T? element);
+    method public void add(int index, T? element);
+    method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+    method public boolean addAll(java.util.Collection<? extends T> elements);
+    method public void clear();
+    method public boolean contains(Object? element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public T! get(int index);
+    method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+    method public int getSize();
+    method public int indexOf(Object? element);
+    method public boolean isEmpty();
+    method public java.util.Iterator<T> iterator();
+    method public int lastIndexOf(Object? element);
+    method public java.util.ListIterator<T> listIterator();
+    method public java.util.ListIterator<T> listIterator(int index);
+    method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+    method public boolean remove(Object? element);
+    method public boolean removeAll(java.util.Collection<?> elements);
+    method public T! removeAt(int index);
+    method public void removeRange(int fromIndex, int toIndex);
+    method public boolean retainAll(java.util.Collection<?> elements);
+    method public T! set(int index, T? element);
+    method public java.util.List<T> subList(int fromIndex, int toIndex);
+    property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+    property public int size;
+  }
+
+  public final class SnapshotStateListKt {
+  }
+
+  @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
+    ctor public SnapshotStateMap();
+    method public void clear();
+    method public boolean containsKey(Object? key);
+    method public boolean containsValue(Object? value);
+    method public V? get(Object? key);
+    method public java.util.Set<java.util.Map.Entry<K,V>> getEntries();
+    method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+    method public java.util.Set<K> getKeys();
+    method public int getSize();
+    method public java.util.Collection<V> getValues();
+    method public boolean isEmpty();
+    method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+    method public V? put(K? key, V? value);
+    method public void putAll(java.util.Map<? extends K,? extends V> from);
+    method public V? remove(Object? key);
+    property public java.util.Set<java.util.Map.Entry<K,V>> entries;
+    property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+    property public java.util.Set<K> keys;
+    property public int size;
+    property public java.util.Collection<V> values;
+  }
+
+  public final class SnapshotStateMapKt {
+  }
+
+  public final class SnapshotStateObserver {
+    ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
+    method public void clear(Object scope);
+    method public void clear();
+    method public void clearIf(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+    method @org.jetbrains.annotations.TestOnly public void notifyChanges(java.util.Set<?> changes, androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public <T> void observeReads(T scope, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onValueChangedForScope, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void start();
+    method public void stop();
+    method public void withNoObservations(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public interface StateObject {
+    method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+    method public default androidx.compose.runtime.snapshots.StateRecord? mergeRecords(androidx.compose.runtime.snapshots.StateRecord previous, androidx.compose.runtime.snapshots.StateRecord current, androidx.compose.runtime.snapshots.StateRecord applied);
+    method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+    property public abstract androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+  }
+
+  public abstract class StateRecord {
+    ctor public StateRecord();
+    method public abstract void assign(androidx.compose.runtime.snapshots.StateRecord value);
+    method public abstract androidx.compose.runtime.snapshots.StateRecord create();
+  }
+
+}
+
+package androidx.compose.runtime.tooling {
+
+  public interface CompositionData {
+    method public Iterable<androidx.compose.runtime.tooling.CompositionGroup> getCompositionGroups();
+    method public boolean isEmpty();
+    property public abstract Iterable<androidx.compose.runtime.tooling.CompositionGroup> compositionGroups;
+    property public abstract boolean isEmpty;
+  }
+
+  public interface CompositionGroup extends androidx.compose.runtime.tooling.CompositionData {
+    method public Iterable<java.lang.Object> getData();
+    method public Object getKey();
+    method public Object? getNode();
+    method public String? getSourceInfo();
+    property public abstract Iterable<java.lang.Object> data;
+    property public abstract Object key;
+    property public abstract Object? node;
+    property public abstract String? sourceInfo;
+  }
+
+  public final class InspectionTablesKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<java.util.Set<androidx.compose.runtime.tooling.CompositionData>> getLocalInspectionTables();
+  }
+
+}
+

compose/runtime/runtime/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/runtime/runtime/api/public_plus_experimental_1.0.0-beta04.txt b/compose/runtime/runtime/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..c51803e
--- /dev/null
+++ b/compose/runtime/runtime/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,769 @@
+// Signature format: 4.0
+package androidx.compose.runtime {
+
+  public abstract class AbstractApplier<T> implements androidx.compose.runtime.Applier<T> {
+    ctor public AbstractApplier(T? root);
+    method public final void clear();
+    method public void down(T? node);
+    method public T! getCurrent();
+    method public final T! getRoot();
+    method protected final void move(java.util.List<T>, int from, int to, int count);
+    method protected abstract void onClear();
+    method protected final void remove(java.util.List<T>, int index, int count);
+    method protected void setCurrent(T! p);
+    method public void up();
+    property public T! current;
+    property public final T! root;
+  }
+
+  public final class ActualAndroid_androidKt {
+    method @Deprecated public static androidx.compose.runtime.MonotonicFrameClock getDefaultMonotonicFrameClock();
+  }
+
+  public final class ActualJvm_jvmKt {
+  }
+
+  public interface Applier<N> {
+    method public void clear();
+    method public void down(N? node);
+    method public N! getCurrent();
+    method public void insertBottomUp(int index, N? instance);
+    method public void insertTopDown(int index, N? instance);
+    method public void move(int from, int to, int count);
+    method public default void onBeginChanges();
+    method public default void onEndChanges();
+    method public void remove(int index, int count);
+    method public void up();
+    property public abstract N! current;
+  }
+
+  public final class BitwiseOperatorsKt {
+  }
+
+  public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
+    method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
+    method public boolean getHasAwaiters();
+    method public void sendFrame(long timeNanos);
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final boolean hasAwaiters;
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface Composable {
+  }
+
+  public final class ComposablesKt {
+    method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update);
+    method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline <T, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.SkippableUpdater<T>,? extends kotlin.Unit> skippableUpdate, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.Composer getCurrentComposer();
+    method @androidx.compose.runtime.Composable public static int getCurrentCompositeKeyHash();
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.RecomposeScope getCurrentRecomposeScope();
+    method @androidx.compose.runtime.Composable public static inline <T> T! key(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> block);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.CompositionContext rememberCompositionContext();
+  }
+
+  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level, message="This API is intended to be targeted by the Compose Compiler Plugin and not called " + "directly.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ComposeCompilerApi {
+  }
+
+  public interface Composer {
+    method @androidx.compose.runtime.ComposeCompilerApi public <V, T> void apply(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+    method @androidx.compose.runtime.InternalComposeApi public androidx.compose.runtime.CompositionContext buildContext();
+    method @androidx.compose.runtime.ComposeCompilerApi public boolean changed(Object? value);
+    method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(boolean value);
+    method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(char value);
+    method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(byte value);
+    method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(short value);
+    method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(int value);
+    method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(float value);
+    method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(long value);
+    method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(double value);
+    method @androidx.compose.runtime.InternalComposeApi public void collectParameterInformation();
+    method @androidx.compose.runtime.InternalComposeApi public <T> T! consume(androidx.compose.runtime.CompositionLocal<T> key);
+    method @androidx.compose.runtime.ComposeCompilerApi public <T> void createNode(kotlin.jvm.functions.Function0<? extends T> factory);
+    method @androidx.compose.runtime.ComposeCompilerApi public void endDefaults();
+    method @androidx.compose.runtime.ComposeCompilerApi public void endMovableGroup();
+    method @androidx.compose.runtime.ComposeCompilerApi public void endNode();
+    method @androidx.compose.runtime.InternalComposeApi public void endProviders();
+    method @androidx.compose.runtime.ComposeCompilerApi public void endReplaceableGroup();
+    method @androidx.compose.runtime.ComposeCompilerApi public androidx.compose.runtime.ScopeUpdateScope? endRestartGroup();
+    method public androidx.compose.runtime.Applier<?> getApplier();
+    method @org.jetbrains.annotations.TestOnly public kotlin.coroutines.CoroutineContext getApplyCoroutineContext();
+    method @org.jetbrains.annotations.TestOnly public androidx.compose.runtime.ControlledComposition getComposition();
+    method public androidx.compose.runtime.tooling.CompositionData getCompositionData();
+    method public int getCompoundKeyHash();
+    method public boolean getDefaultsInvalid();
+    method public boolean getInserting();
+    method public androidx.compose.runtime.RecomposeScope? getRecomposeScope();
+    method public boolean getSkipping();
+    method @androidx.compose.runtime.ComposeCompilerApi public Object joinKey(Object? left, Object? right);
+    method @androidx.compose.runtime.InternalComposeApi public void recordReadOf(Object value);
+    method @androidx.compose.runtime.InternalComposeApi public void recordSideEffect(kotlin.jvm.functions.Function0<kotlin.Unit> effect);
+    method @androidx.compose.runtime.InternalComposeApi public void recordUsed(androidx.compose.runtime.RecomposeScope scope);
+    method @androidx.compose.runtime.InternalComposeApi public void recordWriteOf(Object value);
+    method @androidx.compose.runtime.ComposeCompilerApi public Object? rememberedValue();
+    method @androidx.compose.runtime.ComposeCompilerApi public void skipCurrentGroup();
+    method @androidx.compose.runtime.ComposeCompilerApi public void skipToGroupEnd();
+    method @androidx.compose.runtime.ComposeCompilerApi public void startDefaults();
+    method @androidx.compose.runtime.ComposeCompilerApi public void startMovableGroup(int key, Object? dataKey);
+    method @androidx.compose.runtime.ComposeCompilerApi public void startMovableGroup(int key, Object? dataKey, String? sourceInformation);
+    method @androidx.compose.runtime.ComposeCompilerApi public void startNode();
+    method @androidx.compose.runtime.InternalComposeApi public void startProviders(androidx.compose.runtime.ProvidedValue<?>![] values);
+    method @androidx.compose.runtime.ComposeCompilerApi public void startReplaceableGroup(int key);
+    method @androidx.compose.runtime.ComposeCompilerApi public void startReplaceableGroup(int key, String? sourceInformation);
+    method @androidx.compose.runtime.ComposeCompilerApi public androidx.compose.runtime.Composer startRestartGroup(int key);
+    method @androidx.compose.runtime.ComposeCompilerApi public androidx.compose.runtime.Composer startRestartGroup(int key, String? sourceInformation);
+    method @androidx.compose.runtime.ComposeCompilerApi public void updateRememberedValue(Object? value);
+    method @androidx.compose.runtime.ComposeCompilerApi public void useNode();
+    property public abstract androidx.compose.runtime.Applier<?> applier;
+    property @org.jetbrains.annotations.TestOnly public abstract kotlin.coroutines.CoroutineContext applyCoroutineContext;
+    property @org.jetbrains.annotations.TestOnly public abstract androidx.compose.runtime.ControlledComposition composition;
+    property public abstract androidx.compose.runtime.tooling.CompositionData compositionData;
+    property public abstract int compoundKeyHash;
+    property public abstract boolean defaultsInvalid;
+    property public abstract boolean inserting;
+    property public abstract androidx.compose.runtime.RecomposeScope? recomposeScope;
+    property public abstract boolean skipping;
+    field public static final androidx.compose.runtime.Composer.Companion Companion;
+  }
+
+  public static final class Composer.Companion {
+    method public Object getEmpty();
+    property public final Object Empty;
+  }
+
+  public final class ComposerKt {
+    method @androidx.compose.runtime.ComposeCompilerApi public static inline <T> T! cache(androidx.compose.runtime.Composer, boolean invalid, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public interface Composition {
+    method public void dispose();
+    method public boolean getHasInvalidations();
+    method public boolean isDisposed();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    property public abstract boolean hasInvalidations;
+    property public abstract boolean isDisposed;
+  }
+
+  public abstract class CompositionContext {
+  }
+
+  public final class CompositionContextKt {
+  }
+
+  public final class CompositionKt {
+    method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+    method @androidx.compose.runtime.ExperimentalComposeApi public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent, kotlin.coroutines.CoroutineContext recomposeCoroutineContext);
+    method @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+    method @androidx.compose.runtime.ExperimentalComposeApi @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent, kotlin.coroutines.CoroutineContext recomposeCoroutineContext);
+    method @androidx.compose.runtime.ExperimentalComposeApi public static kotlin.coroutines.CoroutineContext getRecomposeCoroutineContext(androidx.compose.runtime.ControlledComposition);
+  }
+
+  @androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
+  }
+
+  public final class CompositionLocalKt {
+    method @androidx.compose.runtime.Composable public static void CompositionLocalProvider(androidx.compose.runtime.ProvidedValue<?>![] values, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> compositionLocalOf(optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy, kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+    method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> staticCompositionLocalOf(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+  }
+
+  public interface ControlledComposition extends androidx.compose.runtime.Composition {
+    method public void applyChanges();
+    method public void composeContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public boolean getHasPendingChanges();
+    method public void invalidateAll();
+    method public boolean isComposing();
+    method public boolean recompose();
+    method public void recordModificationsOf(java.util.Set<?> values);
+    method public void recordReadOf(Object value);
+    method public void recordWriteOf(Object value);
+    method @androidx.compose.runtime.InternalComposeApi public void verifyConsistent();
+    property public abstract boolean hasPendingChanges;
+    property public abstract boolean isComposing;
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface DisallowComposableCalls {
+  }
+
+  public interface DisposableEffectResult {
+    method public void dispose();
+  }
+
+  public final class DisposableEffectScope {
+    ctor public DisposableEffectScope();
+    method public inline androidx.compose.runtime.DisposableEffectResult onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDisposeEffect);
+  }
+
+  public final class EffectsKt {
+    method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object![]? keys, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @Deprecated @androidx.compose.runtime.Composable public static void LaunchedEffect(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object![]? keys, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void SideEffect(kotlin.jvm.functions.Function0<kotlin.Unit> effect);
+    method @androidx.compose.runtime.Composable public static inline kotlinx.coroutines.CoroutineScope rememberCoroutineScope(optional kotlin.jvm.functions.Function0<? extends kotlin.coroutines.CoroutineContext> getContext);
+  }
+
+  public final class ExpectKt {
+  }
+
+  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level, message="This is an experimental API for Compose and is likely to change before becoming " + "stable.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ExperimentalComposeApi {
+  }
+
+  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ExplicitGroupsComposable {
+  }
+
+  @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Immutable {
+  }
+
+  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level, message="This is internal API for Compose modules that may change frequently " + "and without warning.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface InternalComposeApi {
+  }
+
+  public interface MonotonicFrameClock extends kotlin.coroutines.CoroutineContext.Element {
+    method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+    field public static final androidx.compose.runtime.MonotonicFrameClock.Key Key;
+  }
+
+  public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.MonotonicFrameClock> {
+  }
+
+  public final class MonotonicFrameClockKt {
+    method public static androidx.compose.runtime.MonotonicFrameClock getMonotonicFrameClock(kotlin.coroutines.CoroutineContext);
+    method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  @androidx.compose.runtime.Stable public interface MutableState<T> extends androidx.compose.runtime.State<T> {
+    method public operator T! component1();
+    method public operator kotlin.jvm.functions.Function1<T,kotlin.Unit> component2();
+    method public void setValue(T! p);
+    property public abstract T! value;
+  }
+
+  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface NoLiveLiterals {
+  }
+
+  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface NonRestartableComposable {
+  }
+
+  public final class PausableMonotonicFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public PausableMonotonicFrameClock(androidx.compose.runtime.MonotonicFrameClock frameClock);
+    method public boolean isPaused();
+    method public void pause();
+    method public void resume();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final boolean isPaused;
+  }
+
+  public interface ProduceStateScope<T> extends androidx.compose.runtime.MutableState<T> kotlinx.coroutines.CoroutineScope {
+    method public suspend Object? awaitDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDispose, kotlin.coroutines.Continuation<?> p);
+  }
+
+  @androidx.compose.runtime.Stable public abstract class ProvidableCompositionLocal<T> extends androidx.compose.runtime.CompositionLocal<T> {
+    method public final infix androidx.compose.runtime.ProvidedValue<T> provides(T? value);
+    method public final infix androidx.compose.runtime.ProvidedValue<T> providesDefault(T? value);
+  }
+
+  public final class ProvidedValue<T> {
+    method public boolean getCanOverride();
+    method public androidx.compose.runtime.CompositionLocal<T> getCompositionLocal();
+    method public T! getValue();
+    property public final boolean canOverride;
+    property public final androidx.compose.runtime.CompositionLocal<T> compositionLocal;
+    property public final T! value;
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ReadOnlyComposable {
+  }
+
+  public interface RecomposeScope {
+    method public void invalidate();
+  }
+
+  public final class Recomposer extends androidx.compose.runtime.CompositionContext {
+    ctor public Recomposer(kotlin.coroutines.CoroutineContext effectCoroutineContext);
+    method public androidx.compose.runtime.RecomposerInfo asRecomposerInfo();
+    method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public void cancel();
+    method public void close();
+    method public long getChangeCount();
+    method public boolean getHasPendingWork();
+    method public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+    method public suspend Object? join(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method @androidx.compose.runtime.ExperimentalComposeApi public suspend Object? runRecomposeConcurrentlyAndApplyChanges(kotlin.coroutines.CoroutineContext recomposeCoroutineContext, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final long changeCount;
+    property public final boolean hasPendingWork;
+    property public final kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+    field public static final androidx.compose.runtime.Recomposer.Companion Companion;
+  }
+
+  public static final class Recomposer.Companion {
+    method public kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> getRunningRecomposers();
+    property public final kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> runningRecomposers;
+  }
+
+  public enum Recomposer.State {
+    enum_constant public static final androidx.compose.runtime.Recomposer.State Idle;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State Inactive;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State InactivePendingWork;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State PendingWork;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State ShutDown;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State ShuttingDown;
+  }
+
+  public interface RecomposerInfo {
+    method public long getChangeCount();
+    method public boolean getHasPendingWork();
+    method public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+    property public abstract long changeCount;
+    property public abstract boolean hasPendingWork;
+    property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+  }
+
+  public final class RecomposerKt {
+    method public static suspend <R> Object? withRunningRecomposer(kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.runtime.Recomposer,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  public interface RememberObserver {
+    method public void onAbandoned();
+    method public void onForgotten();
+    method public void onRemembered();
+  }
+
+  @androidx.compose.runtime.ComposeCompilerApi public interface ScopeUpdateScope {
+    method public void updateScope(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.Composer,? super java.lang.Integer,kotlin.Unit> block);
+  }
+
+  public final inline class SkippableUpdater<T> {
+    ctor public SkippableUpdater();
+    method public static androidx.compose.runtime.Composer! constructor-impl(androidx.compose.runtime.Composer composer);
+    method public static inline boolean equals-impl(androidx.compose.runtime.Composer! p, Object? p1);
+    method public static boolean equals-impl0(androidx.compose.runtime.Composer p1, androidx.compose.runtime.Composer p2);
+    method public static inline int hashCode-impl(androidx.compose.runtime.Composer! p);
+    method public static inline String! toString-impl(androidx.compose.runtime.Composer! p);
+    method public static inline void update-impl(androidx.compose.runtime.Composer $this, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
+  }
+
+  public final class SlotTableKt {
+  }
+
+  public interface SnapshotMutationPolicy<T> {
+    method public boolean equivalent(T? a, T? b);
+    method public default T? merge(T? previous, T? current, T? applied);
+  }
+
+  public final class SnapshotStateKt {
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+    method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+    method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+    method public static inline operator <T> T! getValue(androidx.compose.runtime.State<T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+    method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+    method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+    method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+    method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+    method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+    method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+    method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+    method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+    method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+    method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+    method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+  }
+
+  @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface Stable {
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface StableMarker {
+  }
+
+  @androidx.compose.runtime.Stable public interface State<T> {
+    method public T! getValue();
+    property public abstract T! value;
+  }
+
+  public final class TraceKt {
+  }
+
+  public final inline class Updater<T> {
+    ctor public Updater();
+    method public static androidx.compose.runtime.Composer! constructor-impl(androidx.compose.runtime.Composer composer);
+    method public static inline boolean equals-impl(androidx.compose.runtime.Composer! p, Object? p1);
+    method public static boolean equals-impl0(androidx.compose.runtime.Composer p1, androidx.compose.runtime.Composer p2);
+    method public static inline int hashCode-impl(androidx.compose.runtime.Composer! p);
+    method public static void init-impl(androidx.compose.runtime.Composer $this, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public static void reconcile-impl(androidx.compose.runtime.Composer $this, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public static inline void set-impl(androidx.compose.runtime.Composer $this, int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public static <V> void set-impl(androidx.compose.runtime.Composer? $this, V value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+    method public static inline String! toString-impl(androidx.compose.runtime.Composer! p);
+    method public static inline void update-impl(androidx.compose.runtime.Composer $this, int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public static <V> void update-impl(androidx.compose.runtime.Composer? $this, V value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+  }
+
+}
+
+package androidx.compose.runtime.collection {
+
+  public final class MutableVector<T> implements java.util.RandomAccess {
+    method public boolean add(T? element);
+    method public void add(int index, T? element);
+    method public boolean addAll(int index, java.util.List<? extends T> elements);
+    method public boolean addAll(int index, androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public inline boolean addAll(java.util.List<? extends T> elements);
+    method public inline boolean addAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public boolean addAll(T![] elements);
+    method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+    method public boolean addAll(java.util.Collection<? extends T> elements);
+    method public inline boolean any(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public java.util.List<T> asMutableList();
+    method public void clear();
+    method public operator boolean contains(T? element);
+    method public boolean containsAll(java.util.List<? extends T> elements);
+    method public boolean containsAll(java.util.Collection<? extends T> elements);
+    method public boolean containsAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public boolean contentEquals(androidx.compose.runtime.collection.MutableVector<T> other);
+    method public void ensureCapacity(int capacity);
+    method public T! first();
+    method public inline T! first(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline T? firstOrNull();
+    method public inline T? firstOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline <R> R! fold(R? initial, kotlin.jvm.functions.Function2<? super R,? super T,? extends R> operation);
+    method public inline <R> R! foldIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super R,? super T,? extends R> operation);
+    method public inline <R> R! foldRight(R? initial, kotlin.jvm.functions.Function2<? super T,? super R,? extends R> operation);
+    method public inline <R> R! foldRightIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super T,? super R,? extends R> operation);
+    method public inline void forEach(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public inline void forEachIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+    method public inline void forEachReversed(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public inline void forEachReversedIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+    method public inline operator T! get(int index);
+    method public inline kotlin.ranges.IntRange getIndices();
+    method public inline int getLastIndex();
+    method public int getSize();
+    method public int indexOf(T? element);
+    method public inline int indexOfFirst(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline int indexOfLast(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public boolean isEmpty();
+    method public boolean isNotEmpty();
+    method public T! last();
+    method public inline T! last(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public int lastIndexOf(T? element);
+    method public inline T? lastOrNull();
+    method public inline T? lastOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline <reified R> R![]! map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public inline <reified R> R![]! mapIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+    method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapIndexedNotNull(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+    method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapNotNull(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public inline operator void minusAssign(T? element);
+    method public inline operator void plusAssign(T? element);
+    method public boolean remove(T? element);
+    method public boolean removeAll(java.util.List<? extends T> elements);
+    method public boolean removeAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public boolean removeAll(java.util.Collection<? extends T> elements);
+    method public T! removeAt(int index);
+    method public void removeRange(int start, int end);
+    method public boolean retainAll(java.util.Collection<? extends T> elements);
+    method public inline boolean reversedAny(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public operator T! set(int index, T? element);
+    method public void sortWith(java.util.Comparator<T> comparator);
+    method public inline int sumBy(kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+    property public final inline kotlin.ranges.IntRange indices;
+    property public final inline int lastIndex;
+    property public final int size;
+  }
+
+  public final class MutableVectorKt {
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(optional int capacity);
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(int size, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends T> init);
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf();
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf(T? elements);
+  }
+
+}
+
+package androidx.compose.runtime.internal {
+
+  @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambda extends kotlin.jvm.functions.Function2<androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function10<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function11<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function13<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function14<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function15<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function16<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function17<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function18<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function19<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function20<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function21<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function3<java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function4<java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function5<java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function6<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function7<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function8<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function9<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> {
+  }
+
+  public final class ComposableLambdaKt {
+    method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambda composableLambda(androidx.compose.runtime.Composer composer, int key, boolean tracked, String? sourceInformation, Object block);
+    method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambda composableLambdaInstance(int key, boolean tracked, String? sourceInformation, Object block);
+  }
+
+  @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambdaN extends kotlin.jvm.functions.FunctionN<java.lang.Object> {
+  }
+
+  public final class ComposableLambdaN_jvmKt {
+    method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambdaN composableLambdaN(androidx.compose.runtime.Composer composer, int key, boolean tracked, String? sourceInformation, int arity, Object block);
+    method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambdaN composableLambdaNInstance(int key, boolean tracked, String? sourceInformation, int arity, Object block);
+  }
+
+  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface LiveLiteralFileInfo {
+    method public abstract String file();
+    property public abstract String file;
+  }
+
+  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface LiveLiteralInfo {
+    method public abstract String key();
+    method public abstract int offset();
+    property public abstract String key;
+    property public abstract int offset;
+  }
+
+  public final class LiveLiteralKt {
+    method @androidx.compose.runtime.InternalComposeApi public static void enableLiveLiterals();
+    method public static boolean isLiveLiteralsEnabled();
+    method @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.InternalComposeApi public static <T> androidx.compose.runtime.State<T> liveLiteral(String key, T? value);
+    method @androidx.compose.runtime.InternalComposeApi public static void updateLiveLiteralValue(String key, Object? value);
+  }
+
+  @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface StabilityInferred {
+    method public abstract int parameters();
+    property public abstract int parameters;
+  }
+
+  public final class ThreadMapKt {
+  }
+
+}
+
+package androidx.compose.runtime.snapshots {
+
+  public final class ListUtilsKt {
+  }
+
+  public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
+    method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
+    method public void close$metalava_module();
+    method public java.util.Set<androidx.compose.runtime.snapshots.StateObject>? getModified$metalava_module();
+    method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver$metalava_module();
+    method public boolean getReadOnly();
+    method public androidx.compose.runtime.snapshots.Snapshot getRoot();
+    method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getWriteObserver$metalava_module();
+    method public boolean hasPendingChanges();
+    method public void nestedActivated$metalava_module(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public void nestedDeactivated$metalava_module(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public void notifyObjectsInitialized$metalava_module();
+    method public void recordModified$metalava_module(androidx.compose.runtime.snapshots.StateObject state);
+    method public void setModified(java.util.Set<androidx.compose.runtime.snapshots.StateObject>? p);
+    method public androidx.compose.runtime.snapshots.MutableSnapshot takeNestedMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+    method public androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+    property public java.util.Set<androidx.compose.runtime.snapshots.StateObject>? modified;
+    property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver;
+    property public boolean readOnly;
+    property public androidx.compose.runtime.snapshots.Snapshot root;
+    property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver;
+  }
+
+  public fun interface ObserverHandle {
+    method public void dispose();
+  }
+
+  public abstract sealed class Snapshot {
+    method public void dispose();
+    method public final inline <T> T! enter(kotlin.jvm.functions.Function0<? extends T> block);
+    method public int getId();
+    method public abstract boolean getReadOnly();
+    method public abstract androidx.compose.runtime.snapshots.Snapshot getRoot();
+    method public abstract boolean hasPendingChanges();
+    method public abstract androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+    property public int id;
+    property public abstract boolean readOnly;
+    property public abstract androidx.compose.runtime.snapshots.Snapshot root;
+    field public static final androidx.compose.runtime.snapshots.Snapshot.Companion Companion;
+  }
+
+  public static final class Snapshot.Companion {
+    method public androidx.compose.runtime.snapshots.Snapshot! getCurrent();
+    method public inline <T> T! global(kotlin.jvm.functions.Function0<? extends T> block);
+    method public void notifyObjectsInitialized();
+    method public <T> T! observe(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver, kotlin.jvm.functions.Function0<? extends T> block);
+    method @androidx.compose.runtime.InternalComposeApi public int openSnapshotCount();
+    method public androidx.compose.runtime.snapshots.ObserverHandle registerApplyObserver(kotlin.jvm.functions.Function2<? super java.util.Set<?>,? super androidx.compose.runtime.snapshots.Snapshot,kotlin.Unit> observer);
+    method public androidx.compose.runtime.snapshots.ObserverHandle registerGlobalWriteObserver(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit> observer);
+    method public void sendApplyNotifications();
+    method public androidx.compose.runtime.snapshots.MutableSnapshot takeMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+    method public androidx.compose.runtime.snapshots.Snapshot takeSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+    method public inline <R> R! withMutableSnapshot(kotlin.jvm.functions.Function0<? extends R> block);
+    property public final androidx.compose.runtime.snapshots.Snapshot! current;
+  }
+
+  public final class SnapshotApplyConflictException extends java.lang.Exception {
+    ctor public SnapshotApplyConflictException(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+    property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+  }
+
+  public abstract sealed class SnapshotApplyResult {
+    method public abstract void check();
+    method public abstract boolean getSucceeded();
+    property public abstract boolean succeeded;
+  }
+
+  public static final class SnapshotApplyResult.Failure extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+    ctor public SnapshotApplyResult.Failure(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public void check();
+    method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+    method public boolean getSucceeded();
+    property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+    property public boolean succeeded;
+  }
+
+  public static final class SnapshotApplyResult.Success extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+    method public void check();
+    method public boolean getSucceeded();
+    property public boolean succeeded;
+    field public static final androidx.compose.runtime.snapshots.SnapshotApplyResult.Success INSTANCE;
+  }
+
+  public final class SnapshotIdSetKt {
+  }
+
+  public final class SnapshotKt {
+    method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state);
+    method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! withCurrent(T, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+    method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+    method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+  }
+
+  public interface SnapshotMutableState<T> extends androidx.compose.runtime.MutableState<T> {
+    method public androidx.compose.runtime.SnapshotMutationPolicy<T> getPolicy();
+    property public abstract androidx.compose.runtime.SnapshotMutationPolicy<T> policy;
+  }
+
+  @androidx.compose.runtime.Stable public final class SnapshotStateList<T> implements kotlin.jvm.internal.markers.KMutableList java.util.List<T> androidx.compose.runtime.snapshots.StateObject {
+    ctor public SnapshotStateList();
+    method public boolean add(T? element);
+    method public void add(int index, T? element);
+    method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+    method public boolean addAll(java.util.Collection<? extends T> elements);
+    method public void clear();
+    method public boolean contains(Object? element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public T! get(int index);
+    method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+    method public int getSize();
+    method public int indexOf(Object? element);
+    method public boolean isEmpty();
+    method public java.util.Iterator<T> iterator();
+    method public int lastIndexOf(Object? element);
+    method public java.util.ListIterator<T> listIterator();
+    method public java.util.ListIterator<T> listIterator(int index);
+    method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+    method public boolean remove(Object? element);
+    method public boolean removeAll(java.util.Collection<?> elements);
+    method public T! removeAt(int index);
+    method public void removeRange(int fromIndex, int toIndex);
+    method public boolean retainAll(java.util.Collection<?> elements);
+    method public T! set(int index, T? element);
+    method public java.util.List<T> subList(int fromIndex, int toIndex);
+    property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+    property public int size;
+  }
+
+  public final class SnapshotStateListKt {
+  }
+
+  @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
+    ctor public SnapshotStateMap();
+    method public void clear();
+    method public boolean containsKey(Object? key);
+    method public boolean containsValue(Object? value);
+    method public V? get(Object? key);
+    method public java.util.Set<java.util.Map.Entry<K,V>> getEntries();
+    method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+    method public java.util.Set<K> getKeys();
+    method public int getSize();
+    method public java.util.Collection<V> getValues();
+    method public boolean isEmpty();
+    method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+    method public V? put(K? key, V? value);
+    method public void putAll(java.util.Map<? extends K,? extends V> from);
+    method public V? remove(Object? key);
+    property public java.util.Set<java.util.Map.Entry<K,V>> entries;
+    property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+    property public java.util.Set<K> keys;
+    property public int size;
+    property public java.util.Collection<V> values;
+  }
+
+  public final class SnapshotStateMapKt {
+  }
+
+  public final class SnapshotStateObserver {
+    ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
+    method public void clear(Object scope);
+    method public void clear();
+    method public void clearIf(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+    method @org.jetbrains.annotations.TestOnly public void notifyChanges(java.util.Set<?> changes, androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public <T> void observeReads(T scope, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onValueChangedForScope, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void start();
+    method public void stop();
+    method public void withNoObservations(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public interface StateObject {
+    method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+    method public default androidx.compose.runtime.snapshots.StateRecord? mergeRecords(androidx.compose.runtime.snapshots.StateRecord previous, androidx.compose.runtime.snapshots.StateRecord current, androidx.compose.runtime.snapshots.StateRecord applied);
+    method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+    property public abstract androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+  }
+
+  public abstract class StateRecord {
+    ctor public StateRecord();
+    method public abstract void assign(androidx.compose.runtime.snapshots.StateRecord value);
+    method public abstract androidx.compose.runtime.snapshots.StateRecord create();
+  }
+
+}
+
+package androidx.compose.runtime.tooling {
+
+  public interface CompositionData {
+    method public Iterable<androidx.compose.runtime.tooling.CompositionGroup> getCompositionGroups();
+    method public boolean isEmpty();
+    property public abstract Iterable<androidx.compose.runtime.tooling.CompositionGroup> compositionGroups;
+    property public abstract boolean isEmpty;
+  }
+
+  public interface CompositionGroup extends androidx.compose.runtime.tooling.CompositionData {
+    method public Iterable<java.lang.Object> getData();
+    method public Object getKey();
+    method public Object? getNode();
+    method public String? getSourceInfo();
+    property public abstract Iterable<java.lang.Object> data;
+    property public abstract Object key;
+    property public abstract Object? node;
+    property public abstract String? sourceInfo;
+  }
+
+  public final class InspectionTablesKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<java.util.Set<androidx.compose.runtime.tooling.CompositionData>> getLocalInspectionTables();
+  }
+
+}
+

compose/runtime/runtime/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/runtime/runtime/api/res-1.0.0-beta04.txt
similarity index 100%
rename from ipc/ipc-runtime/api/res-current.txt
rename to compose/runtime/runtime/api/res-1.0.0-beta04.txt

compose/runtime/runtime/api/restricted_1.0.0-beta04.txt

diff --git a/compose/runtime/runtime/api/restricted_1.0.0-beta04.txt b/compose/runtime/runtime/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..552fff5
--- /dev/null
+++ b/compose/runtime/runtime/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,717 @@
+// Signature format: 4.0
+package androidx.compose.runtime {
+
+  public abstract class AbstractApplier<T> implements androidx.compose.runtime.Applier<T> {
+    ctor public AbstractApplier(T? root);
+    method public final void clear();
+    method public void down(T? node);
+    method public T! getCurrent();
+    method public final T! getRoot();
+    method protected final void move(java.util.List<T>, int from, int to, int count);
+    method protected abstract void onClear();
+    method protected final void remove(java.util.List<T>, int index, int count);
+    method protected void setCurrent(T! p);
+    method public void up();
+    property public T! current;
+    property public final T! root;
+  }
+
+  public final class ActualAndroid_androidKt {
+    method @Deprecated public static androidx.compose.runtime.MonotonicFrameClock getDefaultMonotonicFrameClock();
+  }
+
+  public final class ActualJvm_jvmKt {
+    method @kotlin.PublishedApi internal static inline <R> R! synchronized(Object lock, kotlin.jvm.functions.Function0<? extends R> block);
+  }
+
+  public interface Applier<N> {
+    method public void clear();
+    method public void down(N? node);
+    method public N! getCurrent();
+    method public void insertBottomUp(int index, N? instance);
+    method public void insertTopDown(int index, N? instance);
+    method public void move(int from, int to, int count);
+    method public default void onBeginChanges();
+    method public default void onEndChanges();
+    method public void remove(int index, int count);
+    method public void up();
+    property public abstract N! current;
+  }
+
+  public final class BitwiseOperatorsKt {
+  }
+
+  public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
+    method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
+    method public boolean getHasAwaiters();
+    method public void sendFrame(long timeNanos);
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final boolean hasAwaiters;
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface Composable {
+  }
+
+  public final class ComposablesKt {
+    method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update);
+    method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline <T, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.SkippableUpdater<T>,? extends kotlin.Unit> skippableUpdate, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.Composer getCurrentComposer();
+    method @androidx.compose.runtime.Composable public static int getCurrentCompositeKeyHash();
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.RecomposeScope getCurrentRecomposeScope();
+    method @kotlin.PublishedApi internal static void invalidApplier();
+    method @androidx.compose.runtime.Composable public static inline <T> T! key(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> block);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.CompositionContext rememberCompositionContext();
+  }
+
+  public interface Composer {
+    method public androidx.compose.runtime.Applier<?> getApplier();
+    method @org.jetbrains.annotations.TestOnly public kotlin.coroutines.CoroutineContext getApplyCoroutineContext();
+    method @org.jetbrains.annotations.TestOnly public androidx.compose.runtime.ControlledComposition getComposition();
+    method public androidx.compose.runtime.tooling.CompositionData getCompositionData();
+    method public int getCompoundKeyHash();
+    method public boolean getDefaultsInvalid();
+    method public boolean getInserting();
+    method public androidx.compose.runtime.RecomposeScope? getRecomposeScope();
+    method public boolean getSkipping();
+    property public abstract androidx.compose.runtime.Applier<?> applier;
+    property @org.jetbrains.annotations.TestOnly public abstract kotlin.coroutines.CoroutineContext applyCoroutineContext;
+    property @org.jetbrains.annotations.TestOnly public abstract androidx.compose.runtime.ControlledComposition composition;
+    property public abstract androidx.compose.runtime.tooling.CompositionData compositionData;
+    property public abstract int compoundKeyHash;
+    property public abstract boolean defaultsInvalid;
+    property public abstract boolean inserting;
+    property public abstract androidx.compose.runtime.RecomposeScope? recomposeScope;
+    property public abstract boolean skipping;
+    field public static final androidx.compose.runtime.Composer.Companion Companion;
+  }
+
+  public static final class Composer.Companion {
+    method public Object getEmpty();
+    property public final Object Empty;
+  }
+
+  public final class ComposerKt {
+    field @kotlin.PublishedApi internal static final Object compositionLocalMap;
+    field @kotlin.PublishedApi internal static final int compositionLocalMapKey = 202; // 0xca
+    field @kotlin.PublishedApi internal static final Object invocation;
+    field @kotlin.PublishedApi internal static final int invocationKey = 200; // 0xc8
+    field @kotlin.PublishedApi internal static final Object provider;
+    field @kotlin.PublishedApi internal static final int providerKey = 201; // 0xc9
+    field @kotlin.PublishedApi internal static final Object providerMaps;
+    field @kotlin.PublishedApi internal static final int providerMapsKey = 204; // 0xcc
+    field @kotlin.PublishedApi internal static final Object providerValues;
+    field @kotlin.PublishedApi internal static final int providerValuesKey = 203; // 0xcb
+    field @kotlin.PublishedApi internal static final Object reference;
+    field @kotlin.PublishedApi internal static final int referenceKey = 206; // 0xce
+  }
+
+  public interface Composition {
+    method public void dispose();
+    method public boolean getHasInvalidations();
+    method public boolean isDisposed();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    property public abstract boolean hasInvalidations;
+    property public abstract boolean isDisposed;
+  }
+
+  public abstract class CompositionContext {
+  }
+
+  public final class CompositionContextKt {
+  }
+
+  public final class CompositionKt {
+    method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+    method @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+  }
+
+  @androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
+  }
+
+  public final class CompositionLocalKt {
+    method @androidx.compose.runtime.Composable public static void CompositionLocalProvider(androidx.compose.runtime.ProvidedValue<?>![] values, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> compositionLocalOf(optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy, kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+    method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> staticCompositionLocalOf(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+  }
+
+  @kotlin.PublishedApi internal final class CompositionScopedCoroutineScopeCanceller implements androidx.compose.runtime.RememberObserver {
+    ctor public CompositionScopedCoroutineScopeCanceller(kotlinx.coroutines.CoroutineScope coroutineScope);
+    method public kotlinx.coroutines.CoroutineScope getCoroutineScope();
+    method public void onAbandoned();
+    method public void onForgotten();
+    method public void onRemembered();
+    property public final kotlinx.coroutines.CoroutineScope coroutineScope;
+  }
+
+  public interface ControlledComposition extends androidx.compose.runtime.Composition {
+    method public void applyChanges();
+    method public void composeContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public boolean getHasPendingChanges();
+    method public void invalidateAll();
+    method public boolean isComposing();
+    method public boolean recompose();
+    method public void recordModificationsOf(java.util.Set<?> values);
+    method public void recordReadOf(Object value);
+    method public void recordWriteOf(Object value);
+    property public abstract boolean hasPendingChanges;
+    property public abstract boolean isComposing;
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface DisallowComposableCalls {
+  }
+
+  public interface DisposableEffectResult {
+    method public void dispose();
+  }
+
+  public final class DisposableEffectScope {
+    ctor public DisposableEffectScope();
+    method public inline androidx.compose.runtime.DisposableEffectResult onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDisposeEffect);
+  }
+
+  public final class EffectsKt {
+    method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object![]? keys, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+    method @Deprecated @androidx.compose.runtime.Composable public static void LaunchedEffect(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object![]? keys, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void SideEffect(kotlin.jvm.functions.Function0<kotlin.Unit> effect);
+    method @kotlin.PublishedApi internal static kotlinx.coroutines.CoroutineScope createCompositionCoroutineScope(kotlin.coroutines.CoroutineContext coroutineContext, androidx.compose.runtime.Composer composer);
+    method @androidx.compose.runtime.Composable public static inline kotlinx.coroutines.CoroutineScope rememberCoroutineScope(optional kotlin.jvm.functions.Function0<? extends kotlin.coroutines.CoroutineContext> getContext);
+  }
+
+  public final class ExpectKt {
+    method @kotlin.PublishedApi internal static inline <R> R! synchronized(Object lock, kotlin.jvm.functions.Function0<? extends R> block);
+  }
+
+  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ExplicitGroupsComposable {
+  }
+
+  @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Immutable {
+  }
+
+  public interface MonotonicFrameClock extends kotlin.coroutines.CoroutineContext.Element {
+    method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+    field public static final androidx.compose.runtime.MonotonicFrameClock.Key Key;
+  }
+
+  public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.MonotonicFrameClock> {
+  }
+
+  public final class MonotonicFrameClockKt {
+    method public static androidx.compose.runtime.MonotonicFrameClock getMonotonicFrameClock(kotlin.coroutines.CoroutineContext);
+    method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  @androidx.compose.runtime.Stable public interface MutableState<T> extends androidx.compose.runtime.State<T> {
+    method public operator T! component1();
+    method public operator kotlin.jvm.functions.Function1<T,kotlin.Unit> component2();
+    method public void setValue(T! p);
+    property public abstract T! value;
+  }
+
+  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface NoLiveLiterals {
+  }
+
+  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface NonRestartableComposable {
+  }
+
+  public final class PausableMonotonicFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public PausableMonotonicFrameClock(androidx.compose.runtime.MonotonicFrameClock frameClock);
+    method public boolean isPaused();
+    method public void pause();
+    method public void resume();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final boolean isPaused;
+  }
+
+  public interface ProduceStateScope<T> extends androidx.compose.runtime.MutableState<T> kotlinx.coroutines.CoroutineScope {
+    method public suspend Object? awaitDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDispose, kotlin.coroutines.Continuation<?> p);
+  }
+
+  @androidx.compose.runtime.Stable public abstract class ProvidableCompositionLocal<T> extends androidx.compose.runtime.CompositionLocal<T> {
+    method public final infix androidx.compose.runtime.ProvidedValue<T> provides(T? value);
+    method public final infix androidx.compose.runtime.ProvidedValue<T> providesDefault(T? value);
+  }
+
+  public final class ProvidedValue<T> {
+    method public boolean getCanOverride();
+    method public androidx.compose.runtime.CompositionLocal<T> getCompositionLocal();
+    method public T! getValue();
+    property public final boolean canOverride;
+    property public final androidx.compose.runtime.CompositionLocal<T> compositionLocal;
+    property public final T! value;
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ReadOnlyComposable {
+  }
+
+  public interface RecomposeScope {
+    method public void invalidate();
+  }
+
+  public final class Recomposer extends androidx.compose.runtime.CompositionContext {
+    ctor public Recomposer(kotlin.coroutines.CoroutineContext effectCoroutineContext);
+    method public androidx.compose.runtime.RecomposerInfo asRecomposerInfo();
+    method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public void cancel();
+    method public void close();
+    method public long getChangeCount();
+    method public boolean getHasPendingWork();
+    method public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+    method public suspend Object? join(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    property public final long changeCount;
+    property public final boolean hasPendingWork;
+    property public final kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+    field public static final androidx.compose.runtime.Recomposer.Companion Companion;
+  }
+
+  public static final class Recomposer.Companion {
+    method public kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> getRunningRecomposers();
+    property public final kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> runningRecomposers;
+  }
+
+  public enum Recomposer.State {
+    enum_constant public static final androidx.compose.runtime.Recomposer.State Idle;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State Inactive;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State InactivePendingWork;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State PendingWork;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State ShutDown;
+    enum_constant public static final androidx.compose.runtime.Recomposer.State ShuttingDown;
+  }
+
+  public interface RecomposerInfo {
+    method public long getChangeCount();
+    method public boolean getHasPendingWork();
+    method public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+    property public abstract long changeCount;
+    property public abstract boolean hasPendingWork;
+    property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+  }
+
+  public final class RecomposerKt {
+    method public static suspend <R> Object? withRunningRecomposer(kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.runtime.Recomposer,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+  }
+
+  public interface RememberObserver {
+    method public void onAbandoned();
+    method public void onForgotten();
+    method public void onRemembered();
+  }
+
+  public final inline class SkippableUpdater<T> {
+    ctor public SkippableUpdater();
+    method public static androidx.compose.runtime.Composer! constructor-impl(androidx.compose.runtime.Composer composer);
+    method public static inline boolean equals-impl(androidx.compose.runtime.Composer! p, Object? p1);
+    method public static boolean equals-impl0(androidx.compose.runtime.Composer p1, androidx.compose.runtime.Composer p2);
+    method public static inline int hashCode-impl(androidx.compose.runtime.Composer! p);
+    method public static inline String! toString-impl(androidx.compose.runtime.Composer! p);
+    method public static inline void update-impl(androidx.compose.runtime.Composer $this, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
+  }
+
+  public final class SlotTableKt {
+  }
+
+  public interface SnapshotMutationPolicy<T> {
+    method public boolean equivalent(T? a, T? b);
+    method public default T? merge(T? previous, T? current, T? applied);
+  }
+
+  public final class SnapshotStateKt {
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+    method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+    method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+    method public static inline operator <T> T! getValue(androidx.compose.runtime.State<T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+    method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+    method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+    method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+    method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+    method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+    method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+    method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+    method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+    method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+    method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+    method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+    method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+  }
+
+  @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface Stable {
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface StableMarker {
+  }
+
+  @androidx.compose.runtime.Stable public interface State<T> {
+    method public T! getValue();
+    property public abstract T! value;
+  }
+
+  public final class TraceKt {
+  }
+
+  public final inline class Updater<T> {
+    ctor public Updater();
+    method public static androidx.compose.runtime.Composer! constructor-impl(androidx.compose.runtime.Composer composer);
+    method public static inline boolean equals-impl(androidx.compose.runtime.Composer! p, Object? p1);
+    method public static boolean equals-impl0(androidx.compose.runtime.Composer p1, androidx.compose.runtime.Composer p2);
+    method public static inline int hashCode-impl(androidx.compose.runtime.Composer! p);
+    method public static void init-impl(androidx.compose.runtime.Composer $this, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public static void reconcile-impl(androidx.compose.runtime.Composer $this, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public static inline void set-impl(androidx.compose.runtime.Composer $this, int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public static <V> void set-impl(androidx.compose.runtime.Composer? $this, V value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+    method public static inline String! toString-impl(androidx.compose.runtime.Composer! p);
+    method public static inline void update-impl(androidx.compose.runtime.Composer $this, int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public static <V> void update-impl(androidx.compose.runtime.Composer? $this, V value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+  }
+
+}
+
+package androidx.compose.runtime.collection {
+
+  public final class MutableVector<T> implements java.util.RandomAccess {
+    ctor @kotlin.PublishedApi internal MutableVector(@kotlin.PublishedApi T![] content, int size);
+    method public boolean add(T? element);
+    method public void add(int index, T? element);
+    method public boolean addAll(int index, java.util.List<? extends T> elements);
+    method public boolean addAll(int index, androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public inline boolean addAll(java.util.List<? extends T> elements);
+    method public inline boolean addAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public boolean addAll(T![] elements);
+    method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+    method public boolean addAll(java.util.Collection<? extends T> elements);
+    method public inline boolean any(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public java.util.List<T> asMutableList();
+    method public void clear();
+    method public operator boolean contains(T? element);
+    method public boolean containsAll(java.util.List<? extends T> elements);
+    method public boolean containsAll(java.util.Collection<? extends T> elements);
+    method public boolean containsAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public boolean contentEquals(androidx.compose.runtime.collection.MutableVector<T> other);
+    method public void ensureCapacity(int capacity);
+    method public T! first();
+    method public inline T! first(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline T? firstOrNull();
+    method public inline T? firstOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline <R> R! fold(R? initial, kotlin.jvm.functions.Function2<? super R,? super T,? extends R> operation);
+    method public inline <R> R! foldIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super R,? super T,? extends R> operation);
+    method public inline <R> R! foldRight(R? initial, kotlin.jvm.functions.Function2<? super T,? super R,? extends R> operation);
+    method public inline <R> R! foldRightIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super T,? super R,? extends R> operation);
+    method public inline void forEach(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public inline void forEachIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+    method public inline void forEachReversed(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public inline void forEachReversedIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+    method public inline operator T! get(int index);
+    method public inline kotlin.ranges.IntRange getIndices();
+    method public inline int getLastIndex();
+    method public int getSize();
+    method public int indexOf(T? element);
+    method public inline int indexOfFirst(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline int indexOfLast(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public boolean isEmpty();
+    method public boolean isNotEmpty();
+    method public T! last();
+    method public inline T! last(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public int lastIndexOf(T? element);
+    method public inline T? lastOrNull();
+    method public inline T? lastOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public inline <reified R> R![]! map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public inline <reified R> R![]! mapIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+    method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapIndexedNotNull(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+    method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapNotNull(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public inline operator void minusAssign(T? element);
+    method public inline operator void plusAssign(T? element);
+    method public boolean remove(T? element);
+    method public boolean removeAll(java.util.List<? extends T> elements);
+    method public boolean removeAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+    method public boolean removeAll(java.util.Collection<? extends T> elements);
+    method public T! removeAt(int index);
+    method public void removeRange(int start, int end);
+    method public boolean retainAll(java.util.Collection<? extends T> elements);
+    method public inline boolean reversedAny(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public operator T! set(int index, T? element);
+    method public void sortWith(java.util.Comparator<T> comparator);
+    method public inline int sumBy(kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+    method @kotlin.PublishedApi internal Void throwNoSuchElementException();
+    property public final inline kotlin.ranges.IntRange indices;
+    property public final inline int lastIndex;
+    property public final int size;
+  }
+
+  public final class MutableVectorKt {
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(optional int capacity);
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(int size, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends T> init);
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf();
+    method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf(T? elements);
+  }
+
+}
+
+package androidx.compose.runtime.internal {
+
+  public final class ComposableLambdaKt {
+  }
+
+  public final class ComposableLambdaN_jvmKt {
+  }
+
+  public final class LiveLiteralKt {
+    method public static boolean isLiveLiteralsEnabled();
+  }
+
+  public final class ThreadMapKt {
+  }
+
+}
+
+package androidx.compose.runtime.snapshots {
+
+  public final class ListUtilsKt {
+  }
+
+  public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
+    method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
+    method public void close$metalava_module();
+    method public java.util.Set<androidx.compose.runtime.snapshots.StateObject>? getModified$metalava_module();
+    method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver$metalava_module();
+    method public boolean getReadOnly();
+    method public androidx.compose.runtime.snapshots.Snapshot getRoot();
+    method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getWriteObserver$metalava_module();
+    method public boolean hasPendingChanges();
+    method public void nestedActivated$metalava_module(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public void nestedDeactivated$metalava_module(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public void notifyObjectsInitialized$metalava_module();
+    method public void recordModified$metalava_module(androidx.compose.runtime.snapshots.StateObject state);
+    method public void setModified(java.util.Set<androidx.compose.runtime.snapshots.StateObject>? p);
+    method public androidx.compose.runtime.snapshots.MutableSnapshot takeNestedMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+    method public androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+    property public java.util.Set<androidx.compose.runtime.snapshots.StateObject>? modified;
+    property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver;
+    property public boolean readOnly;
+    property public androidx.compose.runtime.snapshots.Snapshot root;
+    property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver;
+  }
+
+  public fun interface ObserverHandle {
+    method public void dispose();
+  }
+
+  public abstract sealed class Snapshot {
+    method public void dispose();
+    method public final inline <T> T! enter(kotlin.jvm.functions.Function0<? extends T> block);
+    method public int getId();
+    method public abstract boolean getReadOnly();
+    method public abstract androidx.compose.runtime.snapshots.Snapshot getRoot();
+    method public abstract boolean hasPendingChanges();
+    method @kotlin.PublishedApi internal androidx.compose.runtime.snapshots.Snapshot? makeCurrent();
+    method @kotlin.PublishedApi internal void restoreCurrent(androidx.compose.runtime.snapshots.Snapshot? snapshot);
+    method public abstract androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+    property public int id;
+    property public abstract boolean readOnly;
+    property public abstract androidx.compose.runtime.snapshots.Snapshot root;
+    field public static final androidx.compose.runtime.snapshots.Snapshot.Companion Companion;
+  }
+
+  public static final class Snapshot.Companion {
+    method public androidx.compose.runtime.snapshots.Snapshot! getCurrent();
+    method public inline <T> T! global(kotlin.jvm.functions.Function0<? extends T> block);
+    method public void notifyObjectsInitialized();
+    method public <T> T! observe(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver, kotlin.jvm.functions.Function0<? extends T> block);
+    method public androidx.compose.runtime.snapshots.ObserverHandle registerApplyObserver(kotlin.jvm.functions.Function2<? super java.util.Set<?>,? super androidx.compose.runtime.snapshots.Snapshot,kotlin.Unit> observer);
+    method public androidx.compose.runtime.snapshots.ObserverHandle registerGlobalWriteObserver(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit> observer);
+    method @kotlin.PublishedApi internal androidx.compose.runtime.snapshots.Snapshot? removeCurrent();
+    method @kotlin.PublishedApi internal void restoreCurrent(androidx.compose.runtime.snapshots.Snapshot? previous);
+    method public void sendApplyNotifications();
+    method public androidx.compose.runtime.snapshots.MutableSnapshot takeMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+    method public androidx.compose.runtime.snapshots.Snapshot takeSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+    method public inline <R> R! withMutableSnapshot(kotlin.jvm.functions.Function0<? extends R> block);
+    property public final androidx.compose.runtime.snapshots.Snapshot! current;
+  }
+
+  public final class SnapshotApplyConflictException extends java.lang.Exception {
+    ctor public SnapshotApplyConflictException(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+    property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+  }
+
+  public abstract sealed class SnapshotApplyResult {
+    method public abstract void check();
+    method public abstract boolean getSucceeded();
+    property public abstract boolean succeeded;
+  }
+
+  public static final class SnapshotApplyResult.Failure extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+    ctor public SnapshotApplyResult.Failure(androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public void check();
+    method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+    method public boolean getSucceeded();
+    property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+    property public boolean succeeded;
+  }
+
+  public static final class SnapshotApplyResult.Success extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+    method public void check();
+    method public boolean getSucceeded();
+    property public boolean succeeded;
+    field public static final androidx.compose.runtime.snapshots.SnapshotApplyResult.Success INSTANCE;
+  }
+
+  public final class SnapshotIdSetKt {
+  }
+
+  public final class SnapshotKt {
+    method @kotlin.PublishedApi internal static <T extends androidx.compose.runtime.snapshots.StateRecord> T current(T r, androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method @kotlin.PublishedApi internal static void notifyWrite(androidx.compose.runtime.snapshots.Snapshot snapshot, androidx.compose.runtime.snapshots.StateObject state);
+    method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state);
+    method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method @kotlin.PublishedApi internal static inline <T> T! sync(kotlin.jvm.functions.Function0<? extends T> block);
+    method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! withCurrent(T, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+    method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+    method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+    method @kotlin.PublishedApi internal static <T extends androidx.compose.runtime.snapshots.StateRecord> T writableRecord(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
+    field @kotlin.PublishedApi internal static final Object lock;
+    field @kotlin.PublishedApi internal static final androidx.compose.runtime.snapshots.Snapshot snapshotInitializer;
+  }
+
+  public interface SnapshotMutableState<T> extends androidx.compose.runtime.MutableState<T> {
+    method public androidx.compose.runtime.SnapshotMutationPolicy<T> getPolicy();
+    property public abstract androidx.compose.runtime.SnapshotMutationPolicy<T> policy;
+  }
+
+  @androidx.compose.runtime.Stable public final class SnapshotStateList<T> implements kotlin.jvm.internal.markers.KMutableList java.util.List<T> androidx.compose.runtime.snapshots.StateObject {
+    ctor public SnapshotStateList();
+    method public boolean add(T? element);
+    method public void add(int index, T? element);
+    method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+    method public boolean addAll(java.util.Collection<? extends T> elements);
+    method public void clear();
+    method public boolean contains(Object? element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public T! get(int index);
+    method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+    method public int getSize();
+    method public int indexOf(Object? element);
+    method public boolean isEmpty();
+    method public java.util.Iterator<T> iterator();
+    method public int lastIndexOf(Object? element);
+    method public java.util.ListIterator<T> listIterator();
+    method public java.util.ListIterator<T> listIterator(int index);
+    method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+    method public boolean remove(Object? element);
+    method public boolean removeAll(java.util.Collection<?> elements);
+    method public T! removeAt(int index);
+    method public void removeRange(int fromIndex, int toIndex);
+    method public boolean retainAll(java.util.Collection<?> elements);
+    method public T! set(int index, T? element);
+    method public java.util.List<T> subList(int fromIndex, int toIndex);
+    property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+    property public int size;
+  }
+
+  public final class SnapshotStateListKt {
+  }
+
+  @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
+    ctor public SnapshotStateMap();
+    method public void clear();
+    method public boolean containsKey(Object? key);
+    method public boolean containsValue(Object? value);
+    method public V? get(Object? key);
+    method public java.util.Set<java.util.Map.Entry<K,V>> getEntries();
+    method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+    method public java.util.Set<K> getKeys();
+    method public int getSize();
+    method public java.util.Collection<V> getValues();
+    method public boolean isEmpty();
+    method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+    method public V? put(K? key, V? value);
+    method public void putAll(java.util.Map<? extends K,? extends V> from);
+    method public V? remove(Object? key);
+    property public java.util.Set<java.util.Map.Entry<K,V>> entries;
+    property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+    property public java.util.Set<K> keys;
+    property public int size;
+    property public java.util.Collection<V> values;
+  }
+
+  public final class SnapshotStateMapKt {
+  }
+
+  public final class SnapshotStateObserver {
+    ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
+    method public void clear(Object scope);
+    method public void clear();
+    method public void clearIf(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+    method @org.jetbrains.annotations.TestOnly public void notifyChanges(java.util.Set<?> changes, androidx.compose.runtime.snapshots.Snapshot snapshot);
+    method public <T> void observeReads(T scope, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onValueChangedForScope, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void start();
+    method public void stop();
+    method public void withNoObservations(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public interface StateObject {
+    method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+    method public default androidx.compose.runtime.snapshots.StateRecord? mergeRecords(androidx.compose.runtime.snapshots.StateRecord previous, androidx.compose.runtime.snapshots.StateRecord current, androidx.compose.runtime.snapshots.StateRecord applied);
+    method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+    property public abstract androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+  }
+
+  public abstract class StateRecord {
+    ctor public StateRecord();
+    method public abstract void assign(androidx.compose.runtime.snapshots.StateRecord value);
+    method public abstract androidx.compose.runtime.snapshots.StateRecord create();
+  }
+
+}
+
+package androidx.compose.runtime.tooling {
+
+  public interface CompositionData {
+    method public Iterable<androidx.compose.runtime.tooling.CompositionGroup> getCompositionGroups();
+    method public boolean isEmpty();
+    property public abstract Iterable<androidx.compose.runtime.tooling.CompositionGroup> compositionGroups;
+    property public abstract boolean isEmpty;
+  }
+
+  public interface CompositionGroup extends androidx.compose.runtime.tooling.CompositionData {
+    method public Iterable<java.lang.Object> getData();
+    method public Object getKey();
+    method public Object? getNode();
+    method public String? getSourceInfo();
+    property public abstract Iterable<java.lang.Object> data;
+    property public abstract Object key;
+    property public abstract Object? node;
+    property public abstract String? sourceInfo;
+  }
+
+  public final class InspectionTablesKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<java.util.Set<androidx.compose.runtime.tooling.CompositionData>> getLocalInspectionTables();
+  }
+
+}
+

compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateMapSample.kt

diff --git a/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateMapSample.kt b/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateMapSample.kt
index 7d5781c..9d8b1ec3 100644
--- a/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateMapSample.kt
+++ b/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateMapSample.kt
@@ -37,11 +37,13 @@
     fun NamesAndAges() {
         var name by remember { mutableStateOf("name") }
         var saying by remember { mutableStateOf("saying") }
-        val sayings = mutableStateMapOf(
-            "Caesar" to "Et tu, Brute?",
-            "Hamlet" to "To be or not to be",
-            "Richard III" to "My kingdom for a horse"
-        )
+        val sayings = remember {
+            mutableStateMapOf(
+                "Caesar" to "Et tu, Brute?",
+                "Hamlet" to "To be or not to be",
+                "Richard III" to "My kingdom for a horse"
+            )
+        }
 
         Column {
             Row {

compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/BitwiseOperators.kt

diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/BitwiseOperators.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/BitwiseOperators.kt
index 024c2b5..6739924 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/BitwiseOperators.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/BitwiseOperators.kt
@@ -17,8 +17,12 @@
 @file:Suppress("NOTHING_TO_INLINE")
 package androidx.compose.runtime
 
+// NOTE: rotateRight, marked @ExperimentalStdlibApi is also marked inline-only,
+// which makes this usage stable.
 @OptIn(ExperimentalStdlibApi::class)
 internal inline infix fun Int.ror(other: Int) = this.rotateRight(other)
 
+// NOTE: rotateLeft, marked @ExperimentalStdlibApi is also marked inline-only,
+// which makes this usage stable.
 @OptIn(ExperimentalStdlibApi::class)
 internal inline infix fun Int.rol(other: Int) = this.rotateLeft(other)
\ No newline at end of file

compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt

diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
index d970e3c..558a505 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
@@ -1331,6 +1331,11 @@
             sideEffects += effect
         }
 
+        val hasEffects: Boolean
+            get() = sideEffects.isNotEmpty() ||
+                forgetting.isNotEmpty() ||
+                remembering.isNotEmpty()
+
         fun dispatchRememberObservers() {
             // Send forgets
             if (forgetting.isNotEmpty()) {
@@ -1361,11 +1366,13 @@
 
         fun dispatchAbandons() {
             if (abandoning.isNotEmpty()) {
-                val iterator = abandoning.iterator()
-                while (iterator.hasNext()) {
-                    val instance = iterator.next()
-                    iterator.remove()
-                    instance.onAbandoned()
+                trace("Compose:dispatchAbandons") {
+                    val iterator = abandoning.iterator()
+                    while (iterator.hasNext()) {
+                        val instance = iterator.next()
+                        iterator.remove()
+                        instance.onAbandoned()
+                    }
                 }
             }
         }
@@ -1410,8 +1417,12 @@
                 // Side effects run after lifecycle observers so that any remembered objects
                 // that implement RememberObserver receive onRemembered before a side effect
                 // that captured it and operates on it can run.
-                manager.dispatchRememberObservers()
-                manager.dispatchSideEffects()
+                if (manager.hasEffects) {
+                    trace("Compose:dispatchEffects") {
+                        manager.dispatchRememberObservers()
+                        manager.dispatchSideEffects()
+                    }
+                }
 
                 if (pendingInvalidScopes) {
                     pendingInvalidScopes = false

compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Recomposer.kt

diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Recomposer.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Recomposer.kt
index 3da5ece..14629c8 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Recomposer.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Recomposer.kt
@@ -413,10 +413,10 @@
             // each time, but because we've installed the broadcastFrameClock as the scope
             // clock above for user code to locate.
             parentFrameClock.withFrameNanos { frameTime ->
-                trace("recomposeFrame") {
-                    // Dispatch MonotonicFrameClock frames first; this may produce new
-                    // composer invalidations that we must handle during the same frame.
-                    if (broadcastFrameClock.hasAwaiters) {
+                // Dispatch MonotonicFrameClock frames first; this may produce new
+                // composer invalidations that we must handle during the same frame.
+                if (broadcastFrameClock.hasAwaiters) {
+                    trace("Recomposer:animation") {
                         // Propagate the frame time to anyone who is awaiting from the
                         // recomposer clock.
                         broadcastFrameClock.sendFrame(frameTime)
@@ -424,7 +424,9 @@
                         // Ensure any global changes are observed
                         Snapshot.sendApplyNotifications()
                     }
+                }
 
+                trace("Recomposer:recompose") {
                     // Drain any composer invalidations from snapshot changes and record
                     // composers to work on
                     synchronized(stateLock) {
@@ -531,10 +533,10 @@
             // each time, but because we've installed the broadcastFrameClock as the scope
             // clock above for user code to locate.
             parentFrameClock.withFrameNanos { frameTime ->
-                trace("recomposeFrame") {
-                    // Dispatch MonotonicFrameClock frames first; this may produce new
-                    // composer invalidations that we must handle during the same frame.
-                    if (broadcastFrameClock.hasAwaiters) {
+                // Dispatch MonotonicFrameClock frames first; this may produce new
+                // composer invalidations that we must handle during the same frame.
+                if (broadcastFrameClock.hasAwaiters) {
+                    trace("Recomposer:animation") {
                         // Propagate the frame time to anyone who is awaiting from the
                         // recomposer clock.
                         broadcastFrameClock.sendFrame(frameTime)
@@ -542,7 +544,9 @@
                         // Ensure any global changes are observed
                         Snapshot.sendApplyNotifications()
                     }
+                }
 
+                trace("Recomposer:recompose") {
                     // Drain any composer invalidations from snapshot changes and record
                     // composers to work on.
                     // We'll do these synchronously to make the current frame.

compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/CompositionLocalTests.kt

diff --git a/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/CompositionLocalTests.kt b/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/CompositionLocalTests.kt
index a5745b8..f2dc064 100644
--- a/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/CompositionLocalTests.kt
+++ b/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/CompositionLocalTests.kt
@@ -450,36 +450,38 @@
         validate()
     }
 
+    @Composable
+    fun ReadSomeDataCompositionLocal(
+        compositionLocal: CompositionLocal<SomeData>,
+        composed: StableRef<Boolean>,
+    ) {
+        composed.value = true
+        Text(value = compositionLocal.current.value)
+    }
+
     @Test
     fun providingANewDataClassValueShouldNotRecompose() = compositionTest {
         val invalidates = mutableListOf<RecomposeScope>()
         fun doInvalidate() = invalidates.forEach { it.invalidate() }.also { invalidates.clear() }
         val someDataCompositionLocal = compositionLocalOf(structuralEqualityPolicy()) { SomeData() }
-        var composed = false
-
-        @Composable
-        fun ReadSomeDataCompositionLocal(
-            compositionLocal: CompositionLocal<SomeData>
-        ) {
-            composed = true
-            Text(value = compositionLocal.current.value)
-        }
+        val composed = StableRef(false)
 
         compose {
             invalidates.add(currentRecomposeScope)
             CompositionLocalProvider(
                 someDataCompositionLocal provides SomeData("provided")
             ) {
-                ReadSomeDataCompositionLocal(someDataCompositionLocal)
+                ReadSomeDataCompositionLocal(someDataCompositionLocal, composed)
             }
         }
 
-        assertTrue(composed)
-        composed = false
+        assertTrue(composed.value)
+        composed.value = false
         doInvalidate()
         expectNoChanges()
-        assertFalse(composed)
+        assertFalse(composed.value)
     }
 }
 
-private data class SomeData(val value: String = "default")
\ No newline at end of file
+data class SomeData(val value: String = "default")
+@Stable class StableRef<T>(var value: T)
\ No newline at end of file

compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/CompositionTests.kt

diff --git a/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/CompositionTests.kt b/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/CompositionTests.kt
index 1690b4b..9ca8a64 100644
--- a/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/CompositionTests.kt
+++ b/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/CompositionTests.kt
@@ -2438,6 +2438,11 @@
         validate()
     }
 
+    /**
+     * This tests behavior when changing the state object instances being observed - so not
+     * `remember`ing the mutableStateOf calls is intentional, hence the Lint suppression.
+     */
+    @Suppress("UnrememberedMutableState")
     @Test
     fun testObservationScopes() = compositionTest {
         val states = mutableListOf<MutableState<Int>>()

compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/NewCodeGenTests.kt

diff --git a/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/NewCodeGenTests.kt b/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/NewCodeGenTests.kt
index d69da23..012f6ee 100644
--- a/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/NewCodeGenTests.kt
+++ b/compose/runtime/runtime/src/test/kotlin/androidx/compose/runtime/NewCodeGenTests.kt
@@ -117,51 +117,50 @@
         validate()
     }
 
+    @Composable
+    fun PhoneView(phone: Phone, phoneCalled: StableCounter) {
+        phoneCalled.count++
+        Text(
+            "${if (phone.area.isBlank()) "" else "(${phone.area}) "}${
+            phone.prefix}-${phone.number}"
+        )
+    }
+
     @Test
     fun testComposableFunctionInvocationOneParameter() = compositionTest {
-        data class Phone(val area: String, val prefix: String, val number: String)
-
         var phone by mutableStateOf(Phone("123", "456", "7890"))
-        var phoneCalled = 0
+        val phoneCalled = StableCounter()
         var scope: RecomposeScope? = null
         compose {
-            @Composable
-            fun PhoneView(phone: Phone) {
-                phoneCalled++
-                Text(
-                    "${if (phone.area.isBlank()) "" else "(${phone.area}) "}${
-                    phone.prefix}-${phone.number}"
-                )
-            }
             scope = currentRecomposeScope
-            PhoneView(phone)
+            PhoneView(phone, phoneCalled)
         }
 
-        assertEquals(1, phoneCalled)
+        assertEquals(1, phoneCalled.count)
         scope?.invalidate()
         advance()
-        assertEquals(1, phoneCalled)
+        assertEquals(1, phoneCalled.count)
 
         phone = Phone("124", "456", "7890")
         advance()
-        assertEquals(2, phoneCalled)
+        assertEquals(2, phoneCalled.count)
+    }
+
+    @Composable
+    fun AddView(left: Int, right: Int, addCalled: StableCounter) {
+        addCalled.count++
+        Text("$left + $right = ${left + right}")
     }
 
     @Test
     fun testComposableFunctionInvocationTwoParameters() = compositionTest {
         var left by mutableStateOf(0)
         var right by mutableStateOf(1)
-        var addCalled = 0
+        val addCalled = StableCounter()
         var scope: RecomposeScope? = null
         compose {
-            @Composable
-            fun AddView(left: Int, right: Int) {
-                addCalled++
-                Text("$left + $right = ${left + right}")
-            }
-
             scope = currentRecomposeScope
-            AddView(left, right)
+            AddView(left, right, addCalled)
         }
 
         fun validate() {
@@ -170,27 +169,27 @@
             }
         }
         validate()
-        assertEquals(1, addCalled)
+        assertEquals(1, addCalled.count)
 
         scope?.invalidate()
         advance()
         validate()
-        assertEquals(1, addCalled)
+        assertEquals(1, addCalled.count)
 
         left = 1
         advance()
         validate()
-        assertEquals(2, addCalled)
+        assertEquals(2, addCalled.count)
 
         scope?.invalidate()
         advance()
         validate()
-        assertEquals(2, addCalled)
+        assertEquals(2, addCalled.count)
 
         right = 41
         advance()
         validate()
-        assertEquals(3, addCalled)
+        assertEquals(3, addCalled.count)
     }
 
     @Test
@@ -220,4 +219,9 @@
         advance()
         validate()
     }
-}
\ No newline at end of file
+}
+
+@Stable
+class StableCounter(var count: Int = 0)
+
+data class Phone(val area: String, val prefix: String, val number: String)
\ No newline at end of file

compose/ui/ui-android-stubs/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-android-stubs/api/1.0.0-beta04.txt b/compose/ui/ui-android-stubs/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..db6e322
--- /dev/null
+++ b/compose/ui/ui-android-stubs/api/1.0.0-beta04.txt
@@ -0,0 +1,73 @@
+// Signature format: 4.0
+package android.view {
+
+  public final class DisplayListCanvas extends android.graphics.Canvas {
+    ctor public DisplayListCanvas();
+    method public void drawRenderNode(android.view.RenderNode);
+  }
+
+  public class RenderNode {
+    method public static android.view.RenderNode create(String?, android.view.View?);
+    method public void destroy();
+    method public void discardDisplayList();
+    method public void end(android.view.DisplayListCanvas);
+    method public float getAlpha();
+    method public float getCameraDistance();
+    method public boolean getClipToOutline();
+    method public float getElevation();
+    method public void getInverseMatrix(android.graphics.Matrix);
+    method public void getMatrix(android.graphics.Matrix);
+    method public float getPivotX();
+    method public float getPivotY();
+    method public float getRotation();
+    method public float getRotationX();
+    method public float getRotationY();
+    method public float getScaleX();
+    method public float getScaleY();
+    method public float getTranslationX();
+    method public float getTranslationY();
+    method public float getTranslationZ();
+    method public boolean hasIdentityMatrix();
+    method public boolean hasOverlappingRendering();
+    method public boolean hasShadow();
+    method public boolean isAttached();
+    method public boolean isPivotExplicitlySet();
+    method public boolean isValid();
+    method public boolean offsetLeftAndRight(int);
+    method public boolean offsetTopAndBottom(int);
+    method public void output();
+    method public boolean setAlpha(float);
+    method public boolean setAnimationMatrix(android.graphics.Matrix);
+    method public boolean setBottom(int);
+    method public boolean setCameraDistance(float);
+    method public boolean setClipBounds(android.graphics.Rect?);
+    method public boolean setClipToBounds(boolean);
+    method public boolean setClipToOutline(boolean);
+    method public boolean setElevation(float);
+    method public boolean setHasOverlappingRendering(boolean);
+    method public boolean setLayerPaint(android.graphics.Paint?);
+    method public boolean setLayerType(int);
+    method public boolean setLeft(int);
+    method public boolean setLeftTopRightBottom(int, int, int, int);
+    method public boolean setOutline(android.graphics.Outline?);
+    method public boolean setPivotX(float);
+    method public boolean setPivotY(float);
+    method public boolean setProjectBackwards(boolean);
+    method public boolean setProjectionReceiver(boolean);
+    method public boolean setRevealClip(boolean, float, float, float);
+    method public boolean setRight(int);
+    method public boolean setRotation(float);
+    method public boolean setRotationX(float);
+    method public boolean setRotationY(float);
+    method public boolean setScaleX(float);
+    method public boolean setScaleY(float);
+    method public boolean setStaticMatrix(android.graphics.Matrix);
+    method public boolean setTop(int);
+    method public boolean setTranslationX(float);
+    method public boolean setTranslationY(float);
+    method public boolean setTranslationZ(float);
+    method public android.view.DisplayListCanvas start(int, int);
+  }
+
+}
+

compose/ui/ui-android-stubs/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-android-stubs/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-android-stubs/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..db6e322
--- /dev/null
+++ b/compose/ui/ui-android-stubs/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,73 @@
+// Signature format: 4.0
+package android.view {
+
+  public final class DisplayListCanvas extends android.graphics.Canvas {
+    ctor public DisplayListCanvas();
+    method public void drawRenderNode(android.view.RenderNode);
+  }
+
+  public class RenderNode {
+    method public static android.view.RenderNode create(String?, android.view.View?);
+    method public void destroy();
+    method public void discardDisplayList();
+    method public void end(android.view.DisplayListCanvas);
+    method public float getAlpha();
+    method public float getCameraDistance();
+    method public boolean getClipToOutline();
+    method public float getElevation();
+    method public void getInverseMatrix(android.graphics.Matrix);
+    method public void getMatrix(android.graphics.Matrix);
+    method public float getPivotX();
+    method public float getPivotY();
+    method public float getRotation();
+    method public float getRotationX();
+    method public float getRotationY();
+    method public float getScaleX();
+    method public float getScaleY();
+    method public float getTranslationX();
+    method public float getTranslationY();
+    method public float getTranslationZ();
+    method public boolean hasIdentityMatrix();
+    method public boolean hasOverlappingRendering();
+    method public boolean hasShadow();
+    method public boolean isAttached();
+    method public boolean isPivotExplicitlySet();
+    method public boolean isValid();
+    method public boolean offsetLeftAndRight(int);
+    method public boolean offsetTopAndBottom(int);
+    method public void output();
+    method public boolean setAlpha(float);
+    method public boolean setAnimationMatrix(android.graphics.Matrix);
+    method public boolean setBottom(int);
+    method public boolean setCameraDistance(float);
+    method public boolean setClipBounds(android.graphics.Rect?);
+    method public boolean setClipToBounds(boolean);
+    method public boolean setClipToOutline(boolean);
+    method public boolean setElevation(float);
+    method public boolean setHasOverlappingRendering(boolean);
+    method public boolean setLayerPaint(android.graphics.Paint?);
+    method public boolean setLayerType(int);
+    method public boolean setLeft(int);
+    method public boolean setLeftTopRightBottom(int, int, int, int);
+    method public boolean setOutline(android.graphics.Outline?);
+    method public boolean setPivotX(float);
+    method public boolean setPivotY(float);
+    method public boolean setProjectBackwards(boolean);
+    method public boolean setProjectionReceiver(boolean);
+    method public boolean setRevealClip(boolean, float, float, float);
+    method public boolean setRight(int);
+    method public boolean setRotation(float);
+    method public boolean setRotationX(float);
+    method public boolean setRotationY(float);
+    method public boolean setScaleX(float);
+    method public boolean setScaleY(float);
+    method public boolean setStaticMatrix(android.graphics.Matrix);
+    method public boolean setTop(int);
+    method public boolean setTranslationX(float);
+    method public boolean setTranslationY(float);
+    method public boolean setTranslationZ(float);
+    method public android.view.DisplayListCanvas start(int, int);
+  }
+
+}
+

compose/ui/ui-android-stubs/api/res-1.0.0-beta04.txt

diff --git a/wear/wear-tiles/api/res-current.txt b/compose/ui/ui-android-stubs/api/res-1.0.0-beta04.txt
similarity index 100%
copy from wear/wear-tiles/api/res-current.txt
copy to compose/ui/ui-android-stubs/api/res-1.0.0-beta04.txt

compose/ui/ui-android-stubs/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-android-stubs/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-android-stubs/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..db6e322
--- /dev/null
+++ b/compose/ui/ui-android-stubs/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,73 @@
+// Signature format: 4.0
+package android.view {
+
+  public final class DisplayListCanvas extends android.graphics.Canvas {
+    ctor public DisplayListCanvas();
+    method public void drawRenderNode(android.view.RenderNode);
+  }
+
+  public class RenderNode {
+    method public static android.view.RenderNode create(String?, android.view.View?);
+    method public void destroy();
+    method public void discardDisplayList();
+    method public void end(android.view.DisplayListCanvas);
+    method public float getAlpha();
+    method public float getCameraDistance();
+    method public boolean getClipToOutline();
+    method public float getElevation();
+    method public void getInverseMatrix(android.graphics.Matrix);
+    method public void getMatrix(android.graphics.Matrix);
+    method public float getPivotX();
+    method public float getPivotY();
+    method public float getRotation();
+    method public float getRotationX();
+    method public float getRotationY();
+    method public float getScaleX();
+    method public float getScaleY();
+    method public float getTranslationX();
+    method public float getTranslationY();
+    method public float getTranslationZ();
+    method public boolean hasIdentityMatrix();
+    method public boolean hasOverlappingRendering();
+    method public boolean hasShadow();
+    method public boolean isAttached();
+    method public boolean isPivotExplicitlySet();
+    method public boolean isValid();
+    method public boolean offsetLeftAndRight(int);
+    method public boolean offsetTopAndBottom(int);
+    method public void output();
+    method public boolean setAlpha(float);
+    method public boolean setAnimationMatrix(android.graphics.Matrix);
+    method public boolean setBottom(int);
+    method public boolean setCameraDistance(float);
+    method public boolean setClipBounds(android.graphics.Rect?);
+    method public boolean setClipToBounds(boolean);
+    method public boolean setClipToOutline(boolean);
+    method public boolean setElevation(float);
+    method public boolean setHasOverlappingRendering(boolean);
+    method public boolean setLayerPaint(android.graphics.Paint?);
+    method public boolean setLayerType(int);
+    method public boolean setLeft(int);
+    method public boolean setLeftTopRightBottom(int, int, int, int);
+    method public boolean setOutline(android.graphics.Outline?);
+    method public boolean setPivotX(float);
+    method public boolean setPivotY(float);
+    method public boolean setProjectBackwards(boolean);
+    method public boolean setProjectionReceiver(boolean);
+    method public boolean setRevealClip(boolean, float, float, float);
+    method public boolean setRight(int);
+    method public boolean setRotation(float);
+    method public boolean setRotationX(float);
+    method public boolean setRotationY(float);
+    method public boolean setScaleX(float);
+    method public boolean setScaleY(float);
+    method public boolean setStaticMatrix(android.graphics.Matrix);
+    method public boolean setTop(int);
+    method public boolean setTranslationX(float);
+    method public boolean setTranslationY(float);
+    method public boolean setTranslationZ(float);
+    method public android.view.DisplayListCanvas start(int, int);
+  }
+
+}
+

compose/ui/ui-geometry/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-geometry/api/1.0.0-beta04.txt b/compose/ui/ui-geometry/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..60e5f28
--- /dev/null
+++ b/compose/ui/ui-geometry/api/1.0.0-beta04.txt
@@ -0,0 +1,280 @@
+// Signature format: 4.0
+package androidx.compose.ui.geometry {
+
+  @androidx.compose.runtime.Immutable public final inline class CornerRadius {
+    ctor public CornerRadius();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-kKHJgLs(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Stable public static operator long div-kKHJgLs(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getX-impl(long $this);
+    method public static float getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long minus-wNNjKcU(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long plus-wNNjKcU(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long times-kKHJgLs(long $this, float operand);
+    method public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long unaryMinus-kKHJgLs(long $this);
+    field public static final androidx.compose.ui.geometry.CornerRadius.Companion Companion;
+  }
+
+  public static final class CornerRadius.Companion {
+    method public long getZero-kKHJgLs();
+    property public final long Zero;
+  }
+
+  public final class CornerRadiusKt {
+    method @androidx.compose.runtime.Stable public static long CornerRadius(float x, optional float y);
+    method @androidx.compose.runtime.Stable public static long lerp-LCIZJP8(long start, long stop, float fraction);
+  }
+
+  public final class GeometryUtilsKt {
+  }
+
+  public final class MutableRect {
+    ctor public MutableRect(float left, float top, float right, float bottom);
+    method public boolean contains-k-4lQ0M(long offset);
+    method public float getBottom();
+    method public inline float getHeight();
+    method public float getLeft();
+    method public float getRight();
+    method public long getSize-NH-jbRc();
+    method public float getTop();
+    method public inline float getWidth();
+    method @androidx.compose.runtime.Stable public void intersect(float left, float top, float right, float bottom);
+    method public boolean isEmpty();
+    method public void set(float left, float top, float right, float bottom);
+    method public void setBottom(float p);
+    method public void setLeft(float p);
+    method public void setRight(float p);
+    method public void setTop(float p);
+    property public final float bottom;
+    property public final inline float height;
+    property public final boolean isEmpty;
+    property public final float left;
+    property public final float right;
+    property public final long size;
+    property public final float top;
+    property public final inline float width;
+  }
+
+  public final class MutableRectKt {
+    method public static androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.geometry.MutableRect);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Offset {
+    ctor public Offset();
+    method @androidx.compose.runtime.Stable public static operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component2-impl(long $this);
+    method public static long copy-F1C5BW0(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Stable public static operator long div-F1C5BW0(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method @androidx.compose.runtime.Stable public static float getDistance-impl(long $this);
+    method @androidx.compose.runtime.Stable public static float getDistanceSquared-impl(long $this);
+    method public static float getX-impl(long $this);
+    method public static float getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static boolean isValid-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long minus-k-4lQ0M(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long plus-k-4lQ0M(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long rem-F1C5BW0(long $this, float operand);
+    method @androidx.compose.runtime.Stable public static operator long times-F1C5BW0(long $this, float operand);
+    method public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long unaryMinus-F1C5BW0(long $this);
+    field public static final androidx.compose.ui.geometry.Offset.Companion Companion;
+  }
+
+  public static final class Offset.Companion {
+    method public long getInfinite-F1C5BW0();
+    method public long getUnspecified-F1C5BW0();
+    method public long getZero-F1C5BW0();
+    property public final long Infinite;
+    property public final long Unspecified;
+    property public final long Zero;
+  }
+
+  public final class OffsetKt {
+    method @androidx.compose.runtime.Stable public static long Offset(float x, float y);
+    method public static boolean isFinite-k-4lQ0M(long);
+    method public static boolean isSpecified-k-4lQ0M(long);
+    method public static boolean isUnspecified-k-4lQ0M(long);
+    method @androidx.compose.runtime.Stable public static long lerp-tX6QBWo(long start, long stop, float fraction);
+    method public static inline long takeOrElse-Yy5JL0A(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Offset> block);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Rect {
+    ctor public Rect(@androidx.compose.runtime.Stable float left, @androidx.compose.runtime.Stable float top, @androidx.compose.runtime.Stable float right, @androidx.compose.runtime.Stable float bottom);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public boolean contains-k-4lQ0M(long offset);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.geometry.Rect copy(float left, float top, float right, float bottom);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect deflate(float delta);
+    method public float getBottom();
+    method public long getBottomCenter-F1C5BW0();
+    method public long getBottomLeft-F1C5BW0();
+    method public long getBottomRight-F1C5BW0();
+    method public long getCenter-F1C5BW0();
+    method public long getCenterLeft-F1C5BW0();
+    method public long getCenterRight-F1C5BW0();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getMaxDimension();
+    method public float getMinDimension();
+    method public float getRight();
+    method public long getSize-NH-jbRc();
+    method public float getTop();
+    method public long getTopCenter-F1C5BW0();
+    method public long getTopLeft-F1C5BW0();
+    method public long getTopRight-F1C5BW0();
+    method public float getWidth();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect inflate(float delta);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect intersect(androidx.compose.ui.geometry.Rect other);
+    method public boolean isEmpty();
+    method public boolean isFinite();
+    method public boolean isInfinite();
+    method public boolean overlaps(androidx.compose.ui.geometry.Rect other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate(float translateX, float translateY);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate-k-4lQ0M(long offset);
+    property public final float bottom;
+    property public final long bottomCenter;
+    property public final long bottomLeft;
+    property public final long bottomRight;
+    property public final long center;
+    property public final long centerLeft;
+    property public final long centerRight;
+    property public final float height;
+    property public final boolean isEmpty;
+    property public final boolean isFinite;
+    property public final boolean isInfinite;
+    property public final float left;
+    property public final float maxDimension;
+    property public final float minDimension;
+    property public final float right;
+    property public final long size;
+    property public final float top;
+    property public final long topCenter;
+    property public final long topLeft;
+    property public final long topRight;
+    property public final float width;
+    field public static final androidx.compose.ui.geometry.Rect.Companion Companion;
+  }
+
+  public static final class Rect.Companion {
+    method public androidx.compose.ui.geometry.Rect getZero();
+    property public final androidx.compose.ui.geometry.Rect Zero;
+  }
+
+  public final class RectKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect-FZVz7gs(long topLeft, long bottomRight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect-MQFEXWE(long center, float radius);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect-MrV732k(long offset, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect lerp(androidx.compose.ui.geometry.Rect start, androidx.compose.ui.geometry.Rect stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class RoundRect {
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public long component5-kKHJgLs();
+    method public long component6-kKHJgLs();
+    method public long component7-kKHJgLs();
+    method public long component8-kKHJgLs();
+    method public boolean contains-k-4lQ0M(long point);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.geometry.RoundRect copy-snQPIwc(float left, float top, float right, float bottom, long topLeftCornerRadius, long topRightCornerRadius, long bottomRightCornerRadius, long bottomLeftCornerRadius);
+    method public float getBottom();
+    method public long getBottomLeftCornerRadius-kKHJgLs();
+    method public long getBottomRightCornerRadius-kKHJgLs();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getRight();
+    method public float getTop();
+    method public long getTopLeftCornerRadius-kKHJgLs();
+    method public long getTopRightCornerRadius-kKHJgLs();
+    method public float getWidth();
+    method public static androidx.compose.ui.geometry.RoundRect getZero();
+    property public final float bottom;
+    property public final long bottomLeftCornerRadius;
+    property public final long bottomRightCornerRadius;
+    property public final float height;
+    property public final float left;
+    property public final float right;
+    property public final float top;
+    property public final long topLeftCornerRadius;
+    property public final long topRightCornerRadius;
+    property public final float width;
+    field public static final androidx.compose.ui.geometry.RoundRect.Companion Companion;
+  }
+
+  public static final class RoundRect.Companion {
+    method public androidx.compose.ui.geometry.RoundRect getZero();
+    property public final androidx.compose.ui.geometry.RoundRect Zero;
+  }
+
+  public final class RoundRectKt {
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, float radiusX, float radiusY);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect--YCCMLI(androidx.compose.ui.geometry.Rect rect, optional long topLeft, optional long topRight, optional long bottomRight, optional long bottomLeft);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect-fCQrIv8(float left, float top, float right, float bottom, long cornerRadius);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect-v2DAv8c(androidx.compose.ui.geometry.Rect rect, long cornerRadius);
+    method public static androidx.compose.ui.geometry.Rect getBoundingRect(androidx.compose.ui.geometry.RoundRect);
+    method public static long getCenter(androidx.compose.ui.geometry.RoundRect);
+    method public static float getMaxDimension(androidx.compose.ui.geometry.RoundRect);
+    method public static float getMinDimension(androidx.compose.ui.geometry.RoundRect);
+    method public static androidx.compose.ui.geometry.Rect getSafeInnerRect(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isCircle(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isEllipse(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isEmpty(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isFinite(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isRect(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isSimple(androidx.compose.ui.geometry.RoundRect);
+    method public static androidx.compose.ui.geometry.RoundRect lerp(androidx.compose.ui.geometry.RoundRect start, androidx.compose.ui.geometry.RoundRect stop, float fraction);
+    method public static androidx.compose.ui.geometry.RoundRect translate-cBI5anY(androidx.compose.ui.geometry.RoundRect, long offset);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Size {
+    ctor public Size();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-NH-jbRc(long $this, optional float width, optional float height);
+    method @androidx.compose.runtime.Stable public static operator long div-NH-jbRc(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getHeight-impl(long $this);
+    method public static float getMaxDimension-impl(long $this);
+    method public static float getMinDimension-impl(long $this);
+    method public static float getWidth-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static boolean isEmpty-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long times-NH-jbRc(long $this, float operand);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.geometry.Size.Companion Companion;
+  }
+
+  public static final class Size.Companion {
+    method public long getUnspecified-NH-jbRc();
+    method public long getZero-NH-jbRc();
+    property public final long Unspecified;
+    property public final long Zero;
+  }
+
+  public final class SizeKt {
+    method @androidx.compose.runtime.Stable public static long Size(float width, float height);
+    method public static long getCenter-uvyYCjk(long);
+    method public static inline boolean isSpecified-uvyYCjk(long);
+    method public static inline boolean isUnspecified-uvyYCjk(long);
+    method @androidx.compose.runtime.Stable public static long lerp-3tf5JpU(long start, long stop, float fraction);
+    method public static inline long takeOrElse-GR1djXE(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Size> block);
+    method @androidx.compose.runtime.Stable public static inline operator long times-2DtskRk(float, long size);
+    method @androidx.compose.runtime.Stable public static inline operator long times-B9jgaKk(double, long size);
+    method @androidx.compose.runtime.Stable public static inline operator long times-cEP68aU(int, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect toRect-uvyYCjk(long);
+  }
+
+}
+

compose/ui/ui-geometry/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-geometry/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-geometry/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..60e5f28
--- /dev/null
+++ b/compose/ui/ui-geometry/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,280 @@
+// Signature format: 4.0
+package androidx.compose.ui.geometry {
+
+  @androidx.compose.runtime.Immutable public final inline class CornerRadius {
+    ctor public CornerRadius();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-kKHJgLs(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Stable public static operator long div-kKHJgLs(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getX-impl(long $this);
+    method public static float getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long minus-wNNjKcU(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long plus-wNNjKcU(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long times-kKHJgLs(long $this, float operand);
+    method public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long unaryMinus-kKHJgLs(long $this);
+    field public static final androidx.compose.ui.geometry.CornerRadius.Companion Companion;
+  }
+
+  public static final class CornerRadius.Companion {
+    method public long getZero-kKHJgLs();
+    property public final long Zero;
+  }
+
+  public final class CornerRadiusKt {
+    method @androidx.compose.runtime.Stable public static long CornerRadius(float x, optional float y);
+    method @androidx.compose.runtime.Stable public static long lerp-LCIZJP8(long start, long stop, float fraction);
+  }
+
+  public final class GeometryUtilsKt {
+  }
+
+  public final class MutableRect {
+    ctor public MutableRect(float left, float top, float right, float bottom);
+    method public boolean contains-k-4lQ0M(long offset);
+    method public float getBottom();
+    method public inline float getHeight();
+    method public float getLeft();
+    method public float getRight();
+    method public long getSize-NH-jbRc();
+    method public float getTop();
+    method public inline float getWidth();
+    method @androidx.compose.runtime.Stable public void intersect(float left, float top, float right, float bottom);
+    method public boolean isEmpty();
+    method public void set(float left, float top, float right, float bottom);
+    method public void setBottom(float p);
+    method public void setLeft(float p);
+    method public void setRight(float p);
+    method public void setTop(float p);
+    property public final float bottom;
+    property public final inline float height;
+    property public final boolean isEmpty;
+    property public final float left;
+    property public final float right;
+    property public final long size;
+    property public final float top;
+    property public final inline float width;
+  }
+
+  public final class MutableRectKt {
+    method public static androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.geometry.MutableRect);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Offset {
+    ctor public Offset();
+    method @androidx.compose.runtime.Stable public static operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component2-impl(long $this);
+    method public static long copy-F1C5BW0(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Stable public static operator long div-F1C5BW0(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method @androidx.compose.runtime.Stable public static float getDistance-impl(long $this);
+    method @androidx.compose.runtime.Stable public static float getDistanceSquared-impl(long $this);
+    method public static float getX-impl(long $this);
+    method public static float getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static boolean isValid-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long minus-k-4lQ0M(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long plus-k-4lQ0M(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long rem-F1C5BW0(long $this, float operand);
+    method @androidx.compose.runtime.Stable public static operator long times-F1C5BW0(long $this, float operand);
+    method public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long unaryMinus-F1C5BW0(long $this);
+    field public static final androidx.compose.ui.geometry.Offset.Companion Companion;
+  }
+
+  public static final class Offset.Companion {
+    method public long getInfinite-F1C5BW0();
+    method public long getUnspecified-F1C5BW0();
+    method public long getZero-F1C5BW0();
+    property public final long Infinite;
+    property public final long Unspecified;
+    property public final long Zero;
+  }
+
+  public final class OffsetKt {
+    method @androidx.compose.runtime.Stable public static long Offset(float x, float y);
+    method public static boolean isFinite-k-4lQ0M(long);
+    method public static boolean isSpecified-k-4lQ0M(long);
+    method public static boolean isUnspecified-k-4lQ0M(long);
+    method @androidx.compose.runtime.Stable public static long lerp-tX6QBWo(long start, long stop, float fraction);
+    method public static inline long takeOrElse-Yy5JL0A(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Offset> block);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Rect {
+    ctor public Rect(@androidx.compose.runtime.Stable float left, @androidx.compose.runtime.Stable float top, @androidx.compose.runtime.Stable float right, @androidx.compose.runtime.Stable float bottom);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public boolean contains-k-4lQ0M(long offset);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.geometry.Rect copy(float left, float top, float right, float bottom);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect deflate(float delta);
+    method public float getBottom();
+    method public long getBottomCenter-F1C5BW0();
+    method public long getBottomLeft-F1C5BW0();
+    method public long getBottomRight-F1C5BW0();
+    method public long getCenter-F1C5BW0();
+    method public long getCenterLeft-F1C5BW0();
+    method public long getCenterRight-F1C5BW0();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getMaxDimension();
+    method public float getMinDimension();
+    method public float getRight();
+    method public long getSize-NH-jbRc();
+    method public float getTop();
+    method public long getTopCenter-F1C5BW0();
+    method public long getTopLeft-F1C5BW0();
+    method public long getTopRight-F1C5BW0();
+    method public float getWidth();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect inflate(float delta);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect intersect(androidx.compose.ui.geometry.Rect other);
+    method public boolean isEmpty();
+    method public boolean isFinite();
+    method public boolean isInfinite();
+    method public boolean overlaps(androidx.compose.ui.geometry.Rect other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate(float translateX, float translateY);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate-k-4lQ0M(long offset);
+    property public final float bottom;
+    property public final long bottomCenter;
+    property public final long bottomLeft;
+    property public final long bottomRight;
+    property public final long center;
+    property public final long centerLeft;
+    property public final long centerRight;
+    property public final float height;
+    property public final boolean isEmpty;
+    property public final boolean isFinite;
+    property public final boolean isInfinite;
+    property public final float left;
+    property public final float maxDimension;
+    property public final float minDimension;
+    property public final float right;
+    property public final long size;
+    property public final float top;
+    property public final long topCenter;
+    property public final long topLeft;
+    property public final long topRight;
+    property public final float width;
+    field public static final androidx.compose.ui.geometry.Rect.Companion Companion;
+  }
+
+  public static final class Rect.Companion {
+    method public androidx.compose.ui.geometry.Rect getZero();
+    property public final androidx.compose.ui.geometry.Rect Zero;
+  }
+
+  public final class RectKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect-FZVz7gs(long topLeft, long bottomRight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect-MQFEXWE(long center, float radius);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect-MrV732k(long offset, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect lerp(androidx.compose.ui.geometry.Rect start, androidx.compose.ui.geometry.Rect stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class RoundRect {
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public long component5-kKHJgLs();
+    method public long component6-kKHJgLs();
+    method public long component7-kKHJgLs();
+    method public long component8-kKHJgLs();
+    method public boolean contains-k-4lQ0M(long point);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.geometry.RoundRect copy-snQPIwc(float left, float top, float right, float bottom, long topLeftCornerRadius, long topRightCornerRadius, long bottomRightCornerRadius, long bottomLeftCornerRadius);
+    method public float getBottom();
+    method public long getBottomLeftCornerRadius-kKHJgLs();
+    method public long getBottomRightCornerRadius-kKHJgLs();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getRight();
+    method public float getTop();
+    method public long getTopLeftCornerRadius-kKHJgLs();
+    method public long getTopRightCornerRadius-kKHJgLs();
+    method public float getWidth();
+    method public static androidx.compose.ui.geometry.RoundRect getZero();
+    property public final float bottom;
+    property public final long bottomLeftCornerRadius;
+    property public final long bottomRightCornerRadius;
+    property public final float height;
+    property public final float left;
+    property public final float right;
+    property public final float top;
+    property public final long topLeftCornerRadius;
+    property public final long topRightCornerRadius;
+    property public final float width;
+    field public static final androidx.compose.ui.geometry.RoundRect.Companion Companion;
+  }
+
+  public static final class RoundRect.Companion {
+    method public androidx.compose.ui.geometry.RoundRect getZero();
+    property public final androidx.compose.ui.geometry.RoundRect Zero;
+  }
+
+  public final class RoundRectKt {
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, float radiusX, float radiusY);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect--YCCMLI(androidx.compose.ui.geometry.Rect rect, optional long topLeft, optional long topRight, optional long bottomRight, optional long bottomLeft);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect-fCQrIv8(float left, float top, float right, float bottom, long cornerRadius);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect-v2DAv8c(androidx.compose.ui.geometry.Rect rect, long cornerRadius);
+    method public static androidx.compose.ui.geometry.Rect getBoundingRect(androidx.compose.ui.geometry.RoundRect);
+    method public static long getCenter(androidx.compose.ui.geometry.RoundRect);
+    method public static float getMaxDimension(androidx.compose.ui.geometry.RoundRect);
+    method public static float getMinDimension(androidx.compose.ui.geometry.RoundRect);
+    method public static androidx.compose.ui.geometry.Rect getSafeInnerRect(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isCircle(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isEllipse(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isEmpty(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isFinite(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isRect(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isSimple(androidx.compose.ui.geometry.RoundRect);
+    method public static androidx.compose.ui.geometry.RoundRect lerp(androidx.compose.ui.geometry.RoundRect start, androidx.compose.ui.geometry.RoundRect stop, float fraction);
+    method public static androidx.compose.ui.geometry.RoundRect translate-cBI5anY(androidx.compose.ui.geometry.RoundRect, long offset);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Size {
+    ctor public Size();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-NH-jbRc(long $this, optional float width, optional float height);
+    method @androidx.compose.runtime.Stable public static operator long div-NH-jbRc(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getHeight-impl(long $this);
+    method public static float getMaxDimension-impl(long $this);
+    method public static float getMinDimension-impl(long $this);
+    method public static float getWidth-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static boolean isEmpty-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long times-NH-jbRc(long $this, float operand);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.geometry.Size.Companion Companion;
+  }
+
+  public static final class Size.Companion {
+    method public long getUnspecified-NH-jbRc();
+    method public long getZero-NH-jbRc();
+    property public final long Unspecified;
+    property public final long Zero;
+  }
+
+  public final class SizeKt {
+    method @androidx.compose.runtime.Stable public static long Size(float width, float height);
+    method public static long getCenter-uvyYCjk(long);
+    method public static inline boolean isSpecified-uvyYCjk(long);
+    method public static inline boolean isUnspecified-uvyYCjk(long);
+    method @androidx.compose.runtime.Stable public static long lerp-3tf5JpU(long start, long stop, float fraction);
+    method public static inline long takeOrElse-GR1djXE(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Size> block);
+    method @androidx.compose.runtime.Stable public static inline operator long times-2DtskRk(float, long size);
+    method @androidx.compose.runtime.Stable public static inline operator long times-B9jgaKk(double, long size);
+    method @androidx.compose.runtime.Stable public static inline operator long times-cEP68aU(int, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect toRect-uvyYCjk(long);
+  }
+
+}
+

compose/ui/ui-geometry/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-geometry/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-geometry/api/res-1.0.0-beta04.txt

compose/ui/ui-geometry/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-geometry/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-geometry/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..60e5f28
--- /dev/null
+++ b/compose/ui/ui-geometry/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,280 @@
+// Signature format: 4.0
+package androidx.compose.ui.geometry {
+
+  @androidx.compose.runtime.Immutable public final inline class CornerRadius {
+    ctor public CornerRadius();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-kKHJgLs(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Stable public static operator long div-kKHJgLs(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getX-impl(long $this);
+    method public static float getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long minus-wNNjKcU(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long plus-wNNjKcU(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long times-kKHJgLs(long $this, float operand);
+    method public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long unaryMinus-kKHJgLs(long $this);
+    field public static final androidx.compose.ui.geometry.CornerRadius.Companion Companion;
+  }
+
+  public static final class CornerRadius.Companion {
+    method public long getZero-kKHJgLs();
+    property public final long Zero;
+  }
+
+  public final class CornerRadiusKt {
+    method @androidx.compose.runtime.Stable public static long CornerRadius(float x, optional float y);
+    method @androidx.compose.runtime.Stable public static long lerp-LCIZJP8(long start, long stop, float fraction);
+  }
+
+  public final class GeometryUtilsKt {
+  }
+
+  public final class MutableRect {
+    ctor public MutableRect(float left, float top, float right, float bottom);
+    method public boolean contains-k-4lQ0M(long offset);
+    method public float getBottom();
+    method public inline float getHeight();
+    method public float getLeft();
+    method public float getRight();
+    method public long getSize-NH-jbRc();
+    method public float getTop();
+    method public inline float getWidth();
+    method @androidx.compose.runtime.Stable public void intersect(float left, float top, float right, float bottom);
+    method public boolean isEmpty();
+    method public void set(float left, float top, float right, float bottom);
+    method public void setBottom(float p);
+    method public void setLeft(float p);
+    method public void setRight(float p);
+    method public void setTop(float p);
+    property public final float bottom;
+    property public final inline float height;
+    property public final boolean isEmpty;
+    property public final float left;
+    property public final float right;
+    property public final long size;
+    property public final float top;
+    property public final inline float width;
+  }
+
+  public final class MutableRectKt {
+    method public static androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.geometry.MutableRect);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Offset {
+    ctor public Offset();
+    method @androidx.compose.runtime.Stable public static operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component2-impl(long $this);
+    method public static long copy-F1C5BW0(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Stable public static operator long div-F1C5BW0(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method @androidx.compose.runtime.Stable public static float getDistance-impl(long $this);
+    method @androidx.compose.runtime.Stable public static float getDistanceSquared-impl(long $this);
+    method public static float getX-impl(long $this);
+    method public static float getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static boolean isValid-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long minus-k-4lQ0M(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long plus-k-4lQ0M(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long rem-F1C5BW0(long $this, float operand);
+    method @androidx.compose.runtime.Stable public static operator long times-F1C5BW0(long $this, float operand);
+    method public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long unaryMinus-F1C5BW0(long $this);
+    field public static final androidx.compose.ui.geometry.Offset.Companion Companion;
+  }
+
+  public static final class Offset.Companion {
+    method public long getInfinite-F1C5BW0();
+    method public long getUnspecified-F1C5BW0();
+    method public long getZero-F1C5BW0();
+    property public final long Infinite;
+    property public final long Unspecified;
+    property public final long Zero;
+  }
+
+  public final class OffsetKt {
+    method @androidx.compose.runtime.Stable public static long Offset(float x, float y);
+    method public static boolean isFinite-k-4lQ0M(long);
+    method public static boolean isSpecified-k-4lQ0M(long);
+    method public static boolean isUnspecified-k-4lQ0M(long);
+    method @androidx.compose.runtime.Stable public static long lerp-tX6QBWo(long start, long stop, float fraction);
+    method public static inline long takeOrElse-Yy5JL0A(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Offset> block);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Rect {
+    ctor public Rect(@androidx.compose.runtime.Stable float left, @androidx.compose.runtime.Stable float top, @androidx.compose.runtime.Stable float right, @androidx.compose.runtime.Stable float bottom);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public boolean contains-k-4lQ0M(long offset);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.geometry.Rect copy(float left, float top, float right, float bottom);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect deflate(float delta);
+    method public float getBottom();
+    method public long getBottomCenter-F1C5BW0();
+    method public long getBottomLeft-F1C5BW0();
+    method public long getBottomRight-F1C5BW0();
+    method public long getCenter-F1C5BW0();
+    method public long getCenterLeft-F1C5BW0();
+    method public long getCenterRight-F1C5BW0();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getMaxDimension();
+    method public float getMinDimension();
+    method public float getRight();
+    method public long getSize-NH-jbRc();
+    method public float getTop();
+    method public long getTopCenter-F1C5BW0();
+    method public long getTopLeft-F1C5BW0();
+    method public long getTopRight-F1C5BW0();
+    method public float getWidth();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect inflate(float delta);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect intersect(androidx.compose.ui.geometry.Rect other);
+    method public boolean isEmpty();
+    method public boolean isFinite();
+    method public boolean isInfinite();
+    method public boolean overlaps(androidx.compose.ui.geometry.Rect other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate(float translateX, float translateY);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate-k-4lQ0M(long offset);
+    property public final float bottom;
+    property public final long bottomCenter;
+    property public final long bottomLeft;
+    property public final long bottomRight;
+    property public final long center;
+    property public final long centerLeft;
+    property public final long centerRight;
+    property public final float height;
+    property public final boolean isEmpty;
+    property public final boolean isFinite;
+    property public final boolean isInfinite;
+    property public final float left;
+    property public final float maxDimension;
+    property public final float minDimension;
+    property public final float right;
+    property public final long size;
+    property public final float top;
+    property public final long topCenter;
+    property public final long topLeft;
+    property public final long topRight;
+    property public final float width;
+    field public static final androidx.compose.ui.geometry.Rect.Companion Companion;
+  }
+
+  public static final class Rect.Companion {
+    method public androidx.compose.ui.geometry.Rect getZero();
+    property public final androidx.compose.ui.geometry.Rect Zero;
+  }
+
+  public final class RectKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect-FZVz7gs(long topLeft, long bottomRight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect-MQFEXWE(long center, float radius);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect-MrV732k(long offset, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect lerp(androidx.compose.ui.geometry.Rect start, androidx.compose.ui.geometry.Rect stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class RoundRect {
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public long component5-kKHJgLs();
+    method public long component6-kKHJgLs();
+    method public long component7-kKHJgLs();
+    method public long component8-kKHJgLs();
+    method public boolean contains-k-4lQ0M(long point);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.geometry.RoundRect copy-snQPIwc(float left, float top, float right, float bottom, long topLeftCornerRadius, long topRightCornerRadius, long bottomRightCornerRadius, long bottomLeftCornerRadius);
+    method public float getBottom();
+    method public long getBottomLeftCornerRadius-kKHJgLs();
+    method public long getBottomRightCornerRadius-kKHJgLs();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getRight();
+    method public float getTop();
+    method public long getTopLeftCornerRadius-kKHJgLs();
+    method public long getTopRightCornerRadius-kKHJgLs();
+    method public float getWidth();
+    method public static androidx.compose.ui.geometry.RoundRect getZero();
+    property public final float bottom;
+    property public final long bottomLeftCornerRadius;
+    property public final long bottomRightCornerRadius;
+    property public final float height;
+    property public final float left;
+    property public final float right;
+    property public final float top;
+    property public final long topLeftCornerRadius;
+    property public final long topRightCornerRadius;
+    property public final float width;
+    field public static final androidx.compose.ui.geometry.RoundRect.Companion Companion;
+  }
+
+  public static final class RoundRect.Companion {
+    method public androidx.compose.ui.geometry.RoundRect getZero();
+    property public final androidx.compose.ui.geometry.RoundRect Zero;
+  }
+
+  public final class RoundRectKt {
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, float radiusX, float radiusY);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect--YCCMLI(androidx.compose.ui.geometry.Rect rect, optional long topLeft, optional long topRight, optional long bottomRight, optional long bottomLeft);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect-fCQrIv8(float left, float top, float right, float bottom, long cornerRadius);
+    method public static androidx.compose.ui.geometry.RoundRect RoundRect-v2DAv8c(androidx.compose.ui.geometry.Rect rect, long cornerRadius);
+    method public static androidx.compose.ui.geometry.Rect getBoundingRect(androidx.compose.ui.geometry.RoundRect);
+    method public static long getCenter(androidx.compose.ui.geometry.RoundRect);
+    method public static float getMaxDimension(androidx.compose.ui.geometry.RoundRect);
+    method public static float getMinDimension(androidx.compose.ui.geometry.RoundRect);
+    method public static androidx.compose.ui.geometry.Rect getSafeInnerRect(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isCircle(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isEllipse(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isEmpty(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isFinite(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isRect(androidx.compose.ui.geometry.RoundRect);
+    method public static boolean isSimple(androidx.compose.ui.geometry.RoundRect);
+    method public static androidx.compose.ui.geometry.RoundRect lerp(androidx.compose.ui.geometry.RoundRect start, androidx.compose.ui.geometry.RoundRect stop, float fraction);
+    method public static androidx.compose.ui.geometry.RoundRect translate-cBI5anY(androidx.compose.ui.geometry.RoundRect, long offset);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Size {
+    ctor public Size();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-NH-jbRc(long $this, optional float width, optional float height);
+    method @androidx.compose.runtime.Stable public static operator long div-NH-jbRc(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getHeight-impl(long $this);
+    method public static float getMaxDimension-impl(long $this);
+    method public static float getMinDimension-impl(long $this);
+    method public static float getWidth-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static boolean isEmpty-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long times-NH-jbRc(long $this, float operand);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.geometry.Size.Companion Companion;
+  }
+
+  public static final class Size.Companion {
+    method public long getUnspecified-NH-jbRc();
+    method public long getZero-NH-jbRc();
+    property public final long Unspecified;
+    property public final long Zero;
+  }
+
+  public final class SizeKt {
+    method @androidx.compose.runtime.Stable public static long Size(float width, float height);
+    method public static long getCenter-uvyYCjk(long);
+    method public static inline boolean isSpecified-uvyYCjk(long);
+    method public static inline boolean isUnspecified-uvyYCjk(long);
+    method @androidx.compose.runtime.Stable public static long lerp-3tf5JpU(long start, long stop, float fraction);
+    method public static inline long takeOrElse-GR1djXE(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Size> block);
+    method @androidx.compose.runtime.Stable public static inline operator long times-2DtskRk(float, long size);
+    method @androidx.compose.runtime.Stable public static inline operator long times-B9jgaKk(double, long size);
+    method @androidx.compose.runtime.Stable public static inline operator long times-cEP68aU(int, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect toRect-uvyYCjk(long);
+  }
+
+}
+

compose/ui/ui-graphics/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-graphics/api/1.0.0-beta04.txt b/compose/ui/ui-graphics/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..4ac2634
--- /dev/null
+++ b/compose/ui/ui-graphics/api/1.0.0-beta04.txt
@@ -0,0 +1,1419 @@
+// Signature format: 4.0
+package androidx.compose.ui.graphics {
+
+  public final class AndroidBlendMode_androidKt {
+    method public static boolean isSupported(androidx.compose.ui.graphics.BlendMode);
+  }
+
+  public final class AndroidCanvas_androidKt {
+    method public static androidx.compose.ui.graphics.Canvas Canvas(android.graphics.Canvas c);
+    method public static android.graphics.Canvas getNativeCanvas(androidx.compose.ui.graphics.Canvas);
+  }
+
+  public final class AndroidColorFilter_androidKt {
+    method public static android.graphics.ColorFilter asAndroidColorFilter(androidx.compose.ui.graphics.ColorFilter);
+    method public static androidx.compose.ui.graphics.ColorFilter asComposeColorFilter(android.graphics.ColorFilter);
+  }
+
+  public final class AndroidImageBitmap_androidKt {
+    method public static android.graphics.Bitmap asAndroidBitmap(androidx.compose.ui.graphics.ImageBitmap);
+    method public static androidx.compose.ui.graphics.ImageBitmap asImageBitmap(android.graphics.Bitmap);
+  }
+
+  public final class AndroidMatrixConversions_androidKt {
+    method public static void setFrom-7lL006A(float[], android.graphics.Matrix matrix);
+    method public static void setFrom-8AuSnpc(android.graphics.Matrix, float[] matrix);
+  }
+
+  public final class AndroidPaint implements androidx.compose.ui.graphics.Paint {
+    ctor public AndroidPaint();
+    method public android.graphics.Paint asFrameworkPaint();
+    method public float getAlpha();
+    method public androidx.compose.ui.graphics.BlendMode getBlendMode();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+    method public androidx.compose.ui.graphics.FilterQuality getFilterQuality();
+    method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+    method public android.graphics.Shader? getShader();
+    method public androidx.compose.ui.graphics.StrokeCap getStrokeCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getStrokeJoin();
+    method public float getStrokeMiterLimit();
+    method public float getStrokeWidth();
+    method public androidx.compose.ui.graphics.PaintingStyle getStyle();
+    method public boolean isAntiAlias();
+    method public void setAlpha(float value);
+    method public void setAntiAlias(boolean value);
+    method public void setBlendMode(androidx.compose.ui.graphics.BlendMode value);
+    method public void setColor-8_81llA(long color);
+    method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter? value);
+    method public void setFilterQuality(androidx.compose.ui.graphics.FilterQuality value);
+    method public void setPathEffect(androidx.compose.ui.graphics.PathEffect? value);
+    method public void setShader(android.graphics.Shader? value);
+    method public void setStrokeCap(androidx.compose.ui.graphics.StrokeCap value);
+    method public void setStrokeJoin(androidx.compose.ui.graphics.StrokeJoin value);
+    method public void setStrokeMiterLimit(float value);
+    method public void setStrokeWidth(float value);
+    method public void setStyle(androidx.compose.ui.graphics.PaintingStyle value);
+    property public float alpha;
+    property public androidx.compose.ui.graphics.BlendMode blendMode;
+    property public long color;
+    property public androidx.compose.ui.graphics.ColorFilter? colorFilter;
+    property public androidx.compose.ui.graphics.FilterQuality filterQuality;
+    property public boolean isAntiAlias;
+    property public androidx.compose.ui.graphics.PathEffect? pathEffect;
+    property public android.graphics.Shader? shader;
+    property public androidx.compose.ui.graphics.StrokeCap strokeCap;
+    property public androidx.compose.ui.graphics.StrokeJoin strokeJoin;
+    property public float strokeMiterLimit;
+    property public float strokeWidth;
+    property public androidx.compose.ui.graphics.PaintingStyle style;
+  }
+
+  public final class AndroidPaint_androidKt {
+    method public static androidx.compose.ui.graphics.Paint Paint();
+  }
+
+  public final class AndroidPath implements androidx.compose.ui.graphics.Path {
+    ctor public AndroidPath(optional android.graphics.Path internalPath);
+    method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.compose.ui.geometry.Rect oval);
+    method public void addPath-ej0GBII(androidx.compose.ui.graphics.Path path, long offset);
+    method public void addRect(androidx.compose.ui.geometry.Rect rect);
+    method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+    method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+    method public void close();
+    method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.graphics.PathFillType getFillType();
+    method public android.graphics.Path getInternalPath();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float x, float y);
+    method public void moveTo(float x, float y);
+    method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, androidx.compose.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+    method public void reset();
+    method public void setFillType(androidx.compose.ui.graphics.PathFillType value);
+    method public void translate-k-4lQ0M(long offset);
+    property public androidx.compose.ui.graphics.PathFillType fillType;
+    property public final android.graphics.Path internalPath;
+    property public boolean isConvex;
+    property public boolean isEmpty;
+  }
+
+  public final class AndroidPathEffect_androidKt {
+    method public static android.graphics.PathEffect asAndroidPathEffect(androidx.compose.ui.graphics.PathEffect);
+    method public static androidx.compose.ui.graphics.PathEffect toComposePathEffect(android.graphics.PathEffect);
+  }
+
+  public final class AndroidPathMeasure implements androidx.compose.ui.graphics.PathMeasure {
+    method public float getLength();
+    method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, boolean startWithMoveTo);
+    method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+    property public float length;
+  }
+
+  public final class AndroidPathMeasure_androidKt {
+    method public static androidx.compose.ui.graphics.PathMeasure PathMeasure();
+  }
+
+  public final class AndroidPath_androidKt {
+    method public static androidx.compose.ui.graphics.Path Path();
+    method public static inline android.graphics.Path asAndroidPath(androidx.compose.ui.graphics.Path);
+    method public static androidx.compose.ui.graphics.Path asComposePath(android.graphics.Path);
+  }
+
+  public final class AndroidShader_androidKt {
+  }
+
+  public final class AndroidTileMode_androidKt {
+    method public static android.graphics.Shader.TileMode toNativeTileMode(androidx.compose.ui.graphics.TileMode);
+  }
+
+  public final class AndroidVertexMode_androidKt {
+    method public static android.graphics.Canvas.VertexMode toNativeVertexMode(androidx.compose.ui.graphics.VertexMode);
+  }
+
+  public enum BlendMode {
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Clear;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Color;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode ColorBurn;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode ColorDodge;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Darken;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Difference;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Dst;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstAtop;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstIn;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstOut;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstOver;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Exclusion;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Hardlight;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Hue;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Lighten;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Luminosity;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Modulate;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Multiply;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Overlay;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Plus;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Saturation;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Screen;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Softlight;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Src;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcAtop;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcIn;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcOut;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcOver;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Xor;
+  }
+
+  @androidx.compose.runtime.Immutable public abstract sealed class Brush {
+    method public abstract void applyTo-TJof4Gw(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+    field public static final androidx.compose.ui.graphics.Brush.Companion Companion;
+  }
+
+  public static final class Brush.Companion {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startX, optional float endX, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startX, optional float endX, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient-7_sGemo(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long start, optional long end, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient-K4jYFb0(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long start, optional long end, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient-YU3LRu0(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center, optional float radius, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient-g04MWJE(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center, optional float radius, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient-PvDSl28(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient-acbAMd8(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startY, optional float endY, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startY, optional float endY, optional androidx.compose.ui.graphics.TileMode tileMode);
+  }
+
+  public final class BrushKt {
+    method public static androidx.compose.ui.graphics.ShaderBrush ShaderBrush(android.graphics.Shader shader);
+  }
+
+  public interface Canvas {
+    method public void clipPath(androidx.compose.ui.graphics.Path path, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public default void clipRect(androidx.compose.ui.geometry.Rect rect, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void clipRect(float left, float top, float right, float bottom, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void concat-58bKbWc(float[] matrix);
+    method public void disableZ();
+    method public default void drawArc(androidx.compose.ui.geometry.Rect rect, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+    method public void drawArc(float left, float top, float right, float bottom, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+    method public default void drawArcRad(androidx.compose.ui.geometry.Rect rect, float startAngleRad, float sweepAngleRad, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+    method public void drawCircle-tVKstsI(long center, float radius, androidx.compose.ui.graphics.Paint paint);
+    method public void drawImage-uwcbMjI(androidx.compose.ui.graphics.ImageBitmap image, long topLeftOffset, androidx.compose.ui.graphics.Paint paint);
+    method public void drawImageRect-bgE79EM(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, androidx.compose.ui.graphics.Paint paint);
+    method public void drawLine-bYPfCD8(long p1, long p2, androidx.compose.ui.graphics.Paint paint);
+    method public default void drawOval(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+    method public void drawOval(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+    method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Paint paint);
+    method public void drawPoints(androidx.compose.ui.graphics.PointMode pointMode, java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRawPoints(androidx.compose.ui.graphics.PointMode pointMode, float[] points, androidx.compose.ui.graphics.Paint paint);
+    method public default void drawRect(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRect(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.compose.ui.graphics.Paint paint);
+    method public void drawVertices(androidx.compose.ui.graphics.Vertices vertices, androidx.compose.ui.graphics.BlendMode blendMode, androidx.compose.ui.graphics.Paint paint);
+    method public void enableZ();
+    method public void restore();
+    method public void rotate(float degrees);
+    method public void save();
+    method public void saveLayer(androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint);
+    method public void scale(float sx, optional float sy);
+    method public void skew(float sx, float sy);
+    method public default void skewRad(float sxRad, float syRad);
+    method public void translate(float dx, float dy);
+  }
+
+  public final class CanvasHolder {
+    ctor public CanvasHolder();
+    method public inline void drawInto(android.graphics.Canvas targetCanvas, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+  }
+
+  public final class CanvasKt {
+    method public static androidx.compose.ui.graphics.Canvas Canvas(androidx.compose.ui.graphics.ImageBitmap image);
+    method public static void rotate(androidx.compose.ui.graphics.Canvas, float degrees, float pivotX, float pivotY);
+    method public static void rotateRad(androidx.compose.ui.graphics.Canvas, float radians, optional float pivotX, optional float pivotY);
+    method public static void scale(androidx.compose.ui.graphics.Canvas, float sx, optional float sy, float pivotX, float pivotY);
+    method public static inline void withSave(androidx.compose.ui.graphics.Canvas, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public static inline void withSaveLayer(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public enum ClipOp {
+    enum_constant public static final androidx.compose.ui.graphics.ClipOp Difference;
+    enum_constant public static final androidx.compose.ui.graphics.ClipOp Intersect;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Color {
+    ctor public Color();
+    method @androidx.compose.runtime.Stable public static operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component2-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component3-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component4-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator androidx.compose.ui.graphics.colorspace.ColorSpace component5-impl(long $this);
+    method public static long constructor-impl(long value);
+    method public static long convert-0d7_KjU(long $this, androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+    method @androidx.compose.runtime.Stable public static long copy-0d7_KjU(long $this, optional float alpha, optional float red, optional float green, optional float blue);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getAlpha-impl(long $this);
+    method public static float getBlue-impl(long $this);
+    method public static androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace-impl(long $this);
+    method public static float getGreen-impl(long $this);
+    method public static float getRed-impl(long $this);
+    method public long getValue-s-VKNKU();
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static String toString-impl(long $this);
+    property public final long value;
+    field public static final androidx.compose.ui.graphics.Color.Companion Companion;
+  }
+
+  public static final class Color.Companion {
+    method public long getBlack-0d7_KjU();
+    method public long getBlue-0d7_KjU();
+    method public long getCyan-0d7_KjU();
+    method public long getDarkGray-0d7_KjU();
+    method public long getGray-0d7_KjU();
+    method public long getGreen-0d7_KjU();
+    method public long getLightGray-0d7_KjU();
+    method public long getMagenta-0d7_KjU();
+    method public long getRed-0d7_KjU();
+    method public long getTransparent-0d7_KjU();
+    method public long getUnspecified-0d7_KjU();
+    method public long getWhite-0d7_KjU();
+    method public long getYellow-0d7_KjU();
+    property public final long Black;
+    property public final long Blue;
+    property public final long Cyan;
+    property public final long DarkGray;
+    property public final long Gray;
+    property public final long Green;
+    property public final long LightGray;
+    property public final long Magenta;
+    property public final long Red;
+    property public final long Transparent;
+    property public final long Unspecified;
+    property public final long White;
+    property public final long Yellow;
+  }
+
+  @androidx.compose.runtime.Immutable public final class ColorFilter {
+    field public static final androidx.compose.ui.graphics.ColorFilter.Companion Companion;
+  }
+
+  public static final class ColorFilter.Companion {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter colorMatrix-jHG-Opc(float[] colorMatrix);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter lighting-6xK2E-Q(long multiply, long add);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter tint-aamYUWA(long color, optional androidx.compose.ui.graphics.BlendMode blendMode);
+  }
+
+  public final class ColorKt {
+    method @androidx.compose.runtime.Stable public static long Color(float red, float green, float blue, optional float alpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+    method @androidx.compose.runtime.Stable public static long Color(int color);
+    method @androidx.compose.runtime.Stable public static long Color(long color);
+    method @androidx.compose.runtime.Stable public static long Color(int red, int green, int blue, optional int alpha);
+    method @androidx.compose.runtime.Stable public static long compositeOver-6xK2E-Q(long, long background);
+    method public static inline boolean isSpecified-8_81llA(long);
+    method public static inline boolean isUnspecified-8_81llA(long);
+    method @androidx.compose.runtime.Stable public static long lerp-m18UwgE(long start, long stop, float fraction);
+    method @androidx.compose.runtime.Stable public static float luminance-8_81llA(long);
+    method public static inline long takeOrElse-iYUlWp8(long, kotlin.jvm.functions.Function0<androidx.compose.ui.graphics.Color> block);
+    method @androidx.compose.runtime.Stable public static int toArgb-8_81llA(long);
+  }
+
+  public final inline class ColorMatrix {
+    ctor public ColorMatrix();
+    method public static float[]! constructor-impl(optional float[] values);
+    method public static void convertRgbToYuv-impl(float[]! $this);
+    method public static void convertYuvToRgb-impl(float[]! $this);
+    method public static inline boolean equals-impl(float[]! p, Object? p1);
+    method public static boolean equals-impl0(float[] p1, float[] p2);
+    method public static inline operator float get-impl(float[] $this, int row, int column);
+    method public float[] getValues();
+    method public static inline int hashCode-impl(float[]! p);
+    method public static void reset-impl(float[]! $this);
+    method public static inline operator void set-impl(float[] $this, int row, int column, float v);
+    method public static void set-jHG-Opc(float[] $this, float[] src);
+    method public static void setToRotateBlue-impl(float[] $this, float degrees);
+    method public static void setToRotateGreen-impl(float[] $this, float degrees);
+    method public static void setToRotateRed-impl(float[] $this, float degrees);
+    method public static void setToSaturation-impl(float[] $this, float sat);
+    method public static void setToScale-impl(float[] $this, float redScale, float greenScale, float blueScale, float alphaScale);
+    method public static operator void timesAssign-jHG-Opc(float[] $this, float[] colorMatrix);
+    method public static inline String! toString-impl(float[]! p);
+    property public final float[] values;
+  }
+
+  public final class DegreesKt {
+  }
+
+  public enum FilterQuality {
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality High;
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality Low;
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality Medium;
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality None;
+  }
+
+  public final class Float16Kt {
+  }
+
+  public interface ImageBitmap {
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
+    method public androidx.compose.ui.graphics.ImageBitmapConfig getConfig();
+    method public boolean getHasAlpha();
+    method public int getHeight();
+    method public int getWidth();
+    method public void prepareToDraw();
+    method public void readPixels(int[] buffer, optional int startX, optional int startY, optional int width, optional int height, optional int bufferOffset, optional int stride);
+    property public abstract androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace;
+    property public abstract androidx.compose.ui.graphics.ImageBitmapConfig config;
+    property public abstract boolean hasAlpha;
+    property public abstract int height;
+    property public abstract int width;
+    field public static final androidx.compose.ui.graphics.ImageBitmap.Companion Companion;
+  }
+
+  public static final class ImageBitmap.Companion {
+  }
+
+  public enum ImageBitmapConfig {
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Alpha8;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Argb8888;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig F16;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Gpu;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Rgb565;
+  }
+
+  public final class ImageBitmapKt {
+    method public static androidx.compose.ui.graphics.ImageBitmap ImageBitmap(int width, int height, optional androidx.compose.ui.graphics.ImageBitmapConfig config, optional boolean hasAlpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+    method public static androidx.compose.ui.graphics.PixelMap toPixelMap(androidx.compose.ui.graphics.ImageBitmap, optional int startX, optional int startY, optional int width, optional int height, optional int[] buffer, optional int bufferOffset, optional int stride);
+  }
+
+  @androidx.compose.runtime.Immutable public final class LinearGradient extends androidx.compose.ui.graphics.ShaderBrush {
+    method public android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public final inline class Matrix {
+    ctor public Matrix();
+    method public static float[]! constructor-impl(optional float[] values);
+    method public static inline boolean equals-impl(float[]! p, Object? p1);
+    method public static boolean equals-impl0(float[] p1, float[] p2);
+    method public static inline operator float get-impl(float[] $this, int row, int column);
+    method public float[] getValues();
+    method public static inline int hashCode-impl(float[]! p);
+    method public static void invert-impl(float[]! $this);
+    method public static androidx.compose.ui.geometry.Rect map-impl(float[] $this, androidx.compose.ui.geometry.Rect rect);
+    method public static void map-impl(float[] $this, androidx.compose.ui.geometry.MutableRect rect);
+    method public static long map-k-4lQ0M(float[] $this, long point);
+    method public static void reset-impl(float[]! $this);
+    method public static void rotateX-impl(float[] $this, float degrees);
+    method public static void rotateY-impl(float[] $this, float degrees);
+    method public static void rotateZ-impl(float[] $this, float degrees);
+    method public static void scale-impl(float[] $this, optional float x, optional float y, optional float z);
+    method public static inline operator void set-impl(float[] $this, int row, int column, float v);
+    method public static void setFrom-58bKbWc(float[] $this, float[] matrix);
+    method public static operator void timesAssign-58bKbWc(float[] $this, float[] m);
+    method public static String toString-impl(float[]! $this);
+    method public static void translate-impl(float[] $this, optional float x, optional float y, optional float z);
+    property public final float[] values;
+    field public static final androidx.compose.ui.graphics.Matrix.Companion Companion;
+    field public static final int Perspective0 = 3; // 0x3
+    field public static final int Perspective1 = 7; // 0x7
+    field public static final int Perspective2 = 15; // 0xf
+    field public static final int ScaleX = 0; // 0x0
+    field public static final int ScaleY = 5; // 0x5
+    field public static final int ScaleZ = 10; // 0xa
+    field public static final int SkewX = 4; // 0x4
+    field public static final int SkewY = 1; // 0x1
+    field public static final int TranslateX = 12; // 0xc
+    field public static final int TranslateY = 13; // 0xd
+    field public static final int TranslateZ = 14; // 0xe
+  }
+
+  public static final class Matrix.Companion {
+  }
+
+  public final class MatrixKt {
+    method public static boolean isIdentity-58bKbWc(float[]);
+  }
+
+  public abstract sealed class Outline {
+    method public abstract androidx.compose.ui.geometry.Rect getBounds();
+    property public abstract androidx.compose.ui.geometry.Rect bounds;
+  }
+
+  public static final class Outline.Generic extends androidx.compose.ui.graphics.Outline {
+    ctor public Outline.Generic(androidx.compose.ui.graphics.Path path);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.graphics.Path getPath();
+    property public androidx.compose.ui.geometry.Rect bounds;
+    property public final androidx.compose.ui.graphics.Path path;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class Outline.Rectangle extends androidx.compose.ui.graphics.Outline {
+    ctor public Outline.Rectangle(androidx.compose.ui.geometry.Rect rect);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.geometry.Rect getRect();
+    property public androidx.compose.ui.geometry.Rect bounds;
+    property public final androidx.compose.ui.geometry.Rect rect;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class Outline.Rounded extends androidx.compose.ui.graphics.Outline {
+    ctor public Outline.Rounded(androidx.compose.ui.geometry.RoundRect roundRect);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.geometry.RoundRect getRoundRect();
+    property public androidx.compose.ui.geometry.Rect bounds;
+    property public final androidx.compose.ui.geometry.RoundRect roundRect;
+  }
+
+  public final class OutlineKt {
+    method public static void addOutline(androidx.compose.ui.graphics.Path, androidx.compose.ui.graphics.Outline outline);
+    method public static void drawOutline(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public static void drawOutline(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Paint paint);
+    method public static void drawOutline-mlewCHg(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+  }
+
+  public interface Paint {
+    method public android.graphics.Paint asFrameworkPaint();
+    method public float getAlpha();
+    method public androidx.compose.ui.graphics.BlendMode getBlendMode();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+    method public androidx.compose.ui.graphics.FilterQuality getFilterQuality();
+    method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+    method public android.graphics.Shader? getShader();
+    method public androidx.compose.ui.graphics.StrokeCap getStrokeCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getStrokeJoin();
+    method public float getStrokeMiterLimit();
+    method public float getStrokeWidth();
+    method public androidx.compose.ui.graphics.PaintingStyle getStyle();
+    method public boolean isAntiAlias();
+    method public void setAlpha(float p);
+    method public void setAntiAlias(boolean p);
+    method public void setBlendMode(androidx.compose.ui.graphics.BlendMode p);
+    method public void setColor-8_81llA(long p);
+    method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter? p);
+    method public void setFilterQuality(androidx.compose.ui.graphics.FilterQuality p);
+    method public void setPathEffect(androidx.compose.ui.graphics.PathEffect? p);
+    method public void setShader(android.graphics.Shader? p);
+    method public void setStrokeCap(androidx.compose.ui.graphics.StrokeCap p);
+    method public void setStrokeJoin(androidx.compose.ui.graphics.StrokeJoin p);
+    method public void setStrokeMiterLimit(float p);
+    method public void setStrokeWidth(float p);
+    method public void setStyle(androidx.compose.ui.graphics.PaintingStyle p);
+    property public abstract float alpha;
+    property public abstract androidx.compose.ui.graphics.BlendMode blendMode;
+    property public abstract long color;
+    property public abstract androidx.compose.ui.graphics.ColorFilter? colorFilter;
+    property public abstract androidx.compose.ui.graphics.FilterQuality filterQuality;
+    property public abstract boolean isAntiAlias;
+    property public abstract androidx.compose.ui.graphics.PathEffect? pathEffect;
+    property public abstract android.graphics.Shader? shader;
+    property public abstract androidx.compose.ui.graphics.StrokeCap strokeCap;
+    property public abstract androidx.compose.ui.graphics.StrokeJoin strokeJoin;
+    property public abstract float strokeMiterLimit;
+    property public abstract float strokeWidth;
+    property public abstract androidx.compose.ui.graphics.PaintingStyle style;
+  }
+
+  public final class PaintKt {
+    field public static final float DefaultAlpha = 1.0f;
+  }
+
+  public enum PaintingStyle {
+    enum_constant public static final androidx.compose.ui.graphics.PaintingStyle Fill;
+    enum_constant public static final androidx.compose.ui.graphics.PaintingStyle Stroke;
+  }
+
+  public interface Path {
+    method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.compose.ui.geometry.Rect oval);
+    method public void addPath-ej0GBII(androidx.compose.ui.graphics.Path path, optional long offset);
+    method public void addRect(androidx.compose.ui.geometry.Rect rect);
+    method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+    method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+    method public default void arcToRad(androidx.compose.ui.geometry.Rect rect, float startAngleRadians, float sweepAngleRadians, boolean forceMoveTo);
+    method public void close();
+    method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.graphics.PathFillType getFillType();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float x, float y);
+    method public void moveTo(float x, float y);
+    method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, androidx.compose.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+    method public void reset();
+    method public void setFillType(androidx.compose.ui.graphics.PathFillType p);
+    method public void translate-k-4lQ0M(long offset);
+    property public abstract androidx.compose.ui.graphics.PathFillType fillType;
+    property public abstract boolean isConvex;
+    property public abstract boolean isEmpty;
+    field public static final androidx.compose.ui.graphics.Path.Companion Companion;
+  }
+
+  public static final class Path.Companion {
+    method public androidx.compose.ui.graphics.Path combine(androidx.compose.ui.graphics.PathOperation operation, androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2);
+  }
+
+  public interface PathEffect {
+    field public static final androidx.compose.ui.graphics.PathEffect.Companion Companion;
+  }
+
+  public static final class PathEffect.Companion {
+    method public androidx.compose.ui.graphics.PathEffect chainPathEffect(androidx.compose.ui.graphics.PathEffect outer, androidx.compose.ui.graphics.PathEffect inner);
+    method public androidx.compose.ui.graphics.PathEffect cornerPathEffect(float radius);
+    method public androidx.compose.ui.graphics.PathEffect dashPathEffect(float[] intervals, optional float phase);
+    method public androidx.compose.ui.graphics.PathEffect stampedPathEffect(androidx.compose.ui.graphics.Path shape, float advance, float phase, androidx.compose.ui.graphics.StampedPathEffectStyle style);
+  }
+
+  public enum PathFillType {
+    enum_constant public static final androidx.compose.ui.graphics.PathFillType EvenOdd;
+    enum_constant public static final androidx.compose.ui.graphics.PathFillType NonZero;
+  }
+
+  public interface PathMeasure {
+    method public float getLength();
+    method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, optional boolean startWithMoveTo);
+    method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+    property public abstract float length;
+  }
+
+  public enum PathOperation {
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation difference;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation intersect;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation reverseDifference;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation union;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation xor;
+  }
+
+  public final class PixelMap {
+    ctor public PixelMap(int[] buffer, int width, int height, int bufferOffset, int stride);
+    method public operator long get-0d7_KjU(int x, int y);
+    method public int[] getBuffer();
+    method public int getBufferOffset();
+    method public int getHeight();
+    method public int getStride();
+    method public int getWidth();
+    property public final int[] buffer;
+    property public final int bufferOffset;
+    property public final int height;
+    property public final int stride;
+    property public final int width;
+  }
+
+  public enum PointMode {
+    enum_constant public static final androidx.compose.ui.graphics.PointMode Lines;
+    enum_constant public static final androidx.compose.ui.graphics.PointMode Points;
+    enum_constant public static final androidx.compose.ui.graphics.PointMode Polygon;
+  }
+
+  @androidx.compose.runtime.Immutable public final class RadialGradient extends androidx.compose.ui.graphics.ShaderBrush {
+    method public android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public final class RectHelper_androidKt {
+    method public static android.graphics.Rect toAndroidRect(androidx.compose.ui.geometry.Rect);
+    method public static android.graphics.RectF toAndroidRectF(androidx.compose.ui.geometry.Rect);
+    method public static androidx.compose.ui.geometry.Rect toComposeRect(android.graphics.Rect);
+  }
+
+  public final class RectangleShapeKt {
+    method public static androidx.compose.ui.graphics.Shape getRectangleShape();
+  }
+
+  @androidx.compose.runtime.Immutable public abstract class ShaderBrush extends androidx.compose.ui.graphics.Brush {
+    ctor public ShaderBrush();
+    method public final void applyTo-TJof4Gw(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+    method public abstract android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public final class ShaderKt {
+    method public static android.graphics.Shader ImageShader(androidx.compose.ui.graphics.ImageBitmap image, optional androidx.compose.ui.graphics.TileMode tileModeX, optional androidx.compose.ui.graphics.TileMode tileModeY);
+    method public static android.graphics.Shader LinearGradientShader-GfyHbQM(long from, long to, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method public static android.graphics.Shader RadialGradientShader-cY6o93o(long center, float radius, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method public static android.graphics.Shader SweepGradientShader-GpNgDDw(long center, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Shadow {
+    method public androidx.compose.ui.graphics.Shadow copy-vQQzcCI(optional long color, optional long offset, optional float blurRadius);
+    method public float getBlurRadius();
+    method public long getColor-0d7_KjU();
+    method public long getOffset-F1C5BW0();
+    property public final float blurRadius;
+    property public final long color;
+    property public final long offset;
+    field public static final androidx.compose.ui.graphics.Shadow.Companion Companion;
+  }
+
+  public static final class Shadow.Companion {
+    method public androidx.compose.ui.graphics.Shadow getNone();
+    property public final androidx.compose.ui.graphics.Shadow None;
+  }
+
+  public final class ShadowKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.Shadow lerp(androidx.compose.ui.graphics.Shadow start, androidx.compose.ui.graphics.Shadow stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public interface Shape {
+    method public androidx.compose.ui.graphics.Outline createOutline-9w1PWio(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+  }
+
+  @androidx.compose.runtime.Immutable public final class SolidColor extends androidx.compose.ui.graphics.Brush {
+    method public void applyTo-TJof4Gw(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+    method public long getValue-0d7_KjU();
+    property public final long value;
+  }
+
+  public enum StampedPathEffectStyle {
+    enum_constant public static final androidx.compose.ui.graphics.StampedPathEffectStyle Morph;
+    enum_constant public static final androidx.compose.ui.graphics.StampedPathEffectStyle Rotate;
+    enum_constant public static final androidx.compose.ui.graphics.StampedPathEffectStyle Translate;
+  }
+
+  public enum StrokeCap {
+    enum_constant public static final androidx.compose.ui.graphics.StrokeCap Butt;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeCap Round;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeCap Square;
+  }
+
+  public enum StrokeJoin {
+    enum_constant public static final androidx.compose.ui.graphics.StrokeJoin Bevel;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeJoin Miter;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeJoin Round;
+  }
+
+  @androidx.compose.runtime.Immutable public final class SweepGradient extends androidx.compose.ui.graphics.ShaderBrush {
+    method public android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public enum TileMode {
+    enum_constant public static final androidx.compose.ui.graphics.TileMode Clamp;
+    enum_constant public static final androidx.compose.ui.graphics.TileMode Mirror;
+    enum_constant public static final androidx.compose.ui.graphics.TileMode Repeated;
+  }
+
+  public enum VertexMode {
+    enum_constant public static final androidx.compose.ui.graphics.VertexMode TriangleFan;
+    enum_constant public static final androidx.compose.ui.graphics.VertexMode TriangleStrip;
+    enum_constant public static final androidx.compose.ui.graphics.VertexMode Triangles;
+  }
+
+  public final class Vertices {
+    ctor public Vertices(androidx.compose.ui.graphics.VertexMode vertexMode, java.util.List<androidx.compose.ui.geometry.Offset> positions, java.util.List<androidx.compose.ui.geometry.Offset> textureCoordinates, java.util.List<androidx.compose.ui.graphics.Color> colors, java.util.List<java.lang.Integer> indices);
+    method public int[] getColors();
+    method public short[] getIndices();
+    method public float[] getPositions();
+    method public float[] getTextureCoordinates();
+    method public androidx.compose.ui.graphics.VertexMode getVertexMode();
+    property public final int[] colors;
+    property public final short[] indices;
+    property public final float[] positions;
+    property public final float[] textureCoordinates;
+    property public final androidx.compose.ui.graphics.VertexMode vertexMode;
+  }
+
+}
+
+package androidx.compose.ui.graphics.colorspace {
+
+  public enum Adaptation {
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.Adaptation Bradford;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.Adaptation Ciecat02;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.Adaptation VonKries;
+  }
+
+  public enum ColorModel {
+    method public final int getComponentCount();
+    property public final int componentCount;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Cmyk;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Lab;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Rgb;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Xyz;
+  }
+
+  public abstract class ColorSpace {
+    ctor public ColorSpace(String name, androidx.compose.ui.graphics.colorspace.ColorModel model);
+    method public final float[] fromXyz(float x, float y, float z);
+    method public abstract float[] fromXyz(float[] v);
+    method public final int getComponentCount();
+    method public abstract float getMaxValue(int component);
+    method public abstract float getMinValue(int component);
+    method public final androidx.compose.ui.graphics.colorspace.ColorModel getModel();
+    method public final String getName();
+    method public boolean isSrgb();
+    method public abstract boolean isWideGamut();
+    method public final float[] toXyz(float r, float g, float b);
+    method public abstract float[] toXyz(float[] v);
+    property public final int componentCount;
+    property public boolean isSrgb;
+    property public abstract boolean isWideGamut;
+    property public final androidx.compose.ui.graphics.colorspace.ColorModel model;
+    property public final String name;
+  }
+
+  public final class ColorSpaceKt {
+    method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, optional androidx.compose.ui.graphics.colorspace.Adaptation adaptation);
+    method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint);
+    method public static androidx.compose.ui.graphics.colorspace.Connector connect(androidx.compose.ui.graphics.colorspace.ColorSpace, optional androidx.compose.ui.graphics.colorspace.ColorSpace destination, optional androidx.compose.ui.graphics.colorspace.RenderIntent intent);
+  }
+
+  public final class ColorSpaces {
+    method public androidx.compose.ui.graphics.colorspace.Rgb getAces();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getAcescg();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getAdobeRgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getBt2020();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getBt709();
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieLab();
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieXyz();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getDciP3();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getDisplayP3();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getExtendedSrgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getLinearExtendedSrgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getLinearSrgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getNtsc1953();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getProPhotoRgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getSmpteC();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getSrgb();
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace? match(float[] toXYZD50, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Aces;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Acescg;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb AdobeRgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Bt2020;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Bt709;
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieLab;
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieXyz;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb DciP3;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb DisplayP3;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb ExtendedSrgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb LinearExtendedSrgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb LinearSrgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Ntsc1953;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb ProPhotoRgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb SmpteC;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Srgb;
+    field public static final androidx.compose.ui.graphics.colorspace.ColorSpaces INSTANCE;
+  }
+
+  public class Connector {
+    method public final androidx.compose.ui.graphics.colorspace.ColorSpace getDestination();
+    method public final androidx.compose.ui.graphics.colorspace.RenderIntent getRenderIntent();
+    method public final androidx.compose.ui.graphics.colorspace.ColorSpace getSource();
+    method public final float[] transform(float r, float g, float b);
+    method public float[] transform(float[] v);
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace destination;
+    property public final androidx.compose.ui.graphics.colorspace.RenderIntent renderIntent;
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace source;
+  }
+
+  public final class Illuminant {
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getA();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getB();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getC();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD50();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD55();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD60();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD65();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD75();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getE();
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint A;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint B;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint C;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D50;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D55;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D60;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D65;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D75;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint E;
+    field public static final androidx.compose.ui.graphics.colorspace.Illuminant INSTANCE;
+  }
+
+  public enum RenderIntent {
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Absolute;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Perceptual;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Relative;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Saturation;
+  }
+
+  public final class Rgb extends androidx.compose.ui.graphics.colorspace.ColorSpace {
+    ctor public Rgb(String name, float[] toXYZ, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf);
+    ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf, float min, float max);
+    ctor public Rgb(String name, float[] toXYZ, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(String name, float[] toXYZ, double gamma);
+    ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, double gamma);
+    method public float[] fromLinear(float r, float g, float b);
+    method public float[] fromLinear(float[] v);
+    method public float[] fromXyz(float[] v);
+    method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getEotf();
+    method public float[] getInverseTransform();
+    method public float[] getInverseTransform(float[] inverseTransform);
+    method public float getMaxValue(int component);
+    method public float getMinValue(int component);
+    method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getOetf();
+    method public float[] getPrimaries();
+    method public float[] getPrimaries(float[] primaries);
+    method public androidx.compose.ui.graphics.colorspace.TransferParameters? getTransferParameters();
+    method public float[] getTransform();
+    method public float[] getTransform(float[] transform);
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getWhitePoint();
+    method public boolean isWideGamut();
+    method public float[] toLinear(float r, float g, float b);
+    method public float[] toLinear(float[] v);
+    method public float[] toXyz(float[] v);
+    property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> eotf;
+    property public boolean isSrgb;
+    property public boolean isWideGamut;
+    property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> oetf;
+    property public final androidx.compose.ui.graphics.colorspace.TransferParameters? transferParameters;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint;
+  }
+
+  public final class TransferParameters {
+    ctor public TransferParameters(double gamma, double a, double b, double c, double d, optional double e, optional double f);
+    method public double component1();
+    method public double component2();
+    method public double component3();
+    method public double component4();
+    method public double component5();
+    method public double component6();
+    method public double component7();
+    method public androidx.compose.ui.graphics.colorspace.TransferParameters copy(double gamma, double a, double b, double c, double d, double e, double f);
+    method public double getA();
+    method public double getB();
+    method public double getC();
+    method public double getD();
+    method public double getE();
+    method public double getF();
+    method public double getGamma();
+    property public final double a;
+    property public final double b;
+    property public final double c;
+    property public final double d;
+    property public final double e;
+    property public final double f;
+    property public final double gamma;
+  }
+
+  public final class WhitePoint {
+    ctor public WhitePoint(float x, float y);
+    ctor public WhitePoint(float x, float y, float z);
+    method public float component1();
+    method public float component2();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+}
+
+package androidx.compose.ui.graphics.drawscope {
+
+  public final class CanvasDrawScope implements androidx.compose.ui.graphics.drawscope.DrawScope {
+    ctor public CanvasDrawScope();
+    method public inline void draw-jkGVKLE(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.graphics.Canvas canvas, long size, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public void drawArc-BcZ8TnY(long color, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawArc-C-Io9bM(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-NGaRamM(long color, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-m-UMHxE(androidx.compose.ui.graphics.Brush brush, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-JUiai_k(androidx.compose.ui.graphics.ImageBitmap image, long topLeft, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-Yc2aOMw(androidx.compose.ui.graphics.ImageBitmap image, long srcOffset, long srcSize, long dstOffset, long dstSize, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-QXZmVdc(long color, long start, long end, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-UXw4dv4(androidx.compose.ui.graphics.Brush brush, long start, long end, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-IdEHoqk(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath-tilSWAQ(androidx.compose.ui.graphics.Path path, long color, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, androidx.compose.ui.graphics.Brush brush, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints-Aqy9O-k(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, long color, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-IdEHoqk(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-fNghmuc(long color, long topLeft, long size, long cornerRadius, androidx.compose.ui.graphics.drawscope.DrawStyle style, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-sDDzLXA(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, long cornerRadius, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public float getDensity();
+    method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+    method public float getFontScale();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    property public float density;
+    property public androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+    property public float fontScale;
+    property public androidx.compose.ui.unit.LayoutDirection layoutDirection;
+  }
+
+  public final class CanvasDrawScopeKt {
+  }
+
+  public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
+    method public void drawContent();
+  }
+
+  public interface DrawContext {
+    method public androidx.compose.ui.graphics.Canvas getCanvas();
+    method public long getSize-NH-jbRc();
+    method public androidx.compose.ui.graphics.drawscope.DrawTransform getTransform();
+    method public void setSize-uvyYCjk(long p);
+    property public abstract androidx.compose.ui.graphics.Canvas canvas;
+    property public abstract long size;
+    property public abstract androidx.compose.ui.graphics.drawscope.DrawTransform transform;
+  }
+
+  @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawScope extends androidx.compose.ui.unit.Density {
+    method public void drawArc-BcZ8TnY(long color, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawArc-C-Io9bM(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-NGaRamM(long color, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-m-UMHxE(androidx.compose.ui.graphics.Brush brush, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-JUiai_k(androidx.compose.ui.graphics.ImageBitmap image, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-Yc2aOMw(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-QXZmVdc(long color, long start, long end, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-UXw4dv4(androidx.compose.ui.graphics.Brush brush, long start, long end, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-IdEHoqk(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath-tilSWAQ(androidx.compose.ui.graphics.Path path, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, androidx.compose.ui.graphics.Brush brush, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints-Aqy9O-k(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, long color, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-IdEHoqk(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-fNghmuc(long color, optional long topLeft, optional long size, optional long cornerRadius, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-sDDzLXA(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional long cornerRadius, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public default long getCenter-F1C5BW0();
+    method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public default long getSize-NH-jbRc();
+    method public long offsetSize(long, long offset);
+    property public default long center;
+    property public abstract androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+    property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public default long size;
+    field public static final androidx.compose.ui.graphics.drawscope.DrawScope.Companion Companion;
+  }
+
+  public static final class DrawScope.Companion {
+    method public androidx.compose.ui.graphics.BlendMode getDefaultBlendMode();
+    property public final androidx.compose.ui.graphics.BlendMode DefaultBlendMode;
+  }
+
+  public final class DrawScopeKt {
+    method public static inline void clipPath(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Path path, optional androidx.compose.ui.graphics.ClipOp clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void clipRect(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, optional float right, optional float bottom, optional androidx.compose.ui.graphics.ClipOp clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void drawIntoCanvas(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float left, float top, float right, float bottom, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float inset, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, optional float horizontal, optional float vertical, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void rotate-FvlOZkk(androidx.compose.ui.graphics.drawscope.DrawScope, float degrees, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void rotateRad-FvlOZkk(androidx.compose.ui.graphics.drawscope.DrawScope, float radians, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void scale-FvlOZkk(androidx.compose.ui.graphics.drawscope.DrawScope, float scale, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void scale-LCqtnZ0(androidx.compose.ui.graphics.drawscope.DrawScope, float scaleX, float scaleY, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void translate(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void withTransform(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawTransform,kotlin.Unit> transformBlock, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> drawBlock);
+  }
+
+  @kotlin.DslMarker public @interface DrawScopeMarker {
+  }
+
+  public abstract sealed class DrawStyle {
+  }
+
+  @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawTransform {
+    method public void clipPath(androidx.compose.ui.graphics.Path path, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void clipRect(optional float left, optional float top, optional float right, optional float bottom, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public default long getCenter-F1C5BW0();
+    method public long getSize-NH-jbRc();
+    method public void inset(float left, float top, float right, float bottom);
+    method public void rotate-KYFOyyg(float degrees, optional long pivot);
+    method public void scale-QguGWxw(float scaleX, float scaleY, optional long pivot);
+    method public void transform-58bKbWc(float[] matrix);
+    method public void translate(optional float left, optional float top);
+    property public default long center;
+    property public abstract long size;
+  }
+
+  public final class DrawTransformKt {
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, optional float horizontal, optional float vertical);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, float inset);
+    method public static inline void rotateRad-kdYHfaE(androidx.compose.ui.graphics.drawscope.DrawTransform, float radians, optional long pivot);
+    method public static inline void scale-kdYHfaE(androidx.compose.ui.graphics.drawscope.DrawTransform, float scale, optional long pivot);
+  }
+
+  public final class Fill extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+    field public static final androidx.compose.ui.graphics.drawscope.Fill INSTANCE;
+  }
+
+  public final class Stroke extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+    ctor public Stroke(optional float width, optional float miter, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.StrokeJoin join, optional androidx.compose.ui.graphics.PathEffect? pathEffect);
+    method public androidx.compose.ui.graphics.StrokeCap getCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getJoin();
+    method public float getMiter();
+    method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+    method public float getWidth();
+    property public final androidx.compose.ui.graphics.StrokeCap cap;
+    property public final androidx.compose.ui.graphics.StrokeJoin join;
+    property public final float miter;
+    property public final androidx.compose.ui.graphics.PathEffect? pathEffect;
+    property public final float width;
+    field public static final androidx.compose.ui.graphics.drawscope.Stroke.Companion Companion;
+    field public static final float DefaultMiter = 4.0f;
+    field public static final float HairlineWidth = 0.0f;
+  }
+
+  public static final class Stroke.Companion {
+    method public androidx.compose.ui.graphics.StrokeCap getDefaultCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getDefaultJoin();
+    property public final androidx.compose.ui.graphics.StrokeCap DefaultCap;
+    property public final androidx.compose.ui.graphics.StrokeJoin DefaultJoin;
+  }
+
+}
+
+package androidx.compose.ui.graphics.painter {
+
+  public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
+    method public long getIntrinsicSize-NH-jbRc();
+    method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public long intrinsicSize;
+  }
+
+  public final class ColorPainter extends androidx.compose.ui.graphics.painter.Painter {
+    method public long getColor-0d7_KjU();
+    method public long getIntrinsicSize-NH-jbRc();
+    method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public final long color;
+    property public long intrinsicSize;
+  }
+
+  public abstract class Painter {
+    ctor public Painter();
+    method protected boolean applyAlpha(float alpha);
+    method protected boolean applyColorFilter(androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method protected boolean applyLayoutDirection(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public final void draw-ty3CEPU(androidx.compose.ui.graphics.drawscope.DrawScope, long size, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method public abstract long getIntrinsicSize-NH-jbRc();
+    method protected abstract void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public abstract long intrinsicSize;
+  }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+  public final class PathBuilder {
+    ctor public PathBuilder();
+    method public androidx.compose.ui.graphics.vector.PathBuilder arcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder arcToRelative(float a, float b, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float dx1, float dy1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder close();
+    method public androidx.compose.ui.graphics.vector.PathBuilder curveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.compose.ui.graphics.vector.PathBuilder curveToRelative(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getNodes();
+    method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineTo(float x);
+    method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineToRelative(float dx);
+    method public androidx.compose.ui.graphics.vector.PathBuilder lineTo(float x, float y);
+    method public androidx.compose.ui.graphics.vector.PathBuilder lineToRelative(float dx, float dy);
+    method public androidx.compose.ui.graphics.vector.PathBuilder moveTo(float x, float y);
+    method public androidx.compose.ui.graphics.vector.PathBuilder moveToRelative(float dx, float dy);
+    method public androidx.compose.ui.graphics.vector.PathBuilder quadTo(float x1, float y1, float x2, float y2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder quadToRelative(float dx1, float dy1, float dx2, float dy2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveTo(float x1, float y1, float x2, float y2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveToRelative(float dx1, float dy1, float dx2, float dy2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadTo(float x1, float y1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadToRelative(float dx1, float dy1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineTo(float y);
+    method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineToRelative(float dy);
+  }
+
+  @androidx.compose.runtime.Immutable public abstract sealed class PathNode {
+    method public final boolean isCurve();
+    method public final boolean isQuad();
+    property public final boolean isCurve;
+    property public final boolean isQuad;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.ArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.ArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public boolean component4();
+    method public boolean component5();
+    method public float component6();
+    method public float component7();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.ArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+    method public float getArcStartX();
+    method public float getArcStartY();
+    method public float getHorizontalEllipseRadius();
+    method public float getTheta();
+    method public float getVerticalEllipseRadius();
+    method public boolean isMoreThanHalf();
+    method public boolean isPositiveArc();
+    property public final float arcStartX;
+    property public final float arcStartY;
+    property public final float horizontalEllipseRadius;
+    property public final boolean isMoreThanHalf;
+    property public final boolean isPositiveArc;
+    property public final float theta;
+    property public final float verticalEllipseRadius;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.Close extends androidx.compose.ui.graphics.vector.PathNode {
+    field public static final androidx.compose.ui.graphics.vector.PathNode.Close INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.CurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.CurveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public float component5();
+    method public float component6();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.CurveTo copy(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public float getX1();
+    method public float getX2();
+    method public float getX3();
+    method public float getY1();
+    method public float getY2();
+    method public float getY3();
+    property public final float x1;
+    property public final float x2;
+    property public final float x3;
+    property public final float y1;
+    property public final float y2;
+    property public final float y3;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.HorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.HorizontalTo(float x);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.HorizontalTo copy(float x);
+    method public float getX();
+    property public final float x;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.LineTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.LineTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.LineTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.MoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.MoveTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.MoveTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.QuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.QuadTo(float x1, float y1, float x2, float y2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.QuadTo copy(float x1, float y1, float x2, float y2);
+    method public float getX1();
+    method public float getX2();
+    method public float getY1();
+    method public float getY2();
+    property public final float x1;
+    property public final float x2;
+    property public final float y1;
+    property public final float y2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.ReflectiveCurveTo(float x1, float y1, float x2, float y2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.ReflectiveCurveTo copy(float x1, float y1, float x2, float y2);
+    method public float getX1();
+    method public float getX2();
+    method public float getY1();
+    method public float getY2();
+    property public final float x1;
+    property public final float x2;
+    property public final float y1;
+    property public final float y2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.ReflectiveQuadTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.ReflectiveQuadTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public boolean component4();
+    method public boolean component5();
+    method public float component6();
+    method public float component7();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+    method public float getArcStartDx();
+    method public float getArcStartDy();
+    method public float getHorizontalEllipseRadius();
+    method public float getTheta();
+    method public float getVerticalEllipseRadius();
+    method public boolean isMoreThanHalf();
+    method public boolean isPositiveArc();
+    property public final float arcStartDx;
+    property public final float arcStartDy;
+    property public final float horizontalEllipseRadius;
+    property public final boolean isMoreThanHalf;
+    property public final boolean isPositiveArc;
+    property public final float theta;
+    property public final float verticalEllipseRadius;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeCurveTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public float component5();
+    method public float component6();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeCurveTo copy(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public float getDx1();
+    method public float getDx2();
+    method public float getDx3();
+    method public float getDy1();
+    method public float getDy2();
+    method public float getDy3();
+    property public final float dx1;
+    property public final float dx2;
+    property public final float dx3;
+    property public final float dy1;
+    property public final float dy2;
+    property public final float dy3;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeHorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeHorizontalTo(float dx);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeHorizontalTo copy(float dx);
+    method public float getDx();
+    property public final float dx;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeLineTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeLineTo(float dx, float dy);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeLineTo copy(float dx, float dy);
+    method public float getDx();
+    method public float getDy();
+    property public final float dx;
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeMoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeMoveTo(float dx, float dy);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeMoveTo copy(float dx, float dy);
+    method public float getDx();
+    method public float getDy();
+    property public final float dx;
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeQuadTo(float dx1, float dy1, float dx2, float dy2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeQuadTo copy(float dx1, float dy1, float dx2, float dy2);
+    method public float getDx1();
+    method public float getDx2();
+    method public float getDy1();
+    method public float getDy2();
+    property public final float dx1;
+    property public final float dx2;
+    property public final float dy1;
+    property public final float dy2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveCurveTo(float dx1, float dy1, float dx2, float dy2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveCurveTo copy(float dx1, float dy1, float dx2, float dy2);
+    method public float getDx1();
+    method public float getDx2();
+    method public float getDy1();
+    method public float getDy2();
+    property public final float dx1;
+    property public final float dx2;
+    property public final float dy1;
+    property public final float dy2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveQuadTo(float dx, float dy);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveQuadTo copy(float dx, float dy);
+    method public float getDx();
+    method public float getDy();
+    property public final float dx;
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeVerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeVerticalTo(float dy);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeVerticalTo copy(float dy);
+    method public float getDy();
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.VerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.VerticalTo(float y);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.VerticalTo copy(float y);
+    method public float getY();
+    property public final float y;
+  }
+
+  public final class PathNodeKt {
+  }
+
+  public final class PathParser {
+    ctor public PathParser();
+    method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
+    method public void clear();
+    method public androidx.compose.ui.graphics.vector.PathParser parsePathString(String pathData);
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> toNodes();
+    method public androidx.compose.ui.graphics.Path toPath(optional androidx.compose.ui.graphics.Path target);
+  }
+
+}
+

compose/ui/ui-graphics/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-graphics/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-graphics/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..4ac2634
--- /dev/null
+++ b/compose/ui/ui-graphics/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,1419 @@
+// Signature format: 4.0
+package androidx.compose.ui.graphics {
+
+  public final class AndroidBlendMode_androidKt {
+    method public static boolean isSupported(androidx.compose.ui.graphics.BlendMode);
+  }
+
+  public final class AndroidCanvas_androidKt {
+    method public static androidx.compose.ui.graphics.Canvas Canvas(android.graphics.Canvas c);
+    method public static android.graphics.Canvas getNativeCanvas(androidx.compose.ui.graphics.Canvas);
+  }
+
+  public final class AndroidColorFilter_androidKt {
+    method public static android.graphics.ColorFilter asAndroidColorFilter(androidx.compose.ui.graphics.ColorFilter);
+    method public static androidx.compose.ui.graphics.ColorFilter asComposeColorFilter(android.graphics.ColorFilter);
+  }
+
+  public final class AndroidImageBitmap_androidKt {
+    method public static android.graphics.Bitmap asAndroidBitmap(androidx.compose.ui.graphics.ImageBitmap);
+    method public static androidx.compose.ui.graphics.ImageBitmap asImageBitmap(android.graphics.Bitmap);
+  }
+
+  public final class AndroidMatrixConversions_androidKt {
+    method public static void setFrom-7lL006A(float[], android.graphics.Matrix matrix);
+    method public static void setFrom-8AuSnpc(android.graphics.Matrix, float[] matrix);
+  }
+
+  public final class AndroidPaint implements androidx.compose.ui.graphics.Paint {
+    ctor public AndroidPaint();
+    method public android.graphics.Paint asFrameworkPaint();
+    method public float getAlpha();
+    method public androidx.compose.ui.graphics.BlendMode getBlendMode();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+    method public androidx.compose.ui.graphics.FilterQuality getFilterQuality();
+    method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+    method public android.graphics.Shader? getShader();
+    method public androidx.compose.ui.graphics.StrokeCap getStrokeCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getStrokeJoin();
+    method public float getStrokeMiterLimit();
+    method public float getStrokeWidth();
+    method public androidx.compose.ui.graphics.PaintingStyle getStyle();
+    method public boolean isAntiAlias();
+    method public void setAlpha(float value);
+    method public void setAntiAlias(boolean value);
+    method public void setBlendMode(androidx.compose.ui.graphics.BlendMode value);
+    method public void setColor-8_81llA(long color);
+    method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter? value);
+    method public void setFilterQuality(androidx.compose.ui.graphics.FilterQuality value);
+    method public void setPathEffect(androidx.compose.ui.graphics.PathEffect? value);
+    method public void setShader(android.graphics.Shader? value);
+    method public void setStrokeCap(androidx.compose.ui.graphics.StrokeCap value);
+    method public void setStrokeJoin(androidx.compose.ui.graphics.StrokeJoin value);
+    method public void setStrokeMiterLimit(float value);
+    method public void setStrokeWidth(float value);
+    method public void setStyle(androidx.compose.ui.graphics.PaintingStyle value);
+    property public float alpha;
+    property public androidx.compose.ui.graphics.BlendMode blendMode;
+    property public long color;
+    property public androidx.compose.ui.graphics.ColorFilter? colorFilter;
+    property public androidx.compose.ui.graphics.FilterQuality filterQuality;
+    property public boolean isAntiAlias;
+    property public androidx.compose.ui.graphics.PathEffect? pathEffect;
+    property public android.graphics.Shader? shader;
+    property public androidx.compose.ui.graphics.StrokeCap strokeCap;
+    property public androidx.compose.ui.graphics.StrokeJoin strokeJoin;
+    property public float strokeMiterLimit;
+    property public float strokeWidth;
+    property public androidx.compose.ui.graphics.PaintingStyle style;
+  }
+
+  public final class AndroidPaint_androidKt {
+    method public static androidx.compose.ui.graphics.Paint Paint();
+  }
+
+  public final class AndroidPath implements androidx.compose.ui.graphics.Path {
+    ctor public AndroidPath(optional android.graphics.Path internalPath);
+    method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.compose.ui.geometry.Rect oval);
+    method public void addPath-ej0GBII(androidx.compose.ui.graphics.Path path, long offset);
+    method public void addRect(androidx.compose.ui.geometry.Rect rect);
+    method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+    method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+    method public void close();
+    method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.graphics.PathFillType getFillType();
+    method public android.graphics.Path getInternalPath();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float x, float y);
+    method public void moveTo(float x, float y);
+    method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, androidx.compose.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+    method public void reset();
+    method public void setFillType(androidx.compose.ui.graphics.PathFillType value);
+    method public void translate-k-4lQ0M(long offset);
+    property public androidx.compose.ui.graphics.PathFillType fillType;
+    property public final android.graphics.Path internalPath;
+    property public boolean isConvex;
+    property public boolean isEmpty;
+  }
+
+  public final class AndroidPathEffect_androidKt {
+    method public static android.graphics.PathEffect asAndroidPathEffect(androidx.compose.ui.graphics.PathEffect);
+    method public static androidx.compose.ui.graphics.PathEffect toComposePathEffect(android.graphics.PathEffect);
+  }
+
+  public final class AndroidPathMeasure implements androidx.compose.ui.graphics.PathMeasure {
+    method public float getLength();
+    method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, boolean startWithMoveTo);
+    method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+    property public float length;
+  }
+
+  public final class AndroidPathMeasure_androidKt {
+    method public static androidx.compose.ui.graphics.PathMeasure PathMeasure();
+  }
+
+  public final class AndroidPath_androidKt {
+    method public static androidx.compose.ui.graphics.Path Path();
+    method public static inline android.graphics.Path asAndroidPath(androidx.compose.ui.graphics.Path);
+    method public static androidx.compose.ui.graphics.Path asComposePath(android.graphics.Path);
+  }
+
+  public final class AndroidShader_androidKt {
+  }
+
+  public final class AndroidTileMode_androidKt {
+    method public static android.graphics.Shader.TileMode toNativeTileMode(androidx.compose.ui.graphics.TileMode);
+  }
+
+  public final class AndroidVertexMode_androidKt {
+    method public static android.graphics.Canvas.VertexMode toNativeVertexMode(androidx.compose.ui.graphics.VertexMode);
+  }
+
+  public enum BlendMode {
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Clear;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Color;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode ColorBurn;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode ColorDodge;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Darken;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Difference;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Dst;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstAtop;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstIn;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstOut;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstOver;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Exclusion;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Hardlight;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Hue;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Lighten;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Luminosity;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Modulate;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Multiply;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Overlay;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Plus;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Saturation;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Screen;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Softlight;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Src;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcAtop;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcIn;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcOut;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcOver;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Xor;
+  }
+
+  @androidx.compose.runtime.Immutable public abstract sealed class Brush {
+    method public abstract void applyTo-TJof4Gw(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+    field public static final androidx.compose.ui.graphics.Brush.Companion Companion;
+  }
+
+  public static final class Brush.Companion {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startX, optional float endX, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startX, optional float endX, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient-7_sGemo(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long start, optional long end, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient-K4jYFb0(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long start, optional long end, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient-YU3LRu0(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center, optional float radius, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient-g04MWJE(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center, optional float radius, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient-PvDSl28(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient-acbAMd8(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startY, optional float endY, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startY, optional float endY, optional androidx.compose.ui.graphics.TileMode tileMode);
+  }
+
+  public final class BrushKt {
+    method public static androidx.compose.ui.graphics.ShaderBrush ShaderBrush(android.graphics.Shader shader);
+  }
+
+  public interface Canvas {
+    method public void clipPath(androidx.compose.ui.graphics.Path path, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public default void clipRect(androidx.compose.ui.geometry.Rect rect, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void clipRect(float left, float top, float right, float bottom, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void concat-58bKbWc(float[] matrix);
+    method public void disableZ();
+    method public default void drawArc(androidx.compose.ui.geometry.Rect rect, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+    method public void drawArc(float left, float top, float right, float bottom, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+    method public default void drawArcRad(androidx.compose.ui.geometry.Rect rect, float startAngleRad, float sweepAngleRad, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+    method public void drawCircle-tVKstsI(long center, float radius, androidx.compose.ui.graphics.Paint paint);
+    method public void drawImage-uwcbMjI(androidx.compose.ui.graphics.ImageBitmap image, long topLeftOffset, androidx.compose.ui.graphics.Paint paint);
+    method public void drawImageRect-bgE79EM(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, androidx.compose.ui.graphics.Paint paint);
+    method public void drawLine-bYPfCD8(long p1, long p2, androidx.compose.ui.graphics.Paint paint);
+    method public default void drawOval(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+    method public void drawOval(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+    method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Paint paint);
+    method public void drawPoints(androidx.compose.ui.graphics.PointMode pointMode, java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRawPoints(androidx.compose.ui.graphics.PointMode pointMode, float[] points, androidx.compose.ui.graphics.Paint paint);
+    method public default void drawRect(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRect(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.compose.ui.graphics.Paint paint);
+    method public void drawVertices(androidx.compose.ui.graphics.Vertices vertices, androidx.compose.ui.graphics.BlendMode blendMode, androidx.compose.ui.graphics.Paint paint);
+    method public void enableZ();
+    method public void restore();
+    method public void rotate(float degrees);
+    method public void save();
+    method public void saveLayer(androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint);
+    method public void scale(float sx, optional float sy);
+    method public void skew(float sx, float sy);
+    method public default void skewRad(float sxRad, float syRad);
+    method public void translate(float dx, float dy);
+  }
+
+  public final class CanvasHolder {
+    ctor public CanvasHolder();
+    method public inline void drawInto(android.graphics.Canvas targetCanvas, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+  }
+
+  public final class CanvasKt {
+    method public static androidx.compose.ui.graphics.Canvas Canvas(androidx.compose.ui.graphics.ImageBitmap image);
+    method public static void rotate(androidx.compose.ui.graphics.Canvas, float degrees, float pivotX, float pivotY);
+    method public static void rotateRad(androidx.compose.ui.graphics.Canvas, float radians, optional float pivotX, optional float pivotY);
+    method public static void scale(androidx.compose.ui.graphics.Canvas, float sx, optional float sy, float pivotX, float pivotY);
+    method public static inline void withSave(androidx.compose.ui.graphics.Canvas, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public static inline void withSaveLayer(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public enum ClipOp {
+    enum_constant public static final androidx.compose.ui.graphics.ClipOp Difference;
+    enum_constant public static final androidx.compose.ui.graphics.ClipOp Intersect;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Color {
+    ctor public Color();
+    method @androidx.compose.runtime.Stable public static operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component2-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component3-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component4-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator androidx.compose.ui.graphics.colorspace.ColorSpace component5-impl(long $this);
+    method public static long constructor-impl(long value);
+    method public static long convert-0d7_KjU(long $this, androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+    method @androidx.compose.runtime.Stable public static long copy-0d7_KjU(long $this, optional float alpha, optional float red, optional float green, optional float blue);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getAlpha-impl(long $this);
+    method public static float getBlue-impl(long $this);
+    method public static androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace-impl(long $this);
+    method public static float getGreen-impl(long $this);
+    method public static float getRed-impl(long $this);
+    method public long getValue-s-VKNKU();
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static String toString-impl(long $this);
+    property public final long value;
+    field public static final androidx.compose.ui.graphics.Color.Companion Companion;
+  }
+
+  public static final class Color.Companion {
+    method public long getBlack-0d7_KjU();
+    method public long getBlue-0d7_KjU();
+    method public long getCyan-0d7_KjU();
+    method public long getDarkGray-0d7_KjU();
+    method public long getGray-0d7_KjU();
+    method public long getGreen-0d7_KjU();
+    method public long getLightGray-0d7_KjU();
+    method public long getMagenta-0d7_KjU();
+    method public long getRed-0d7_KjU();
+    method public long getTransparent-0d7_KjU();
+    method public long getUnspecified-0d7_KjU();
+    method public long getWhite-0d7_KjU();
+    method public long getYellow-0d7_KjU();
+    property public final long Black;
+    property public final long Blue;
+    property public final long Cyan;
+    property public final long DarkGray;
+    property public final long Gray;
+    property public final long Green;
+    property public final long LightGray;
+    property public final long Magenta;
+    property public final long Red;
+    property public final long Transparent;
+    property public final long Unspecified;
+    property public final long White;
+    property public final long Yellow;
+  }
+
+  @androidx.compose.runtime.Immutable public final class ColorFilter {
+    field public static final androidx.compose.ui.graphics.ColorFilter.Companion Companion;
+  }
+
+  public static final class ColorFilter.Companion {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter colorMatrix-jHG-Opc(float[] colorMatrix);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter lighting-6xK2E-Q(long multiply, long add);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter tint-aamYUWA(long color, optional androidx.compose.ui.graphics.BlendMode blendMode);
+  }
+
+  public final class ColorKt {
+    method @androidx.compose.runtime.Stable public static long Color(float red, float green, float blue, optional float alpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+    method @androidx.compose.runtime.Stable public static long Color(int color);
+    method @androidx.compose.runtime.Stable public static long Color(long color);
+    method @androidx.compose.runtime.Stable public static long Color(int red, int green, int blue, optional int alpha);
+    method @androidx.compose.runtime.Stable public static long compositeOver-6xK2E-Q(long, long background);
+    method public static inline boolean isSpecified-8_81llA(long);
+    method public static inline boolean isUnspecified-8_81llA(long);
+    method @androidx.compose.runtime.Stable public static long lerp-m18UwgE(long start, long stop, float fraction);
+    method @androidx.compose.runtime.Stable public static float luminance-8_81llA(long);
+    method public static inline long takeOrElse-iYUlWp8(long, kotlin.jvm.functions.Function0<androidx.compose.ui.graphics.Color> block);
+    method @androidx.compose.runtime.Stable public static int toArgb-8_81llA(long);
+  }
+
+  public final inline class ColorMatrix {
+    ctor public ColorMatrix();
+    method public static float[]! constructor-impl(optional float[] values);
+    method public static void convertRgbToYuv-impl(float[]! $this);
+    method public static void convertYuvToRgb-impl(float[]! $this);
+    method public static inline boolean equals-impl(float[]! p, Object? p1);
+    method public static boolean equals-impl0(float[] p1, float[] p2);
+    method public static inline operator float get-impl(float[] $this, int row, int column);
+    method public float[] getValues();
+    method public static inline int hashCode-impl(float[]! p);
+    method public static void reset-impl(float[]! $this);
+    method public static inline operator void set-impl(float[] $this, int row, int column, float v);
+    method public static void set-jHG-Opc(float[] $this, float[] src);
+    method public static void setToRotateBlue-impl(float[] $this, float degrees);
+    method public static void setToRotateGreen-impl(float[] $this, float degrees);
+    method public static void setToRotateRed-impl(float[] $this, float degrees);
+    method public static void setToSaturation-impl(float[] $this, float sat);
+    method public static void setToScale-impl(float[] $this, float redScale, float greenScale, float blueScale, float alphaScale);
+    method public static operator void timesAssign-jHG-Opc(float[] $this, float[] colorMatrix);
+    method public static inline String! toString-impl(float[]! p);
+    property public final float[] values;
+  }
+
+  public final class DegreesKt {
+  }
+
+  public enum FilterQuality {
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality High;
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality Low;
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality Medium;
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality None;
+  }
+
+  public final class Float16Kt {
+  }
+
+  public interface ImageBitmap {
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
+    method public androidx.compose.ui.graphics.ImageBitmapConfig getConfig();
+    method public boolean getHasAlpha();
+    method public int getHeight();
+    method public int getWidth();
+    method public void prepareToDraw();
+    method public void readPixels(int[] buffer, optional int startX, optional int startY, optional int width, optional int height, optional int bufferOffset, optional int stride);
+    property public abstract androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace;
+    property public abstract androidx.compose.ui.graphics.ImageBitmapConfig config;
+    property public abstract boolean hasAlpha;
+    property public abstract int height;
+    property public abstract int width;
+    field public static final androidx.compose.ui.graphics.ImageBitmap.Companion Companion;
+  }
+
+  public static final class ImageBitmap.Companion {
+  }
+
+  public enum ImageBitmapConfig {
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Alpha8;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Argb8888;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig F16;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Gpu;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Rgb565;
+  }
+
+  public final class ImageBitmapKt {
+    method public static androidx.compose.ui.graphics.ImageBitmap ImageBitmap(int width, int height, optional androidx.compose.ui.graphics.ImageBitmapConfig config, optional boolean hasAlpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+    method public static androidx.compose.ui.graphics.PixelMap toPixelMap(androidx.compose.ui.graphics.ImageBitmap, optional int startX, optional int startY, optional int width, optional int height, optional int[] buffer, optional int bufferOffset, optional int stride);
+  }
+
+  @androidx.compose.runtime.Immutable public final class LinearGradient extends androidx.compose.ui.graphics.ShaderBrush {
+    method public android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public final inline class Matrix {
+    ctor public Matrix();
+    method public static float[]! constructor-impl(optional float[] values);
+    method public static inline boolean equals-impl(float[]! p, Object? p1);
+    method public static boolean equals-impl0(float[] p1, float[] p2);
+    method public static inline operator float get-impl(float[] $this, int row, int column);
+    method public float[] getValues();
+    method public static inline int hashCode-impl(float[]! p);
+    method public static void invert-impl(float[]! $this);
+    method public static androidx.compose.ui.geometry.Rect map-impl(float[] $this, androidx.compose.ui.geometry.Rect rect);
+    method public static void map-impl(float[] $this, androidx.compose.ui.geometry.MutableRect rect);
+    method public static long map-k-4lQ0M(float[] $this, long point);
+    method public static void reset-impl(float[]! $this);
+    method public static void rotateX-impl(float[] $this, float degrees);
+    method public static void rotateY-impl(float[] $this, float degrees);
+    method public static void rotateZ-impl(float[] $this, float degrees);
+    method public static void scale-impl(float[] $this, optional float x, optional float y, optional float z);
+    method public static inline operator void set-impl(float[] $this, int row, int column, float v);
+    method public static void setFrom-58bKbWc(float[] $this, float[] matrix);
+    method public static operator void timesAssign-58bKbWc(float[] $this, float[] m);
+    method public static String toString-impl(float[]! $this);
+    method public static void translate-impl(float[] $this, optional float x, optional float y, optional float z);
+    property public final float[] values;
+    field public static final androidx.compose.ui.graphics.Matrix.Companion Companion;
+    field public static final int Perspective0 = 3; // 0x3
+    field public static final int Perspective1 = 7; // 0x7
+    field public static final int Perspective2 = 15; // 0xf
+    field public static final int ScaleX = 0; // 0x0
+    field public static final int ScaleY = 5; // 0x5
+    field public static final int ScaleZ = 10; // 0xa
+    field public static final int SkewX = 4; // 0x4
+    field public static final int SkewY = 1; // 0x1
+    field public static final int TranslateX = 12; // 0xc
+    field public static final int TranslateY = 13; // 0xd
+    field public static final int TranslateZ = 14; // 0xe
+  }
+
+  public static final class Matrix.Companion {
+  }
+
+  public final class MatrixKt {
+    method public static boolean isIdentity-58bKbWc(float[]);
+  }
+
+  public abstract sealed class Outline {
+    method public abstract androidx.compose.ui.geometry.Rect getBounds();
+    property public abstract androidx.compose.ui.geometry.Rect bounds;
+  }
+
+  public static final class Outline.Generic extends androidx.compose.ui.graphics.Outline {
+    ctor public Outline.Generic(androidx.compose.ui.graphics.Path path);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.graphics.Path getPath();
+    property public androidx.compose.ui.geometry.Rect bounds;
+    property public final androidx.compose.ui.graphics.Path path;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class Outline.Rectangle extends androidx.compose.ui.graphics.Outline {
+    ctor public Outline.Rectangle(androidx.compose.ui.geometry.Rect rect);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.geometry.Rect getRect();
+    property public androidx.compose.ui.geometry.Rect bounds;
+    property public final androidx.compose.ui.geometry.Rect rect;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class Outline.Rounded extends androidx.compose.ui.graphics.Outline {
+    ctor public Outline.Rounded(androidx.compose.ui.geometry.RoundRect roundRect);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.geometry.RoundRect getRoundRect();
+    property public androidx.compose.ui.geometry.Rect bounds;
+    property public final androidx.compose.ui.geometry.RoundRect roundRect;
+  }
+
+  public final class OutlineKt {
+    method public static void addOutline(androidx.compose.ui.graphics.Path, androidx.compose.ui.graphics.Outline outline);
+    method public static void drawOutline(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public static void drawOutline(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Paint paint);
+    method public static void drawOutline-mlewCHg(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+  }
+
+  public interface Paint {
+    method public android.graphics.Paint asFrameworkPaint();
+    method public float getAlpha();
+    method public androidx.compose.ui.graphics.BlendMode getBlendMode();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+    method public androidx.compose.ui.graphics.FilterQuality getFilterQuality();
+    method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+    method public android.graphics.Shader? getShader();
+    method public androidx.compose.ui.graphics.StrokeCap getStrokeCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getStrokeJoin();
+    method public float getStrokeMiterLimit();
+    method public float getStrokeWidth();
+    method public androidx.compose.ui.graphics.PaintingStyle getStyle();
+    method public boolean isAntiAlias();
+    method public void setAlpha(float p);
+    method public void setAntiAlias(boolean p);
+    method public void setBlendMode(androidx.compose.ui.graphics.BlendMode p);
+    method public void setColor-8_81llA(long p);
+    method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter? p);
+    method public void setFilterQuality(androidx.compose.ui.graphics.FilterQuality p);
+    method public void setPathEffect(androidx.compose.ui.graphics.PathEffect? p);
+    method public void setShader(android.graphics.Shader? p);
+    method public void setStrokeCap(androidx.compose.ui.graphics.StrokeCap p);
+    method public void setStrokeJoin(androidx.compose.ui.graphics.StrokeJoin p);
+    method public void setStrokeMiterLimit(float p);
+    method public void setStrokeWidth(float p);
+    method public void setStyle(androidx.compose.ui.graphics.PaintingStyle p);
+    property public abstract float alpha;
+    property public abstract androidx.compose.ui.graphics.BlendMode blendMode;
+    property public abstract long color;
+    property public abstract androidx.compose.ui.graphics.ColorFilter? colorFilter;
+    property public abstract androidx.compose.ui.graphics.FilterQuality filterQuality;
+    property public abstract boolean isAntiAlias;
+    property public abstract androidx.compose.ui.graphics.PathEffect? pathEffect;
+    property public abstract android.graphics.Shader? shader;
+    property public abstract androidx.compose.ui.graphics.StrokeCap strokeCap;
+    property public abstract androidx.compose.ui.graphics.StrokeJoin strokeJoin;
+    property public abstract float strokeMiterLimit;
+    property public abstract float strokeWidth;
+    property public abstract androidx.compose.ui.graphics.PaintingStyle style;
+  }
+
+  public final class PaintKt {
+    field public static final float DefaultAlpha = 1.0f;
+  }
+
+  public enum PaintingStyle {
+    enum_constant public static final androidx.compose.ui.graphics.PaintingStyle Fill;
+    enum_constant public static final androidx.compose.ui.graphics.PaintingStyle Stroke;
+  }
+
+  public interface Path {
+    method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.compose.ui.geometry.Rect oval);
+    method public void addPath-ej0GBII(androidx.compose.ui.graphics.Path path, optional long offset);
+    method public void addRect(androidx.compose.ui.geometry.Rect rect);
+    method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+    method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+    method public default void arcToRad(androidx.compose.ui.geometry.Rect rect, float startAngleRadians, float sweepAngleRadians, boolean forceMoveTo);
+    method public void close();
+    method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.graphics.PathFillType getFillType();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float x, float y);
+    method public void moveTo(float x, float y);
+    method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, androidx.compose.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+    method public void reset();
+    method public void setFillType(androidx.compose.ui.graphics.PathFillType p);
+    method public void translate-k-4lQ0M(long offset);
+    property public abstract androidx.compose.ui.graphics.PathFillType fillType;
+    property public abstract boolean isConvex;
+    property public abstract boolean isEmpty;
+    field public static final androidx.compose.ui.graphics.Path.Companion Companion;
+  }
+
+  public static final class Path.Companion {
+    method public androidx.compose.ui.graphics.Path combine(androidx.compose.ui.graphics.PathOperation operation, androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2);
+  }
+
+  public interface PathEffect {
+    field public static final androidx.compose.ui.graphics.PathEffect.Companion Companion;
+  }
+
+  public static final class PathEffect.Companion {
+    method public androidx.compose.ui.graphics.PathEffect chainPathEffect(androidx.compose.ui.graphics.PathEffect outer, androidx.compose.ui.graphics.PathEffect inner);
+    method public androidx.compose.ui.graphics.PathEffect cornerPathEffect(float radius);
+    method public androidx.compose.ui.graphics.PathEffect dashPathEffect(float[] intervals, optional float phase);
+    method public androidx.compose.ui.graphics.PathEffect stampedPathEffect(androidx.compose.ui.graphics.Path shape, float advance, float phase, androidx.compose.ui.graphics.StampedPathEffectStyle style);
+  }
+
+  public enum PathFillType {
+    enum_constant public static final androidx.compose.ui.graphics.PathFillType EvenOdd;
+    enum_constant public static final androidx.compose.ui.graphics.PathFillType NonZero;
+  }
+
+  public interface PathMeasure {
+    method public float getLength();
+    method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, optional boolean startWithMoveTo);
+    method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+    property public abstract float length;
+  }
+
+  public enum PathOperation {
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation difference;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation intersect;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation reverseDifference;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation union;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation xor;
+  }
+
+  public final class PixelMap {
+    ctor public PixelMap(int[] buffer, int width, int height, int bufferOffset, int stride);
+    method public operator long get-0d7_KjU(int x, int y);
+    method public int[] getBuffer();
+    method public int getBufferOffset();
+    method public int getHeight();
+    method public int getStride();
+    method public int getWidth();
+    property public final int[] buffer;
+    property public final int bufferOffset;
+    property public final int height;
+    property public final int stride;
+    property public final int width;
+  }
+
+  public enum PointMode {
+    enum_constant public static final androidx.compose.ui.graphics.PointMode Lines;
+    enum_constant public static final androidx.compose.ui.graphics.PointMode Points;
+    enum_constant public static final androidx.compose.ui.graphics.PointMode Polygon;
+  }
+
+  @androidx.compose.runtime.Immutable public final class RadialGradient extends androidx.compose.ui.graphics.ShaderBrush {
+    method public android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public final class RectHelper_androidKt {
+    method public static android.graphics.Rect toAndroidRect(androidx.compose.ui.geometry.Rect);
+    method public static android.graphics.RectF toAndroidRectF(androidx.compose.ui.geometry.Rect);
+    method public static androidx.compose.ui.geometry.Rect toComposeRect(android.graphics.Rect);
+  }
+
+  public final class RectangleShapeKt {
+    method public static androidx.compose.ui.graphics.Shape getRectangleShape();
+  }
+
+  @androidx.compose.runtime.Immutable public abstract class ShaderBrush extends androidx.compose.ui.graphics.Brush {
+    ctor public ShaderBrush();
+    method public final void applyTo-TJof4Gw(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+    method public abstract android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public final class ShaderKt {
+    method public static android.graphics.Shader ImageShader(androidx.compose.ui.graphics.ImageBitmap image, optional androidx.compose.ui.graphics.TileMode tileModeX, optional androidx.compose.ui.graphics.TileMode tileModeY);
+    method public static android.graphics.Shader LinearGradientShader-GfyHbQM(long from, long to, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method public static android.graphics.Shader RadialGradientShader-cY6o93o(long center, float radius, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method public static android.graphics.Shader SweepGradientShader-GpNgDDw(long center, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Shadow {
+    method public androidx.compose.ui.graphics.Shadow copy-vQQzcCI(optional long color, optional long offset, optional float blurRadius);
+    method public float getBlurRadius();
+    method public long getColor-0d7_KjU();
+    method public long getOffset-F1C5BW0();
+    property public final float blurRadius;
+    property public final long color;
+    property public final long offset;
+    field public static final androidx.compose.ui.graphics.Shadow.Companion Companion;
+  }
+
+  public static final class Shadow.Companion {
+    method public androidx.compose.ui.graphics.Shadow getNone();
+    property public final androidx.compose.ui.graphics.Shadow None;
+  }
+
+  public final class ShadowKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.Shadow lerp(androidx.compose.ui.graphics.Shadow start, androidx.compose.ui.graphics.Shadow stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public interface Shape {
+    method public androidx.compose.ui.graphics.Outline createOutline-9w1PWio(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+  }
+
+  @androidx.compose.runtime.Immutable public final class SolidColor extends androidx.compose.ui.graphics.Brush {
+    method public void applyTo-TJof4Gw(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+    method public long getValue-0d7_KjU();
+    property public final long value;
+  }
+
+  public enum StampedPathEffectStyle {
+    enum_constant public static final androidx.compose.ui.graphics.StampedPathEffectStyle Morph;
+    enum_constant public static final androidx.compose.ui.graphics.StampedPathEffectStyle Rotate;
+    enum_constant public static final androidx.compose.ui.graphics.StampedPathEffectStyle Translate;
+  }
+
+  public enum StrokeCap {
+    enum_constant public static final androidx.compose.ui.graphics.StrokeCap Butt;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeCap Round;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeCap Square;
+  }
+
+  public enum StrokeJoin {
+    enum_constant public static final androidx.compose.ui.graphics.StrokeJoin Bevel;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeJoin Miter;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeJoin Round;
+  }
+
+  @androidx.compose.runtime.Immutable public final class SweepGradient extends androidx.compose.ui.graphics.ShaderBrush {
+    method public android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public enum TileMode {
+    enum_constant public static final androidx.compose.ui.graphics.TileMode Clamp;
+    enum_constant public static final androidx.compose.ui.graphics.TileMode Mirror;
+    enum_constant public static final androidx.compose.ui.graphics.TileMode Repeated;
+  }
+
+  public enum VertexMode {
+    enum_constant public static final androidx.compose.ui.graphics.VertexMode TriangleFan;
+    enum_constant public static final androidx.compose.ui.graphics.VertexMode TriangleStrip;
+    enum_constant public static final androidx.compose.ui.graphics.VertexMode Triangles;
+  }
+
+  public final class Vertices {
+    ctor public Vertices(androidx.compose.ui.graphics.VertexMode vertexMode, java.util.List<androidx.compose.ui.geometry.Offset> positions, java.util.List<androidx.compose.ui.geometry.Offset> textureCoordinates, java.util.List<androidx.compose.ui.graphics.Color> colors, java.util.List<java.lang.Integer> indices);
+    method public int[] getColors();
+    method public short[] getIndices();
+    method public float[] getPositions();
+    method public float[] getTextureCoordinates();
+    method public androidx.compose.ui.graphics.VertexMode getVertexMode();
+    property public final int[] colors;
+    property public final short[] indices;
+    property public final float[] positions;
+    property public final float[] textureCoordinates;
+    property public final androidx.compose.ui.graphics.VertexMode vertexMode;
+  }
+
+}
+
+package androidx.compose.ui.graphics.colorspace {
+
+  public enum Adaptation {
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.Adaptation Bradford;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.Adaptation Ciecat02;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.Adaptation VonKries;
+  }
+
+  public enum ColorModel {
+    method public final int getComponentCount();
+    property public final int componentCount;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Cmyk;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Lab;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Rgb;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Xyz;
+  }
+
+  public abstract class ColorSpace {
+    ctor public ColorSpace(String name, androidx.compose.ui.graphics.colorspace.ColorModel model);
+    method public final float[] fromXyz(float x, float y, float z);
+    method public abstract float[] fromXyz(float[] v);
+    method public final int getComponentCount();
+    method public abstract float getMaxValue(int component);
+    method public abstract float getMinValue(int component);
+    method public final androidx.compose.ui.graphics.colorspace.ColorModel getModel();
+    method public final String getName();
+    method public boolean isSrgb();
+    method public abstract boolean isWideGamut();
+    method public final float[] toXyz(float r, float g, float b);
+    method public abstract float[] toXyz(float[] v);
+    property public final int componentCount;
+    property public boolean isSrgb;
+    property public abstract boolean isWideGamut;
+    property public final androidx.compose.ui.graphics.colorspace.ColorModel model;
+    property public final String name;
+  }
+
+  public final class ColorSpaceKt {
+    method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, optional androidx.compose.ui.graphics.colorspace.Adaptation adaptation);
+    method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint);
+    method public static androidx.compose.ui.graphics.colorspace.Connector connect(androidx.compose.ui.graphics.colorspace.ColorSpace, optional androidx.compose.ui.graphics.colorspace.ColorSpace destination, optional androidx.compose.ui.graphics.colorspace.RenderIntent intent);
+  }
+
+  public final class ColorSpaces {
+    method public androidx.compose.ui.graphics.colorspace.Rgb getAces();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getAcescg();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getAdobeRgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getBt2020();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getBt709();
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieLab();
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieXyz();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getDciP3();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getDisplayP3();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getExtendedSrgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getLinearExtendedSrgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getLinearSrgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getNtsc1953();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getProPhotoRgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getSmpteC();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getSrgb();
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace? match(float[] toXYZD50, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Aces;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Acescg;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb AdobeRgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Bt2020;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Bt709;
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieLab;
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieXyz;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb DciP3;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb DisplayP3;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb ExtendedSrgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb LinearExtendedSrgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb LinearSrgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Ntsc1953;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb ProPhotoRgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb SmpteC;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Srgb;
+    field public static final androidx.compose.ui.graphics.colorspace.ColorSpaces INSTANCE;
+  }
+
+  public class Connector {
+    method public final androidx.compose.ui.graphics.colorspace.ColorSpace getDestination();
+    method public final androidx.compose.ui.graphics.colorspace.RenderIntent getRenderIntent();
+    method public final androidx.compose.ui.graphics.colorspace.ColorSpace getSource();
+    method public final float[] transform(float r, float g, float b);
+    method public float[] transform(float[] v);
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace destination;
+    property public final androidx.compose.ui.graphics.colorspace.RenderIntent renderIntent;
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace source;
+  }
+
+  public final class Illuminant {
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getA();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getB();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getC();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD50();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD55();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD60();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD65();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD75();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getE();
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint A;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint B;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint C;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D50;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D55;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D60;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D65;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D75;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint E;
+    field public static final androidx.compose.ui.graphics.colorspace.Illuminant INSTANCE;
+  }
+
+  public enum RenderIntent {
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Absolute;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Perceptual;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Relative;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Saturation;
+  }
+
+  public final class Rgb extends androidx.compose.ui.graphics.colorspace.ColorSpace {
+    ctor public Rgb(String name, float[] toXYZ, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf);
+    ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf, float min, float max);
+    ctor public Rgb(String name, float[] toXYZ, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(String name, float[] toXYZ, double gamma);
+    ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, double gamma);
+    method public float[] fromLinear(float r, float g, float b);
+    method public float[] fromLinear(float[] v);
+    method public float[] fromXyz(float[] v);
+    method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getEotf();
+    method public float[] getInverseTransform();
+    method public float[] getInverseTransform(float[] inverseTransform);
+    method public float getMaxValue(int component);
+    method public float getMinValue(int component);
+    method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getOetf();
+    method public float[] getPrimaries();
+    method public float[] getPrimaries(float[] primaries);
+    method public androidx.compose.ui.graphics.colorspace.TransferParameters? getTransferParameters();
+    method public float[] getTransform();
+    method public float[] getTransform(float[] transform);
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getWhitePoint();
+    method public boolean isWideGamut();
+    method public float[] toLinear(float r, float g, float b);
+    method public float[] toLinear(float[] v);
+    method public float[] toXyz(float[] v);
+    property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> eotf;
+    property public boolean isSrgb;
+    property public boolean isWideGamut;
+    property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> oetf;
+    property public final androidx.compose.ui.graphics.colorspace.TransferParameters? transferParameters;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint;
+  }
+
+  public final class TransferParameters {
+    ctor public TransferParameters(double gamma, double a, double b, double c, double d, optional double e, optional double f);
+    method public double component1();
+    method public double component2();
+    method public double component3();
+    method public double component4();
+    method public double component5();
+    method public double component6();
+    method public double component7();
+    method public androidx.compose.ui.graphics.colorspace.TransferParameters copy(double gamma, double a, double b, double c, double d, double e, double f);
+    method public double getA();
+    method public double getB();
+    method public double getC();
+    method public double getD();
+    method public double getE();
+    method public double getF();
+    method public double getGamma();
+    property public final double a;
+    property public final double b;
+    property public final double c;
+    property public final double d;
+    property public final double e;
+    property public final double f;
+    property public final double gamma;
+  }
+
+  public final class WhitePoint {
+    ctor public WhitePoint(float x, float y);
+    ctor public WhitePoint(float x, float y, float z);
+    method public float component1();
+    method public float component2();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+}
+
+package androidx.compose.ui.graphics.drawscope {
+
+  public final class CanvasDrawScope implements androidx.compose.ui.graphics.drawscope.DrawScope {
+    ctor public CanvasDrawScope();
+    method public inline void draw-jkGVKLE(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.graphics.Canvas canvas, long size, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public void drawArc-BcZ8TnY(long color, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawArc-C-Io9bM(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-NGaRamM(long color, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-m-UMHxE(androidx.compose.ui.graphics.Brush brush, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-JUiai_k(androidx.compose.ui.graphics.ImageBitmap image, long topLeft, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-Yc2aOMw(androidx.compose.ui.graphics.ImageBitmap image, long srcOffset, long srcSize, long dstOffset, long dstSize, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-QXZmVdc(long color, long start, long end, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-UXw4dv4(androidx.compose.ui.graphics.Brush brush, long start, long end, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-IdEHoqk(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath-tilSWAQ(androidx.compose.ui.graphics.Path path, long color, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, androidx.compose.ui.graphics.Brush brush, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints-Aqy9O-k(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, long color, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-IdEHoqk(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-fNghmuc(long color, long topLeft, long size, long cornerRadius, androidx.compose.ui.graphics.drawscope.DrawStyle style, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-sDDzLXA(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, long cornerRadius, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public float getDensity();
+    method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+    method public float getFontScale();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    property public float density;
+    property public androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+    property public float fontScale;
+    property public androidx.compose.ui.unit.LayoutDirection layoutDirection;
+  }
+
+  public final class CanvasDrawScopeKt {
+  }
+
+  public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
+    method public void drawContent();
+  }
+
+  public interface DrawContext {
+    method public androidx.compose.ui.graphics.Canvas getCanvas();
+    method public long getSize-NH-jbRc();
+    method public androidx.compose.ui.graphics.drawscope.DrawTransform getTransform();
+    method public void setSize-uvyYCjk(long p);
+    property public abstract androidx.compose.ui.graphics.Canvas canvas;
+    property public abstract long size;
+    property public abstract androidx.compose.ui.graphics.drawscope.DrawTransform transform;
+  }
+
+  @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawScope extends androidx.compose.ui.unit.Density {
+    method public void drawArc-BcZ8TnY(long color, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawArc-C-Io9bM(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-NGaRamM(long color, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-m-UMHxE(androidx.compose.ui.graphics.Brush brush, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-JUiai_k(androidx.compose.ui.graphics.ImageBitmap image, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-Yc2aOMw(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-QXZmVdc(long color, long start, long end, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-UXw4dv4(androidx.compose.ui.graphics.Brush brush, long start, long end, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-IdEHoqk(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath-tilSWAQ(androidx.compose.ui.graphics.Path path, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, androidx.compose.ui.graphics.Brush brush, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints-Aqy9O-k(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, long color, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-IdEHoqk(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-fNghmuc(long color, optional long topLeft, optional long size, optional long cornerRadius, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-sDDzLXA(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional long cornerRadius, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public default long getCenter-F1C5BW0();
+    method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public default long getSize-NH-jbRc();
+    method public long offsetSize(long, long offset);
+    property public default long center;
+    property public abstract androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+    property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public default long size;
+    field public static final androidx.compose.ui.graphics.drawscope.DrawScope.Companion Companion;
+  }
+
+  public static final class DrawScope.Companion {
+    method public androidx.compose.ui.graphics.BlendMode getDefaultBlendMode();
+    property public final androidx.compose.ui.graphics.BlendMode DefaultBlendMode;
+  }
+
+  public final class DrawScopeKt {
+    method public static inline void clipPath(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Path path, optional androidx.compose.ui.graphics.ClipOp clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void clipRect(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, optional float right, optional float bottom, optional androidx.compose.ui.graphics.ClipOp clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void drawIntoCanvas(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float left, float top, float right, float bottom, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float inset, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, optional float horizontal, optional float vertical, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void rotate-FvlOZkk(androidx.compose.ui.graphics.drawscope.DrawScope, float degrees, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void rotateRad-FvlOZkk(androidx.compose.ui.graphics.drawscope.DrawScope, float radians, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void scale-FvlOZkk(androidx.compose.ui.graphics.drawscope.DrawScope, float scale, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void scale-LCqtnZ0(androidx.compose.ui.graphics.drawscope.DrawScope, float scaleX, float scaleY, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void translate(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void withTransform(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawTransform,kotlin.Unit> transformBlock, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> drawBlock);
+  }
+
+  @kotlin.DslMarker public @interface DrawScopeMarker {
+  }
+
+  public abstract sealed class DrawStyle {
+  }
+
+  @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawTransform {
+    method public void clipPath(androidx.compose.ui.graphics.Path path, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void clipRect(optional float left, optional float top, optional float right, optional float bottom, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public default long getCenter-F1C5BW0();
+    method public long getSize-NH-jbRc();
+    method public void inset(float left, float top, float right, float bottom);
+    method public void rotate-KYFOyyg(float degrees, optional long pivot);
+    method public void scale-QguGWxw(float scaleX, float scaleY, optional long pivot);
+    method public void transform-58bKbWc(float[] matrix);
+    method public void translate(optional float left, optional float top);
+    property public default long center;
+    property public abstract long size;
+  }
+
+  public final class DrawTransformKt {
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, optional float horizontal, optional float vertical);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, float inset);
+    method public static inline void rotateRad-kdYHfaE(androidx.compose.ui.graphics.drawscope.DrawTransform, float radians, optional long pivot);
+    method public static inline void scale-kdYHfaE(androidx.compose.ui.graphics.drawscope.DrawTransform, float scale, optional long pivot);
+  }
+
+  public final class Fill extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+    field public static final androidx.compose.ui.graphics.drawscope.Fill INSTANCE;
+  }
+
+  public final class Stroke extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+    ctor public Stroke(optional float width, optional float miter, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.StrokeJoin join, optional androidx.compose.ui.graphics.PathEffect? pathEffect);
+    method public androidx.compose.ui.graphics.StrokeCap getCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getJoin();
+    method public float getMiter();
+    method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+    method public float getWidth();
+    property public final androidx.compose.ui.graphics.StrokeCap cap;
+    property public final androidx.compose.ui.graphics.StrokeJoin join;
+    property public final float miter;
+    property public final androidx.compose.ui.graphics.PathEffect? pathEffect;
+    property public final float width;
+    field public static final androidx.compose.ui.graphics.drawscope.Stroke.Companion Companion;
+    field public static final float DefaultMiter = 4.0f;
+    field public static final float HairlineWidth = 0.0f;
+  }
+
+  public static final class Stroke.Companion {
+    method public androidx.compose.ui.graphics.StrokeCap getDefaultCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getDefaultJoin();
+    property public final androidx.compose.ui.graphics.StrokeCap DefaultCap;
+    property public final androidx.compose.ui.graphics.StrokeJoin DefaultJoin;
+  }
+
+}
+
+package androidx.compose.ui.graphics.painter {
+
+  public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
+    method public long getIntrinsicSize-NH-jbRc();
+    method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public long intrinsicSize;
+  }
+
+  public final class ColorPainter extends androidx.compose.ui.graphics.painter.Painter {
+    method public long getColor-0d7_KjU();
+    method public long getIntrinsicSize-NH-jbRc();
+    method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public final long color;
+    property public long intrinsicSize;
+  }
+
+  public abstract class Painter {
+    ctor public Painter();
+    method protected boolean applyAlpha(float alpha);
+    method protected boolean applyColorFilter(androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method protected boolean applyLayoutDirection(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public final void draw-ty3CEPU(androidx.compose.ui.graphics.drawscope.DrawScope, long size, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method public abstract long getIntrinsicSize-NH-jbRc();
+    method protected abstract void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public abstract long intrinsicSize;
+  }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+  public final class PathBuilder {
+    ctor public PathBuilder();
+    method public androidx.compose.ui.graphics.vector.PathBuilder arcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder arcToRelative(float a, float b, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float dx1, float dy1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder close();
+    method public androidx.compose.ui.graphics.vector.PathBuilder curveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.compose.ui.graphics.vector.PathBuilder curveToRelative(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getNodes();
+    method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineTo(float x);
+    method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineToRelative(float dx);
+    method public androidx.compose.ui.graphics.vector.PathBuilder lineTo(float x, float y);
+    method public androidx.compose.ui.graphics.vector.PathBuilder lineToRelative(float dx, float dy);
+    method public androidx.compose.ui.graphics.vector.PathBuilder moveTo(float x, float y);
+    method public androidx.compose.ui.graphics.vector.PathBuilder moveToRelative(float dx, float dy);
+    method public androidx.compose.ui.graphics.vector.PathBuilder quadTo(float x1, float y1, float x2, float y2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder quadToRelative(float dx1, float dy1, float dx2, float dy2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveTo(float x1, float y1, float x2, float y2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveToRelative(float dx1, float dy1, float dx2, float dy2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadTo(float x1, float y1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadToRelative(float dx1, float dy1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineTo(float y);
+    method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineToRelative(float dy);
+  }
+
+  @androidx.compose.runtime.Immutable public abstract sealed class PathNode {
+    method public final boolean isCurve();
+    method public final boolean isQuad();
+    property public final boolean isCurve;
+    property public final boolean isQuad;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.ArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.ArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public boolean component4();
+    method public boolean component5();
+    method public float component6();
+    method public float component7();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.ArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+    method public float getArcStartX();
+    method public float getArcStartY();
+    method public float getHorizontalEllipseRadius();
+    method public float getTheta();
+    method public float getVerticalEllipseRadius();
+    method public boolean isMoreThanHalf();
+    method public boolean isPositiveArc();
+    property public final float arcStartX;
+    property public final float arcStartY;
+    property public final float horizontalEllipseRadius;
+    property public final boolean isMoreThanHalf;
+    property public final boolean isPositiveArc;
+    property public final float theta;
+    property public final float verticalEllipseRadius;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.Close extends androidx.compose.ui.graphics.vector.PathNode {
+    field public static final androidx.compose.ui.graphics.vector.PathNode.Close INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.CurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.CurveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public float component5();
+    method public float component6();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.CurveTo copy(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public float getX1();
+    method public float getX2();
+    method public float getX3();
+    method public float getY1();
+    method public float getY2();
+    method public float getY3();
+    property public final float x1;
+    property public final float x2;
+    property public final float x3;
+    property public final float y1;
+    property public final float y2;
+    property public final float y3;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.HorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.HorizontalTo(float x);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.HorizontalTo copy(float x);
+    method public float getX();
+    property public final float x;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.LineTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.LineTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.LineTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.MoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.MoveTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.MoveTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.QuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.QuadTo(float x1, float y1, float x2, float y2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.QuadTo copy(float x1, float y1, float x2, float y2);
+    method public float getX1();
+    method public float getX2();
+    method public float getY1();
+    method public float getY2();
+    property public final float x1;
+    property public final float x2;
+    property public final float y1;
+    property public final float y2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.ReflectiveCurveTo(float x1, float y1, float x2, float y2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.ReflectiveCurveTo copy(float x1, float y1, float x2, float y2);
+    method public float getX1();
+    method public float getX2();
+    method public float getY1();
+    method public float getY2();
+    property public final float x1;
+    property public final float x2;
+    property public final float y1;
+    property public final float y2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.ReflectiveQuadTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.ReflectiveQuadTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public boolean component4();
+    method public boolean component5();
+    method public float component6();
+    method public float component7();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+    method public float getArcStartDx();
+    method public float getArcStartDy();
+    method public float getHorizontalEllipseRadius();
+    method public float getTheta();
+    method public float getVerticalEllipseRadius();
+    method public boolean isMoreThanHalf();
+    method public boolean isPositiveArc();
+    property public final float arcStartDx;
+    property public final float arcStartDy;
+    property public final float horizontalEllipseRadius;
+    property public final boolean isMoreThanHalf;
+    property public final boolean isPositiveArc;
+    property public final float theta;
+    property public final float verticalEllipseRadius;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeCurveTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public float component5();
+    method public float component6();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeCurveTo copy(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public float getDx1();
+    method public float getDx2();
+    method public float getDx3();
+    method public float getDy1();
+    method public float getDy2();
+    method public float getDy3();
+    property public final float dx1;
+    property public final float dx2;
+    property public final float dx3;
+    property public final float dy1;
+    property public final float dy2;
+    property public final float dy3;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeHorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeHorizontalTo(float dx);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeHorizontalTo copy(float dx);
+    method public float getDx();
+    property public final float dx;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeLineTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeLineTo(float dx, float dy);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeLineTo copy(float dx, float dy);
+    method public float getDx();
+    method public float getDy();
+    property public final float dx;
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeMoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeMoveTo(float dx, float dy);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeMoveTo copy(float dx, float dy);
+    method public float getDx();
+    method public float getDy();
+    property public final float dx;
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeQuadTo(float dx1, float dy1, float dx2, float dy2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeQuadTo copy(float dx1, float dy1, float dx2, float dy2);
+    method public float getDx1();
+    method public float getDx2();
+    method public float getDy1();
+    method public float getDy2();
+    property public final float dx1;
+    property public final float dx2;
+    property public final float dy1;
+    property public final float dy2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveCurveTo(float dx1, float dy1, float dx2, float dy2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveCurveTo copy(float dx1, float dy1, float dx2, float dy2);
+    method public float getDx1();
+    method public float getDx2();
+    method public float getDy1();
+    method public float getDy2();
+    property public final float dx1;
+    property public final float dx2;
+    property public final float dy1;
+    property public final float dy2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveQuadTo(float dx, float dy);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveQuadTo copy(float dx, float dy);
+    method public float getDx();
+    method public float getDy();
+    property public final float dx;
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeVerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeVerticalTo(float dy);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeVerticalTo copy(float dy);
+    method public float getDy();
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.VerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.VerticalTo(float y);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.VerticalTo copy(float y);
+    method public float getY();
+    property public final float y;
+  }
+
+  public final class PathNodeKt {
+  }
+
+  public final class PathParser {
+    ctor public PathParser();
+    method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
+    method public void clear();
+    method public androidx.compose.ui.graphics.vector.PathParser parsePathString(String pathData);
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> toNodes();
+    method public androidx.compose.ui.graphics.Path toPath(optional androidx.compose.ui.graphics.Path target);
+  }
+
+}
+

compose/ui/ui-graphics/api/res-1.0.0-beta04.txt

diff --git a/wear/wear-tiles/api/res-current.txt b/compose/ui/ui-graphics/api/res-1.0.0-beta04.txt
similarity index 100%
copy from wear/wear-tiles/api/res-current.txt
copy to compose/ui/ui-graphics/api/res-1.0.0-beta04.txt

compose/ui/ui-graphics/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-graphics/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-graphics/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..398edf5
--- /dev/null
+++ b/compose/ui/ui-graphics/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,1475 @@
+// Signature format: 4.0
+package androidx.compose.ui.graphics {
+
+  public final class AndroidBlendMode_androidKt {
+    method public static boolean isSupported(androidx.compose.ui.graphics.BlendMode);
+  }
+
+  @kotlin.PublishedApi internal final class AndroidCanvas implements androidx.compose.ui.graphics.Canvas {
+    ctor public AndroidCanvas();
+    method public void clipPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void clipRect(float left, float top, float right, float bottom, androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void concat-58bKbWc(float[] matrix);
+    method public void disableZ();
+    method public void drawArc(float left, float top, float right, float bottom, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+    method public void drawCircle-tVKstsI(long center, float radius, androidx.compose.ui.graphics.Paint paint);
+    method public void drawImage-uwcbMjI(androidx.compose.ui.graphics.ImageBitmap image, long topLeftOffset, androidx.compose.ui.graphics.Paint paint);
+    method public void drawImageRect-bgE79EM(androidx.compose.ui.graphics.ImageBitmap image, long srcOffset, long srcSize, long dstOffset, long dstSize, androidx.compose.ui.graphics.Paint paint);
+    method public void drawLine-bYPfCD8(long p1, long p2, androidx.compose.ui.graphics.Paint paint);
+    method public void drawOval(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+    method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Paint paint);
+    method public void drawPoints(androidx.compose.ui.graphics.PointMode pointMode, java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRawPoints(androidx.compose.ui.graphics.PointMode pointMode, float[] points, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRect(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.compose.ui.graphics.Paint paint);
+    method public void drawVertices(androidx.compose.ui.graphics.Vertices vertices, androidx.compose.ui.graphics.BlendMode blendMode, androidx.compose.ui.graphics.Paint paint);
+    method public void enableZ();
+    method public void restore();
+    method public void rotate(float degrees);
+    method public void save();
+    method public void saveLayer(androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint);
+    method public void scale(float sx, float sy);
+    method public void skew(float sx, float sy);
+    method public android.graphics.Region.Op toRegionOp(androidx.compose.ui.graphics.ClipOp);
+    method public void translate(float dx, float dy);
+    field @kotlin.PublishedApi internal android.graphics.Canvas internalCanvas;
+  }
+
+  public final class AndroidCanvas_androidKt {
+    method public static androidx.compose.ui.graphics.Canvas Canvas(android.graphics.Canvas c);
+    method public static android.graphics.Canvas getNativeCanvas(androidx.compose.ui.graphics.Canvas);
+  }
+
+  public final class AndroidColorFilter_androidKt {
+    method public static android.graphics.ColorFilter asAndroidColorFilter(androidx.compose.ui.graphics.ColorFilter);
+    method public static androidx.compose.ui.graphics.ColorFilter asComposeColorFilter(android.graphics.ColorFilter);
+  }
+
+  public final class AndroidImageBitmap_androidKt {
+    method public static android.graphics.Bitmap asAndroidBitmap(androidx.compose.ui.graphics.ImageBitmap);
+    method public static androidx.compose.ui.graphics.ImageBitmap asImageBitmap(android.graphics.Bitmap);
+  }
+
+  public final class AndroidMatrixConversions_androidKt {
+    method public static void setFrom-7lL006A(float[], android.graphics.Matrix matrix);
+    method public static void setFrom-8AuSnpc(android.graphics.Matrix, float[] matrix);
+  }
+
+  public final class AndroidPaint implements androidx.compose.ui.graphics.Paint {
+    ctor public AndroidPaint();
+    method public android.graphics.Paint asFrameworkPaint();
+    method public float getAlpha();
+    method public androidx.compose.ui.graphics.BlendMode getBlendMode();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+    method public androidx.compose.ui.graphics.FilterQuality getFilterQuality();
+    method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+    method public android.graphics.Shader? getShader();
+    method public androidx.compose.ui.graphics.StrokeCap getStrokeCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getStrokeJoin();
+    method public float getStrokeMiterLimit();
+    method public float getStrokeWidth();
+    method public androidx.compose.ui.graphics.PaintingStyle getStyle();
+    method public boolean isAntiAlias();
+    method public void setAlpha(float value);
+    method public void setAntiAlias(boolean value);
+    method public void setBlendMode(androidx.compose.ui.graphics.BlendMode value);
+    method public void setColor-8_81llA(long color);
+    method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter? value);
+    method public void setFilterQuality(androidx.compose.ui.graphics.FilterQuality value);
+    method public void setPathEffect(androidx.compose.ui.graphics.PathEffect? value);
+    method public void setShader(android.graphics.Shader? value);
+    method public void setStrokeCap(androidx.compose.ui.graphics.StrokeCap value);
+    method public void setStrokeJoin(androidx.compose.ui.graphics.StrokeJoin value);
+    method public void setStrokeMiterLimit(float value);
+    method public void setStrokeWidth(float value);
+    method public void setStyle(androidx.compose.ui.graphics.PaintingStyle value);
+    property public float alpha;
+    property public androidx.compose.ui.graphics.BlendMode blendMode;
+    property public long color;
+    property public androidx.compose.ui.graphics.ColorFilter? colorFilter;
+    property public androidx.compose.ui.graphics.FilterQuality filterQuality;
+    property public boolean isAntiAlias;
+    property public androidx.compose.ui.graphics.PathEffect? pathEffect;
+    property public android.graphics.Shader? shader;
+    property public androidx.compose.ui.graphics.StrokeCap strokeCap;
+    property public androidx.compose.ui.graphics.StrokeJoin strokeJoin;
+    property public float strokeMiterLimit;
+    property public float strokeWidth;
+    property public androidx.compose.ui.graphics.PaintingStyle style;
+  }
+
+  public final class AndroidPaint_androidKt {
+    method public static androidx.compose.ui.graphics.Paint Paint();
+  }
+
+  public final class AndroidPath implements androidx.compose.ui.graphics.Path {
+    ctor public AndroidPath(optional android.graphics.Path internalPath);
+    method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.compose.ui.geometry.Rect oval);
+    method public void addPath-ej0GBII(androidx.compose.ui.graphics.Path path, long offset);
+    method public void addRect(androidx.compose.ui.geometry.Rect rect);
+    method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+    method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+    method public void close();
+    method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.graphics.PathFillType getFillType();
+    method public android.graphics.Path getInternalPath();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float x, float y);
+    method public void moveTo(float x, float y);
+    method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, androidx.compose.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+    method public void reset();
+    method public void setFillType(androidx.compose.ui.graphics.PathFillType value);
+    method public void translate-k-4lQ0M(long offset);
+    property public androidx.compose.ui.graphics.PathFillType fillType;
+    property public final android.graphics.Path internalPath;
+    property public boolean isConvex;
+    property public boolean isEmpty;
+  }
+
+  public final class AndroidPathEffect_androidKt {
+    method public static android.graphics.PathEffect asAndroidPathEffect(androidx.compose.ui.graphics.PathEffect);
+    method public static androidx.compose.ui.graphics.PathEffect toComposePathEffect(android.graphics.PathEffect);
+  }
+
+  public final class AndroidPathMeasure implements androidx.compose.ui.graphics.PathMeasure {
+    method public float getLength();
+    method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, boolean startWithMoveTo);
+    method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+    property public float length;
+  }
+
+  public final class AndroidPathMeasure_androidKt {
+    method public static androidx.compose.ui.graphics.PathMeasure PathMeasure();
+  }
+
+  public final class AndroidPath_androidKt {
+    method public static androidx.compose.ui.graphics.Path Path();
+    method public static inline android.graphics.Path asAndroidPath(androidx.compose.ui.graphics.Path);
+    method public static androidx.compose.ui.graphics.Path asComposePath(android.graphics.Path);
+  }
+
+  public final class AndroidShader_androidKt {
+  }
+
+  public final class AndroidTileMode_androidKt {
+    method public static android.graphics.Shader.TileMode toNativeTileMode(androidx.compose.ui.graphics.TileMode);
+  }
+
+  public final class AndroidVertexMode_androidKt {
+    method public static android.graphics.Canvas.VertexMode toNativeVertexMode(androidx.compose.ui.graphics.VertexMode);
+  }
+
+  public enum BlendMode {
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Clear;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Color;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode ColorBurn;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode ColorDodge;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Darken;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Difference;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Dst;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstAtop;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstIn;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstOut;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode DstOver;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Exclusion;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Hardlight;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Hue;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Lighten;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Luminosity;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Modulate;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Multiply;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Overlay;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Plus;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Saturation;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Screen;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Softlight;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Src;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcAtop;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcIn;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcOut;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode SrcOver;
+    enum_constant public static final androidx.compose.ui.graphics.BlendMode Xor;
+  }
+
+  @androidx.compose.runtime.Immutable public abstract sealed class Brush {
+    method public abstract void applyTo-TJof4Gw(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+    field public static final androidx.compose.ui.graphics.Brush.Companion Companion;
+  }
+
+  public static final class Brush.Companion {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startX, optional float endX, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startX, optional float endX, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient-7_sGemo(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long start, optional long end, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient-K4jYFb0(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long start, optional long end, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient-YU3LRu0(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center, optional float radius, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient-g04MWJE(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center, optional float radius, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient-PvDSl28(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient-acbAMd8(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startY, optional float endY, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startY, optional float endY, optional androidx.compose.ui.graphics.TileMode tileMode);
+  }
+
+  public final class BrushKt {
+    method public static androidx.compose.ui.graphics.ShaderBrush ShaderBrush(android.graphics.Shader shader);
+  }
+
+  public interface Canvas {
+    method public void clipPath(androidx.compose.ui.graphics.Path path, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public default void clipRect(androidx.compose.ui.geometry.Rect rect, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void clipRect(float left, float top, float right, float bottom, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void concat-58bKbWc(float[] matrix);
+    method public void disableZ();
+    method public default void drawArc(androidx.compose.ui.geometry.Rect rect, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+    method public void drawArc(float left, float top, float right, float bottom, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+    method public default void drawArcRad(androidx.compose.ui.geometry.Rect rect, float startAngleRad, float sweepAngleRad, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+    method public void drawCircle-tVKstsI(long center, float radius, androidx.compose.ui.graphics.Paint paint);
+    method public void drawImage-uwcbMjI(androidx.compose.ui.graphics.ImageBitmap image, long topLeftOffset, androidx.compose.ui.graphics.Paint paint);
+    method public void drawImageRect-bgE79EM(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, androidx.compose.ui.graphics.Paint paint);
+    method public void drawLine-bYPfCD8(long p1, long p2, androidx.compose.ui.graphics.Paint paint);
+    method public default void drawOval(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+    method public void drawOval(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+    method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Paint paint);
+    method public void drawPoints(androidx.compose.ui.graphics.PointMode pointMode, java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRawPoints(androidx.compose.ui.graphics.PointMode pointMode, float[] points, androidx.compose.ui.graphics.Paint paint);
+    method public default void drawRect(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRect(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+    method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.compose.ui.graphics.Paint paint);
+    method public void drawVertices(androidx.compose.ui.graphics.Vertices vertices, androidx.compose.ui.graphics.BlendMode blendMode, androidx.compose.ui.graphics.Paint paint);
+    method public void enableZ();
+    method public void restore();
+    method public void rotate(float degrees);
+    method public void save();
+    method public void saveLayer(androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint);
+    method public void scale(float sx, optional float sy);
+    method public void skew(float sx, float sy);
+    method public default void skewRad(float sxRad, float syRad);
+    method public void translate(float dx, float dy);
+  }
+
+  public final class CanvasHolder {
+    ctor public CanvasHolder();
+    method public inline void drawInto(android.graphics.Canvas targetCanvas, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+    field @kotlin.PublishedApi internal final androidx.compose.ui.graphics.AndroidCanvas androidCanvas;
+  }
+
+  public final class CanvasKt {
+    method public static androidx.compose.ui.graphics.Canvas Canvas(androidx.compose.ui.graphics.ImageBitmap image);
+    method public static void rotate(androidx.compose.ui.graphics.Canvas, float degrees, float pivotX, float pivotY);
+    method public static void rotateRad(androidx.compose.ui.graphics.Canvas, float radians, optional float pivotX, optional float pivotY);
+    method public static void scale(androidx.compose.ui.graphics.Canvas, float sx, optional float sy, float pivotX, float pivotY);
+    method public static inline void withSave(androidx.compose.ui.graphics.Canvas, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public static inline void withSaveLayer(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public enum ClipOp {
+    enum_constant public static final androidx.compose.ui.graphics.ClipOp Difference;
+    enum_constant public static final androidx.compose.ui.graphics.ClipOp Intersect;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Color {
+    ctor public Color();
+    method @androidx.compose.runtime.Stable public static operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component2-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component3-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component4-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator androidx.compose.ui.graphics.colorspace.ColorSpace component5-impl(long $this);
+    method public static long constructor-impl(long value);
+    method public static long convert-0d7_KjU(long $this, androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+    method @androidx.compose.runtime.Stable public static long copy-0d7_KjU(long $this, optional float alpha, optional float red, optional float green, optional float blue);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getAlpha-impl(long $this);
+    method public static float getBlue-impl(long $this);
+    method public static androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace-impl(long $this);
+    method public static float getGreen-impl(long $this);
+    method public static float getRed-impl(long $this);
+    method public long getValue-s-VKNKU();
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static String toString-impl(long $this);
+    property public final long value;
+    field public static final androidx.compose.ui.graphics.Color.Companion Companion;
+  }
+
+  public static final class Color.Companion {
+    method public long getBlack-0d7_KjU();
+    method public long getBlue-0d7_KjU();
+    method public long getCyan-0d7_KjU();
+    method public long getDarkGray-0d7_KjU();
+    method public long getGray-0d7_KjU();
+    method public long getGreen-0d7_KjU();
+    method public long getLightGray-0d7_KjU();
+    method public long getMagenta-0d7_KjU();
+    method public long getRed-0d7_KjU();
+    method public long getTransparent-0d7_KjU();
+    method public long getUnspecified-0d7_KjU();
+    method public long getWhite-0d7_KjU();
+    method public long getYellow-0d7_KjU();
+    property public final long Black;
+    property public final long Blue;
+    property public final long Cyan;
+    property public final long DarkGray;
+    property public final long Gray;
+    property public final long Green;
+    property public final long LightGray;
+    property public final long Magenta;
+    property public final long Red;
+    property public final long Transparent;
+    property public final long Unspecified;
+    property public final long White;
+    property public final long Yellow;
+  }
+
+  @androidx.compose.runtime.Immutable public final class ColorFilter {
+    field public static final androidx.compose.ui.graphics.ColorFilter.Companion Companion;
+  }
+
+  public static final class ColorFilter.Companion {
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter colorMatrix-jHG-Opc(float[] colorMatrix);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter lighting-6xK2E-Q(long multiply, long add);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter tint-aamYUWA(long color, optional androidx.compose.ui.graphics.BlendMode blendMode);
+  }
+
+  public final class ColorKt {
+    method @androidx.compose.runtime.Stable public static long Color(float red, float green, float blue, optional float alpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+    method @androidx.compose.runtime.Stable public static long Color(int color);
+    method @androidx.compose.runtime.Stable public static long Color(long color);
+    method @androidx.compose.runtime.Stable public static long Color(int red, int green, int blue, optional int alpha);
+    method @androidx.compose.runtime.Stable public static long compositeOver-6xK2E-Q(long, long background);
+    method public static inline boolean isSpecified-8_81llA(long);
+    method public static inline boolean isUnspecified-8_81llA(long);
+    method @androidx.compose.runtime.Stable public static long lerp-m18UwgE(long start, long stop, float fraction);
+    method @androidx.compose.runtime.Stable public static float luminance-8_81llA(long);
+    method public static inline long takeOrElse-iYUlWp8(long, kotlin.jvm.functions.Function0<androidx.compose.ui.graphics.Color> block);
+    method @androidx.compose.runtime.Stable public static int toArgb-8_81llA(long);
+  }
+
+  public final inline class ColorMatrix {
+    ctor public ColorMatrix();
+    method public static float[]! constructor-impl(optional float[] values);
+    method public static void convertRgbToYuv-impl(float[]! $this);
+    method public static void convertYuvToRgb-impl(float[]! $this);
+    method public static inline boolean equals-impl(float[]! p, Object? p1);
+    method public static boolean equals-impl0(float[] p1, float[] p2);
+    method public static inline operator float get-impl(float[] $this, int row, int column);
+    method public float[] getValues();
+    method public static inline int hashCode-impl(float[]! p);
+    method public static void reset-impl(float[]! $this);
+    method public static inline operator void set-impl(float[] $this, int row, int column, float v);
+    method public static void set-jHG-Opc(float[] $this, float[] src);
+    method public static void setToRotateBlue-impl(float[] $this, float degrees);
+    method public static void setToRotateGreen-impl(float[] $this, float degrees);
+    method public static void setToRotateRed-impl(float[] $this, float degrees);
+    method public static void setToSaturation-impl(float[] $this, float sat);
+    method public static void setToScale-impl(float[] $this, float redScale, float greenScale, float blueScale, float alphaScale);
+    method public static operator void timesAssign-jHG-Opc(float[] $this, float[] colorMatrix);
+    method public static inline String! toString-impl(float[]! p);
+    property public final float[] values;
+  }
+
+  public final class DegreesKt {
+    method @kotlin.PublishedApi internal static float degrees(float radians);
+  }
+
+  public enum FilterQuality {
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality High;
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality Low;
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality Medium;
+    enum_constant public static final androidx.compose.ui.graphics.FilterQuality None;
+  }
+
+  public final class Float16Kt {
+  }
+
+  public interface ImageBitmap {
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
+    method public androidx.compose.ui.graphics.ImageBitmapConfig getConfig();
+    method public boolean getHasAlpha();
+    method public int getHeight();
+    method public int getWidth();
+    method public void prepareToDraw();
+    method public void readPixels(int[] buffer, optional int startX, optional int startY, optional int width, optional int height, optional int bufferOffset, optional int stride);
+    property public abstract androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace;
+    property public abstract androidx.compose.ui.graphics.ImageBitmapConfig config;
+    property public abstract boolean hasAlpha;
+    property public abstract int height;
+    property public abstract int width;
+    field public static final androidx.compose.ui.graphics.ImageBitmap.Companion Companion;
+  }
+
+  public static final class ImageBitmap.Companion {
+  }
+
+  public enum ImageBitmapConfig {
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Alpha8;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Argb8888;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig F16;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Gpu;
+    enum_constant public static final androidx.compose.ui.graphics.ImageBitmapConfig Rgb565;
+  }
+
+  public final class ImageBitmapKt {
+    method public static androidx.compose.ui.graphics.ImageBitmap ImageBitmap(int width, int height, optional androidx.compose.ui.graphics.ImageBitmapConfig config, optional boolean hasAlpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+    method public static androidx.compose.ui.graphics.PixelMap toPixelMap(androidx.compose.ui.graphics.ImageBitmap, optional int startX, optional int startY, optional int width, optional int height, optional int[] buffer, optional int bufferOffset, optional int stride);
+  }
+
+  @androidx.compose.runtime.Immutable public final class LinearGradient extends androidx.compose.ui.graphics.ShaderBrush {
+    method public android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public final inline class Matrix {
+    ctor public Matrix();
+    method public static float[]! constructor-impl(optional float[] values);
+    method public static inline boolean equals-impl(float[]! p, Object? p1);
+    method public static boolean equals-impl0(float[] p1, float[] p2);
+    method public static inline operator float get-impl(float[] $this, int row, int column);
+    method public float[] getValues();
+    method public static inline int hashCode-impl(float[]! p);
+    method public static void invert-impl(float[]! $this);
+    method public static androidx.compose.ui.geometry.Rect map-impl(float[] $this, androidx.compose.ui.geometry.Rect rect);
+    method public static void map-impl(float[] $this, androidx.compose.ui.geometry.MutableRect rect);
+    method public static long map-k-4lQ0M(float[] $this, long point);
+    method public static void reset-impl(float[]! $this);
+    method public static void rotateX-impl(float[] $this, float degrees);
+    method public static void rotateY-impl(float[] $this, float degrees);
+    method public static void rotateZ-impl(float[] $this, float degrees);
+    method public static void scale-impl(float[] $this, optional float x, optional float y, optional float z);
+    method public static inline operator void set-impl(float[] $this, int row, int column, float v);
+    method public static void setFrom-58bKbWc(float[] $this, float[] matrix);
+    method public static operator void timesAssign-58bKbWc(float[] $this, float[] m);
+    method public static String toString-impl(float[]! $this);
+    method public static void translate-impl(float[] $this, optional float x, optional float y, optional float z);
+    property public final float[] values;
+    field public static final androidx.compose.ui.graphics.Matrix.Companion Companion;
+    field public static final int Perspective0 = 3; // 0x3
+    field public static final int Perspective1 = 7; // 0x7
+    field public static final int Perspective2 = 15; // 0xf
+    field public static final int ScaleX = 0; // 0x0
+    field public static final int ScaleY = 5; // 0x5
+    field public static final int ScaleZ = 10; // 0xa
+    field public static final int SkewX = 4; // 0x4
+    field public static final int SkewY = 1; // 0x1
+    field public static final int TranslateX = 12; // 0xc
+    field public static final int TranslateY = 13; // 0xd
+    field public static final int TranslateZ = 14; // 0xe
+  }
+
+  public static final class Matrix.Companion {
+  }
+
+  public final class MatrixKt {
+    method public static boolean isIdentity-58bKbWc(float[]);
+  }
+
+  public abstract sealed class Outline {
+    method public abstract androidx.compose.ui.geometry.Rect getBounds();
+    property public abstract androidx.compose.ui.geometry.Rect bounds;
+  }
+
+  public static final class Outline.Generic extends androidx.compose.ui.graphics.Outline {
+    ctor public Outline.Generic(androidx.compose.ui.graphics.Path path);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.graphics.Path getPath();
+    property public androidx.compose.ui.geometry.Rect bounds;
+    property public final androidx.compose.ui.graphics.Path path;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class Outline.Rectangle extends androidx.compose.ui.graphics.Outline {
+    ctor public Outline.Rectangle(androidx.compose.ui.geometry.Rect rect);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.geometry.Rect getRect();
+    property public androidx.compose.ui.geometry.Rect bounds;
+    property public final androidx.compose.ui.geometry.Rect rect;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class Outline.Rounded extends androidx.compose.ui.graphics.Outline {
+    ctor public Outline.Rounded(androidx.compose.ui.geometry.RoundRect roundRect);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.geometry.RoundRect getRoundRect();
+    property public androidx.compose.ui.geometry.Rect bounds;
+    property public final androidx.compose.ui.geometry.RoundRect roundRect;
+  }
+
+  public final class OutlineKt {
+    method public static void addOutline(androidx.compose.ui.graphics.Path, androidx.compose.ui.graphics.Outline outline);
+    method public static void drawOutline(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public static void drawOutline(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Paint paint);
+    method public static void drawOutline-mlewCHg(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+  }
+
+  public interface Paint {
+    method public android.graphics.Paint asFrameworkPaint();
+    method public float getAlpha();
+    method public androidx.compose.ui.graphics.BlendMode getBlendMode();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+    method public androidx.compose.ui.graphics.FilterQuality getFilterQuality();
+    method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+    method public android.graphics.Shader? getShader();
+    method public androidx.compose.ui.graphics.StrokeCap getStrokeCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getStrokeJoin();
+    method public float getStrokeMiterLimit();
+    method public float getStrokeWidth();
+    method public androidx.compose.ui.graphics.PaintingStyle getStyle();
+    method public boolean isAntiAlias();
+    method public void setAlpha(float p);
+    method public void setAntiAlias(boolean p);
+    method public void setBlendMode(androidx.compose.ui.graphics.BlendMode p);
+    method public void setColor-8_81llA(long p);
+    method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter? p);
+    method public void setFilterQuality(androidx.compose.ui.graphics.FilterQuality p);
+    method public void setPathEffect(androidx.compose.ui.graphics.PathEffect? p);
+    method public void setShader(android.graphics.Shader? p);
+    method public void setStrokeCap(androidx.compose.ui.graphics.StrokeCap p);
+    method public void setStrokeJoin(androidx.compose.ui.graphics.StrokeJoin p);
+    method public void setStrokeMiterLimit(float p);
+    method public void setStrokeWidth(float p);
+    method public void setStyle(androidx.compose.ui.graphics.PaintingStyle p);
+    property public abstract float alpha;
+    property public abstract androidx.compose.ui.graphics.BlendMode blendMode;
+    property public abstract long color;
+    property public abstract androidx.compose.ui.graphics.ColorFilter? colorFilter;
+    property public abstract androidx.compose.ui.graphics.FilterQuality filterQuality;
+    property public abstract boolean isAntiAlias;
+    property public abstract androidx.compose.ui.graphics.PathEffect? pathEffect;
+    property public abstract android.graphics.Shader? shader;
+    property public abstract androidx.compose.ui.graphics.StrokeCap strokeCap;
+    property public abstract androidx.compose.ui.graphics.StrokeJoin strokeJoin;
+    property public abstract float strokeMiterLimit;
+    property public abstract float strokeWidth;
+    property public abstract androidx.compose.ui.graphics.PaintingStyle style;
+  }
+
+  public final class PaintKt {
+    field public static final float DefaultAlpha = 1.0f;
+  }
+
+  public enum PaintingStyle {
+    enum_constant public static final androidx.compose.ui.graphics.PaintingStyle Fill;
+    enum_constant public static final androidx.compose.ui.graphics.PaintingStyle Stroke;
+  }
+
+  public interface Path {
+    method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.compose.ui.geometry.Rect oval);
+    method public void addPath-ej0GBII(androidx.compose.ui.graphics.Path path, optional long offset);
+    method public void addRect(androidx.compose.ui.geometry.Rect rect);
+    method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+    method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+    method public default void arcToRad(androidx.compose.ui.geometry.Rect rect, float startAngleRadians, float sweepAngleRadians, boolean forceMoveTo);
+    method public void close();
+    method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.compose.ui.geometry.Rect getBounds();
+    method public androidx.compose.ui.graphics.PathFillType getFillType();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float x, float y);
+    method public void moveTo(float x, float y);
+    method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, androidx.compose.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+    method public void reset();
+    method public void setFillType(androidx.compose.ui.graphics.PathFillType p);
+    method public void translate-k-4lQ0M(long offset);
+    property public abstract androidx.compose.ui.graphics.PathFillType fillType;
+    property public abstract boolean isConvex;
+    property public abstract boolean isEmpty;
+    field public static final androidx.compose.ui.graphics.Path.Companion Companion;
+  }
+
+  public static final class Path.Companion {
+    method public androidx.compose.ui.graphics.Path combine(androidx.compose.ui.graphics.PathOperation operation, androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2);
+  }
+
+  public interface PathEffect {
+    field public static final androidx.compose.ui.graphics.PathEffect.Companion Companion;
+  }
+
+  public static final class PathEffect.Companion {
+    method public androidx.compose.ui.graphics.PathEffect chainPathEffect(androidx.compose.ui.graphics.PathEffect outer, androidx.compose.ui.graphics.PathEffect inner);
+    method public androidx.compose.ui.graphics.PathEffect cornerPathEffect(float radius);
+    method public androidx.compose.ui.graphics.PathEffect dashPathEffect(float[] intervals, optional float phase);
+    method public androidx.compose.ui.graphics.PathEffect stampedPathEffect(androidx.compose.ui.graphics.Path shape, float advance, float phase, androidx.compose.ui.graphics.StampedPathEffectStyle style);
+  }
+
+  public enum PathFillType {
+    enum_constant public static final androidx.compose.ui.graphics.PathFillType EvenOdd;
+    enum_constant public static final androidx.compose.ui.graphics.PathFillType NonZero;
+  }
+
+  public interface PathMeasure {
+    method public float getLength();
+    method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, optional boolean startWithMoveTo);
+    method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+    property public abstract float length;
+  }
+
+  public enum PathOperation {
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation difference;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation intersect;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation reverseDifference;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation union;
+    enum_constant public static final androidx.compose.ui.graphics.PathOperation xor;
+  }
+
+  public final class PixelMap {
+    ctor public PixelMap(int[] buffer, int width, int height, int bufferOffset, int stride);
+    method public operator long get-0d7_KjU(int x, int y);
+    method public int[] getBuffer();
+    method public int getBufferOffset();
+    method public int getHeight();
+    method public int getStride();
+    method public int getWidth();
+    property public final int[] buffer;
+    property public final int bufferOffset;
+    property public final int height;
+    property public final int stride;
+    property public final int width;
+  }
+
+  public enum PointMode {
+    enum_constant public static final androidx.compose.ui.graphics.PointMode Lines;
+    enum_constant public static final androidx.compose.ui.graphics.PointMode Points;
+    enum_constant public static final androidx.compose.ui.graphics.PointMode Polygon;
+  }
+
+  @androidx.compose.runtime.Immutable public final class RadialGradient extends androidx.compose.ui.graphics.ShaderBrush {
+    method public android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public final class RectHelper_androidKt {
+    method public static android.graphics.Rect toAndroidRect(androidx.compose.ui.geometry.Rect);
+    method public static android.graphics.RectF toAndroidRectF(androidx.compose.ui.geometry.Rect);
+    method public static androidx.compose.ui.geometry.Rect toComposeRect(android.graphics.Rect);
+  }
+
+  public final class RectangleShapeKt {
+    method public static androidx.compose.ui.graphics.Shape getRectangleShape();
+  }
+
+  @androidx.compose.runtime.Immutable public abstract class ShaderBrush extends androidx.compose.ui.graphics.Brush {
+    ctor public ShaderBrush();
+    method public final void applyTo-TJof4Gw(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+    method public abstract android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public final class ShaderKt {
+    method public static android.graphics.Shader ImageShader(androidx.compose.ui.graphics.ImageBitmap image, optional androidx.compose.ui.graphics.TileMode tileModeX, optional androidx.compose.ui.graphics.TileMode tileModeY);
+    method public static android.graphics.Shader LinearGradientShader-GfyHbQM(long from, long to, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method public static android.graphics.Shader RadialGradientShader-cY6o93o(long center, float radius, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional androidx.compose.ui.graphics.TileMode tileMode);
+    method public static android.graphics.Shader SweepGradientShader-GpNgDDw(long center, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Shadow {
+    method public androidx.compose.ui.graphics.Shadow copy-vQQzcCI(optional long color, optional long offset, optional float blurRadius);
+    method public float getBlurRadius();
+    method public long getColor-0d7_KjU();
+    method public long getOffset-F1C5BW0();
+    property public final float blurRadius;
+    property public final long color;
+    property public final long offset;
+    field public static final androidx.compose.ui.graphics.Shadow.Companion Companion;
+  }
+
+  public static final class Shadow.Companion {
+    method public androidx.compose.ui.graphics.Shadow getNone();
+    property public final androidx.compose.ui.graphics.Shadow None;
+  }
+
+  public final class ShadowKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.Shadow lerp(androidx.compose.ui.graphics.Shadow start, androidx.compose.ui.graphics.Shadow stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public interface Shape {
+    method public androidx.compose.ui.graphics.Outline createOutline-9w1PWio(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+  }
+
+  @androidx.compose.runtime.Immutable public final class SolidColor extends androidx.compose.ui.graphics.Brush {
+    method public void applyTo-TJof4Gw(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+    method public long getValue-0d7_KjU();
+    property public final long value;
+  }
+
+  public enum StampedPathEffectStyle {
+    enum_constant public static final androidx.compose.ui.graphics.StampedPathEffectStyle Morph;
+    enum_constant public static final androidx.compose.ui.graphics.StampedPathEffectStyle Rotate;
+    enum_constant public static final androidx.compose.ui.graphics.StampedPathEffectStyle Translate;
+  }
+
+  public enum StrokeCap {
+    enum_constant public static final androidx.compose.ui.graphics.StrokeCap Butt;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeCap Round;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeCap Square;
+  }
+
+  public enum StrokeJoin {
+    enum_constant public static final androidx.compose.ui.graphics.StrokeJoin Bevel;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeJoin Miter;
+    enum_constant public static final androidx.compose.ui.graphics.StrokeJoin Round;
+  }
+
+  @androidx.compose.runtime.Immutable public final class SweepGradient extends androidx.compose.ui.graphics.ShaderBrush {
+    method public android.graphics.Shader createShader-uvyYCjk(long size);
+  }
+
+  public enum TileMode {
+    enum_constant public static final androidx.compose.ui.graphics.TileMode Clamp;
+    enum_constant public static final androidx.compose.ui.graphics.TileMode Mirror;
+    enum_constant public static final androidx.compose.ui.graphics.TileMode Repeated;
+  }
+
+  public enum VertexMode {
+    enum_constant public static final androidx.compose.ui.graphics.VertexMode TriangleFan;
+    enum_constant public static final androidx.compose.ui.graphics.VertexMode TriangleStrip;
+    enum_constant public static final androidx.compose.ui.graphics.VertexMode Triangles;
+  }
+
+  public final class Vertices {
+    ctor public Vertices(androidx.compose.ui.graphics.VertexMode vertexMode, java.util.List<androidx.compose.ui.geometry.Offset> positions, java.util.List<androidx.compose.ui.geometry.Offset> textureCoordinates, java.util.List<androidx.compose.ui.graphics.Color> colors, java.util.List<java.lang.Integer> indices);
+    method public int[] getColors();
+    method public short[] getIndices();
+    method public float[] getPositions();
+    method public float[] getTextureCoordinates();
+    method public androidx.compose.ui.graphics.VertexMode getVertexMode();
+    property public final int[] colors;
+    property public final short[] indices;
+    property public final float[] positions;
+    property public final float[] textureCoordinates;
+    property public final androidx.compose.ui.graphics.VertexMode vertexMode;
+  }
+
+}
+
+package androidx.compose.ui.graphics.colorspace {
+
+  public enum Adaptation {
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.Adaptation Bradford;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.Adaptation Ciecat02;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.Adaptation VonKries;
+  }
+
+  public enum ColorModel {
+    method public final int getComponentCount();
+    property public final int componentCount;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Cmyk;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Lab;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Rgb;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.ColorModel Xyz;
+  }
+
+  public abstract class ColorSpace {
+    ctor public ColorSpace(String name, androidx.compose.ui.graphics.colorspace.ColorModel model);
+    method public final float[] fromXyz(float x, float y, float z);
+    method public abstract float[] fromXyz(float[] v);
+    method public final int getComponentCount();
+    method public abstract float getMaxValue(int component);
+    method public abstract float getMinValue(int component);
+    method public final androidx.compose.ui.graphics.colorspace.ColorModel getModel();
+    method public final String getName();
+    method public boolean isSrgb();
+    method public abstract boolean isWideGamut();
+    method public final float[] toXyz(float r, float g, float b);
+    method public abstract float[] toXyz(float[] v);
+    property public final int componentCount;
+    property public boolean isSrgb;
+    property public abstract boolean isWideGamut;
+    property public final androidx.compose.ui.graphics.colorspace.ColorModel model;
+    property public final String name;
+  }
+
+  public final class ColorSpaceKt {
+    method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, optional androidx.compose.ui.graphics.colorspace.Adaptation adaptation);
+    method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint);
+    method public static androidx.compose.ui.graphics.colorspace.Connector connect(androidx.compose.ui.graphics.colorspace.ColorSpace, optional androidx.compose.ui.graphics.colorspace.ColorSpace destination, optional androidx.compose.ui.graphics.colorspace.RenderIntent intent);
+  }
+
+  public final class ColorSpaces {
+    method public androidx.compose.ui.graphics.colorspace.Rgb getAces();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getAcescg();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getAdobeRgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getBt2020();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getBt709();
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieLab();
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieXyz();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getDciP3();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getDisplayP3();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getExtendedSrgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getLinearExtendedSrgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getLinearSrgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getNtsc1953();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getProPhotoRgb();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getSmpteC();
+    method public androidx.compose.ui.graphics.colorspace.Rgb getSrgb();
+    method public androidx.compose.ui.graphics.colorspace.ColorSpace? match(float[] toXYZD50, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Aces;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Acescg;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb AdobeRgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Bt2020;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Bt709;
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieLab;
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieXyz;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb DciP3;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb DisplayP3;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb ExtendedSrgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb LinearExtendedSrgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb LinearSrgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Ntsc1953;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb ProPhotoRgb;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb SmpteC;
+    property public final androidx.compose.ui.graphics.colorspace.Rgb Srgb;
+    field public static final androidx.compose.ui.graphics.colorspace.ColorSpaces INSTANCE;
+  }
+
+  public class Connector {
+    method public final androidx.compose.ui.graphics.colorspace.ColorSpace getDestination();
+    method public final androidx.compose.ui.graphics.colorspace.RenderIntent getRenderIntent();
+    method public final androidx.compose.ui.graphics.colorspace.ColorSpace getSource();
+    method public final float[] transform(float r, float g, float b);
+    method public float[] transform(float[] v);
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace destination;
+    property public final androidx.compose.ui.graphics.colorspace.RenderIntent renderIntent;
+    property public final androidx.compose.ui.graphics.colorspace.ColorSpace source;
+  }
+
+  public final class Illuminant {
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getA();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getB();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getC();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD50();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD55();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD60();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD65();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getD75();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getE();
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint A;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint B;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint C;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D50;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D55;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D60;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D65;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint D75;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint E;
+    field public static final androidx.compose.ui.graphics.colorspace.Illuminant INSTANCE;
+  }
+
+  public enum RenderIntent {
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Absolute;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Perceptual;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Relative;
+    enum_constant public static final androidx.compose.ui.graphics.colorspace.RenderIntent Saturation;
+  }
+
+  public final class Rgb extends androidx.compose.ui.graphics.colorspace.ColorSpace {
+    ctor public Rgb(String name, float[] toXYZ, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf);
+    ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf, float min, float max);
+    ctor public Rgb(String name, float[] toXYZ, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(String name, float[] toXYZ, double gamma);
+    ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, double gamma);
+    method public float[] fromLinear(float r, float g, float b);
+    method public float[] fromLinear(float[] v);
+    method public float[] fromXyz(float[] v);
+    method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getEotf();
+    method public float[] getInverseTransform();
+    method public float[] getInverseTransform(float[] inverseTransform);
+    method public float getMaxValue(int component);
+    method public float getMinValue(int component);
+    method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getOetf();
+    method public float[] getPrimaries();
+    method public float[] getPrimaries(float[] primaries);
+    method public androidx.compose.ui.graphics.colorspace.TransferParameters? getTransferParameters();
+    method public float[] getTransform();
+    method public float[] getTransform(float[] transform);
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint getWhitePoint();
+    method public boolean isWideGamut();
+    method public float[] toLinear(float r, float g, float b);
+    method public float[] toLinear(float[] v);
+    method public float[] toXyz(float[] v);
+    property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> eotf;
+    property public boolean isSrgb;
+    property public boolean isWideGamut;
+    property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> oetf;
+    property public final androidx.compose.ui.graphics.colorspace.TransferParameters? transferParameters;
+    property public final androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint;
+  }
+
+  public final class TransferParameters {
+    ctor public TransferParameters(double gamma, double a, double b, double c, double d, optional double e, optional double f);
+    method public double component1();
+    method public double component2();
+    method public double component3();
+    method public double component4();
+    method public double component5();
+    method public double component6();
+    method public double component7();
+    method public androidx.compose.ui.graphics.colorspace.TransferParameters copy(double gamma, double a, double b, double c, double d, double e, double f);
+    method public double getA();
+    method public double getB();
+    method public double getC();
+    method public double getD();
+    method public double getE();
+    method public double getF();
+    method public double getGamma();
+    property public final double a;
+    property public final double b;
+    property public final double c;
+    property public final double d;
+    property public final double e;
+    property public final double f;
+    property public final double gamma;
+  }
+
+  public final class WhitePoint {
+    ctor public WhitePoint(float x, float y);
+    ctor public WhitePoint(float x, float y, float z);
+    method public float component1();
+    method public float component2();
+    method public androidx.compose.ui.graphics.colorspace.WhitePoint copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+}
+
+package androidx.compose.ui.graphics.drawscope {
+
+  public final class CanvasDrawScope implements androidx.compose.ui.graphics.drawscope.DrawScope {
+    ctor public CanvasDrawScope();
+    method public inline void draw-jkGVKLE(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.graphics.Canvas canvas, long size, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public void drawArc-BcZ8TnY(long color, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawArc-C-Io9bM(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-NGaRamM(long color, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-m-UMHxE(androidx.compose.ui.graphics.Brush brush, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-JUiai_k(androidx.compose.ui.graphics.ImageBitmap image, long topLeft, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-Yc2aOMw(androidx.compose.ui.graphics.ImageBitmap image, long srcOffset, long srcSize, long dstOffset, long dstSize, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-QXZmVdc(long color, long start, long end, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-UXw4dv4(androidx.compose.ui.graphics.Brush brush, long start, long end, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-IdEHoqk(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath-tilSWAQ(androidx.compose.ui.graphics.Path path, long color, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, androidx.compose.ui.graphics.Brush brush, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints-Aqy9O-k(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, long color, float strokeWidth, androidx.compose.ui.graphics.StrokeCap cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-IdEHoqk(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-fNghmuc(long color, long topLeft, long size, long cornerRadius, androidx.compose.ui.graphics.drawscope.DrawStyle style, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-sDDzLXA(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, long cornerRadius, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, androidx.compose.ui.graphics.BlendMode blendMode);
+    method public float getDensity();
+    method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+    method public float getFontScale();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    property public float density;
+    property public androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+    property public float fontScale;
+    property public androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    field @kotlin.PublishedApi internal final androidx.compose.ui.graphics.drawscope.CanvasDrawScope.DrawParams drawParams;
+  }
+
+  @kotlin.PublishedApi internal static final class CanvasDrawScope.DrawParams {
+    method public androidx.compose.ui.unit.Density component1();
+    method public androidx.compose.ui.unit.LayoutDirection component2();
+    method public androidx.compose.ui.graphics.Canvas component3();
+    method public long component4-NH-jbRc();
+    method @kotlin.PublishedApi internal androidx.compose.ui.graphics.drawscope.CanvasDrawScope.DrawParams copy-xYU37iA(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.graphics.Canvas canvas, long size);
+    method @kotlin.PublishedApi internal boolean equals(Object? p);
+    method public androidx.compose.ui.graphics.Canvas getCanvas();
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public long getSize-NH-jbRc();
+    method @kotlin.PublishedApi internal int hashCode();
+    method public void setCanvas(androidx.compose.ui.graphics.Canvas p);
+    method public void setDensity(androidx.compose.ui.unit.Density p);
+    method public void setLayoutDirection(androidx.compose.ui.unit.LayoutDirection p);
+    method public void setSize-uvyYCjk(long p);
+    method @kotlin.PublishedApi internal String toString();
+    property public final androidx.compose.ui.graphics.Canvas canvas;
+    property public final androidx.compose.ui.unit.Density density;
+    property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public final long size;
+  }
+
+  public final class CanvasDrawScopeKt {
+  }
+
+  public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
+    method public void drawContent();
+  }
+
+  public interface DrawContext {
+    method public androidx.compose.ui.graphics.Canvas getCanvas();
+    method public long getSize-NH-jbRc();
+    method public androidx.compose.ui.graphics.drawscope.DrawTransform getTransform();
+    method public void setSize-uvyYCjk(long p);
+    property public abstract androidx.compose.ui.graphics.Canvas canvas;
+    property public abstract long size;
+    property public abstract androidx.compose.ui.graphics.drawscope.DrawTransform transform;
+  }
+
+  @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawScope extends androidx.compose.ui.unit.Density {
+    method public void drawArc-BcZ8TnY(long color, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawArc-C-Io9bM(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-NGaRamM(long color, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawCircle-m-UMHxE(androidx.compose.ui.graphics.Brush brush, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-JUiai_k(androidx.compose.ui.graphics.ImageBitmap image, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawImage-Yc2aOMw(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-QXZmVdc(long color, long start, long end, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawLine-UXw4dv4(androidx.compose.ui.graphics.Brush brush, long start, long end, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawOval-IdEHoqk(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPath-tilSWAQ(androidx.compose.ui.graphics.Path path, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, androidx.compose.ui.graphics.Brush brush, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawPoints-Aqy9O-k(java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.PointMode pointMode, long color, optional float strokeWidth, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-0a6MmAQ(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRect-IdEHoqk(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-fNghmuc(long color, optional long topLeft, optional long size, optional long cornerRadius, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public void drawRoundRect-sDDzLXA(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional long cornerRadius, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional androidx.compose.ui.graphics.BlendMode blendMode);
+    method public default long getCenter-F1C5BW0();
+    method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public default long getSize-NH-jbRc();
+    method public long offsetSize(long, long offset);
+    property public default long center;
+    property public abstract androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+    property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public default long size;
+    field public static final androidx.compose.ui.graphics.drawscope.DrawScope.Companion Companion;
+  }
+
+  public static final class DrawScope.Companion {
+    method public androidx.compose.ui.graphics.BlendMode getDefaultBlendMode();
+    property public final androidx.compose.ui.graphics.BlendMode DefaultBlendMode;
+  }
+
+  public final class DrawScopeKt {
+    method public static inline void clipPath(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Path path, optional androidx.compose.ui.graphics.ClipOp clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void clipRect(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, optional float right, optional float bottom, optional androidx.compose.ui.graphics.ClipOp clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void drawIntoCanvas(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float left, float top, float right, float bottom, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float inset, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, optional float horizontal, optional float vertical, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void rotate-FvlOZkk(androidx.compose.ui.graphics.drawscope.DrawScope, float degrees, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void rotateRad-FvlOZkk(androidx.compose.ui.graphics.drawscope.DrawScope, float radians, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void scale-FvlOZkk(androidx.compose.ui.graphics.drawscope.DrawScope, float scale, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void scale-LCqtnZ0(androidx.compose.ui.graphics.drawscope.DrawScope, float scaleX, float scaleY, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void translate(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public static inline void withTransform(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawTransform,kotlin.Unit> transformBlock, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> drawBlock);
+  }
+
+  @kotlin.DslMarker public @interface DrawScopeMarker {
+  }
+
+  public abstract sealed class DrawStyle {
+  }
+
+  @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawTransform {
+    method public void clipPath(androidx.compose.ui.graphics.Path path, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public void clipRect(optional float left, optional float top, optional float right, optional float bottom, optional androidx.compose.ui.graphics.ClipOp clipOp);
+    method public default long getCenter-F1C5BW0();
+    method public long getSize-NH-jbRc();
+    method public void inset(float left, float top, float right, float bottom);
+    method public void rotate-KYFOyyg(float degrees, optional long pivot);
+    method public void scale-QguGWxw(float scaleX, float scaleY, optional long pivot);
+    method public void transform-58bKbWc(float[] matrix);
+    method public void translate(optional float left, optional float top);
+    property public default long center;
+    property public abstract long size;
+  }
+
+  public final class DrawTransformKt {
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, optional float horizontal, optional float vertical);
+    method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, float inset);
+    method public static inline void rotateRad-kdYHfaE(androidx.compose.ui.graphics.drawscope.DrawTransform, float radians, optional long pivot);
+    method public static inline void scale-kdYHfaE(androidx.compose.ui.graphics.drawscope.DrawTransform, float scale, optional long pivot);
+  }
+
+  public final class Fill extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+    field public static final androidx.compose.ui.graphics.drawscope.Fill INSTANCE;
+  }
+
+  public final class Stroke extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+    ctor public Stroke(optional float width, optional float miter, optional androidx.compose.ui.graphics.StrokeCap cap, optional androidx.compose.ui.graphics.StrokeJoin join, optional androidx.compose.ui.graphics.PathEffect? pathEffect);
+    method public androidx.compose.ui.graphics.StrokeCap getCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getJoin();
+    method public float getMiter();
+    method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+    method public float getWidth();
+    property public final androidx.compose.ui.graphics.StrokeCap cap;
+    property public final androidx.compose.ui.graphics.StrokeJoin join;
+    property public final float miter;
+    property public final androidx.compose.ui.graphics.PathEffect? pathEffect;
+    property public final float width;
+    field public static final androidx.compose.ui.graphics.drawscope.Stroke.Companion Companion;
+    field public static final float DefaultMiter = 4.0f;
+    field public static final float HairlineWidth = 0.0f;
+  }
+
+  public static final class Stroke.Companion {
+    method public androidx.compose.ui.graphics.StrokeCap getDefaultCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getDefaultJoin();
+    property public final androidx.compose.ui.graphics.StrokeCap DefaultCap;
+    property public final androidx.compose.ui.graphics.StrokeJoin DefaultJoin;
+  }
+
+}
+
+package androidx.compose.ui.graphics.painter {
+
+  public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
+    method public long getIntrinsicSize-NH-jbRc();
+    method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public long intrinsicSize;
+  }
+
+  public final class ColorPainter extends androidx.compose.ui.graphics.painter.Painter {
+    method public long getColor-0d7_KjU();
+    method public long getIntrinsicSize-NH-jbRc();
+    method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public final long color;
+    property public long intrinsicSize;
+  }
+
+  public abstract class Painter {
+    ctor public Painter();
+    method protected boolean applyAlpha(float alpha);
+    method protected boolean applyColorFilter(androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method protected boolean applyLayoutDirection(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public final void draw-ty3CEPU(androidx.compose.ui.graphics.drawscope.DrawScope, long size, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+    method public abstract long getIntrinsicSize-NH-jbRc();
+    method protected abstract void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public abstract long intrinsicSize;
+  }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+  public final class PathBuilder {
+    ctor public PathBuilder();
+    method public androidx.compose.ui.graphics.vector.PathBuilder arcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder arcToRelative(float a, float b, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float dx1, float dy1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder close();
+    method public androidx.compose.ui.graphics.vector.PathBuilder curveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.compose.ui.graphics.vector.PathBuilder curveToRelative(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getNodes();
+    method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineTo(float x);
+    method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineToRelative(float dx);
+    method public androidx.compose.ui.graphics.vector.PathBuilder lineTo(float x, float y);
+    method public androidx.compose.ui.graphics.vector.PathBuilder lineToRelative(float dx, float dy);
+    method public androidx.compose.ui.graphics.vector.PathBuilder moveTo(float x, float y);
+    method public androidx.compose.ui.graphics.vector.PathBuilder moveToRelative(float dx, float dy);
+    method public androidx.compose.ui.graphics.vector.PathBuilder quadTo(float x1, float y1, float x2, float y2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder quadToRelative(float dx1, float dy1, float dx2, float dy2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveTo(float x1, float y1, float x2, float y2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveToRelative(float dx1, float dy1, float dx2, float dy2);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadTo(float x1, float y1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadToRelative(float dx1, float dy1);
+    method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineTo(float y);
+    method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineToRelative(float dy);
+  }
+
+  @androidx.compose.runtime.Immutable public abstract sealed class PathNode {
+    method public final boolean isCurve();
+    method public final boolean isQuad();
+    property public final boolean isCurve;
+    property public final boolean isQuad;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.ArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.ArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public boolean component4();
+    method public boolean component5();
+    method public float component6();
+    method public float component7();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.ArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+    method public float getArcStartX();
+    method public float getArcStartY();
+    method public float getHorizontalEllipseRadius();
+    method public float getTheta();
+    method public float getVerticalEllipseRadius();
+    method public boolean isMoreThanHalf();
+    method public boolean isPositiveArc();
+    property public final float arcStartX;
+    property public final float arcStartY;
+    property public final float horizontalEllipseRadius;
+    property public final boolean isMoreThanHalf;
+    property public final boolean isPositiveArc;
+    property public final float theta;
+    property public final float verticalEllipseRadius;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.Close extends androidx.compose.ui.graphics.vector.PathNode {
+    field public static final androidx.compose.ui.graphics.vector.PathNode.Close INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.CurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.CurveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public float component5();
+    method public float component6();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.CurveTo copy(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public float getX1();
+    method public float getX2();
+    method public float getX3();
+    method public float getY1();
+    method public float getY2();
+    method public float getY3();
+    property public final float x1;
+    property public final float x2;
+    property public final float x3;
+    property public final float y1;
+    property public final float y2;
+    property public final float y3;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.HorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.HorizontalTo(float x);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.HorizontalTo copy(float x);
+    method public float getX();
+    property public final float x;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.LineTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.LineTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.LineTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.MoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.MoveTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.MoveTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.QuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.QuadTo(float x1, float y1, float x2, float y2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.QuadTo copy(float x1, float y1, float x2, float y2);
+    method public float getX1();
+    method public float getX2();
+    method public float getY1();
+    method public float getY2();
+    property public final float x1;
+    property public final float x2;
+    property public final float y1;
+    property public final float y2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.ReflectiveCurveTo(float x1, float y1, float x2, float y2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.ReflectiveCurveTo copy(float x1, float y1, float x2, float y2);
+    method public float getX1();
+    method public float getX2();
+    method public float getY1();
+    method public float getY2();
+    property public final float x1;
+    property public final float x2;
+    property public final float y1;
+    property public final float y2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.ReflectiveQuadTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.ReflectiveQuadTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+    property public final float x;
+    property public final float y;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public boolean component4();
+    method public boolean component5();
+    method public float component6();
+    method public float component7();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+    method public float getArcStartDx();
+    method public float getArcStartDy();
+    method public float getHorizontalEllipseRadius();
+    method public float getTheta();
+    method public float getVerticalEllipseRadius();
+    method public boolean isMoreThanHalf();
+    method public boolean isPositiveArc();
+    property public final float arcStartDx;
+    property public final float arcStartDy;
+    property public final float horizontalEllipseRadius;
+    property public final boolean isMoreThanHalf;
+    property public final boolean isPositiveArc;
+    property public final float theta;
+    property public final float verticalEllipseRadius;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeCurveTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public float component5();
+    method public float component6();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeCurveTo copy(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public float getDx1();
+    method public float getDx2();
+    method public float getDx3();
+    method public float getDy1();
+    method public float getDy2();
+    method public float getDy3();
+    property public final float dx1;
+    property public final float dx2;
+    property public final float dx3;
+    property public final float dy1;
+    property public final float dy2;
+    property public final float dy3;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeHorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeHorizontalTo(float dx);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeHorizontalTo copy(float dx);
+    method public float getDx();
+    property public final float dx;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeLineTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeLineTo(float dx, float dy);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeLineTo copy(float dx, float dy);
+    method public float getDx();
+    method public float getDy();
+    property public final float dx;
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeMoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeMoveTo(float dx, float dy);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeMoveTo copy(float dx, float dy);
+    method public float getDx();
+    method public float getDy();
+    property public final float dx;
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeQuadTo(float dx1, float dy1, float dx2, float dy2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeQuadTo copy(float dx1, float dy1, float dx2, float dy2);
+    method public float getDx1();
+    method public float getDx2();
+    method public float getDy1();
+    method public float getDy2();
+    property public final float dx1;
+    property public final float dx2;
+    property public final float dy1;
+    property public final float dy2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveCurveTo(float dx1, float dy1, float dx2, float dy2);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveCurveTo copy(float dx1, float dy1, float dx2, float dy2);
+    method public float getDx1();
+    method public float getDx2();
+    method public float getDy1();
+    method public float getDy2();
+    property public final float dx1;
+    property public final float dx2;
+    property public final float dy1;
+    property public final float dy2;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveQuadTo(float dx, float dy);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveQuadTo copy(float dx, float dy);
+    method public float getDx();
+    method public float getDy();
+    property public final float dx;
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.RelativeVerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeVerticalTo(float dy);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.RelativeVerticalTo copy(float dy);
+    method public float getDy();
+    property public final float dy;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class PathNode.VerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+    ctor public PathNode.VerticalTo(float y);
+    method public float component1();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.graphics.vector.PathNode.VerticalTo copy(float y);
+    method public float getY();
+    property public final float y;
+  }
+
+  public final class PathNodeKt {
+  }
+
+  public final class PathParser {
+    ctor public PathParser();
+    method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
+    method public void clear();
+    method public androidx.compose.ui.graphics.vector.PathParser parsePathString(String pathData);
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> toNodes();
+    method public androidx.compose.ui.graphics.Path toPath(optional androidx.compose.ui.graphics.Path target);
+  }
+
+}
+

compose/ui/ui-graphics/src/desktopMain/kotlin/androidx/compose/ui/graphics/DesktopCanvas.desktop.kt

diff --git a/compose/ui/ui-graphics/src/desktopMain/kotlin/androidx/compose/ui/graphics/DesktopCanvas.desktop.kt b/compose/ui/ui-graphics/src/desktopMain/kotlin/androidx/compose/ui/graphics/DesktopCanvas.desktop.kt
index 4a4b8e7..c1dbb42 100644
--- a/compose/ui/ui-graphics/src/desktopMain/kotlin/androidx/compose/ui/graphics/DesktopCanvas.desktop.kt
+++ b/compose/ui/ui-graphics/src/desktopMain/kotlin/androidx/compose/ui/graphics/DesktopCanvas.desktop.kt
@@ -149,8 +149,8 @@
         skija.drawArc(
             left,
             top,
-            right - left,
-            bottom - top,
+            right,
+            bottom,
             startAngle,
             sweepAngle,
             useCenter,

compose/ui/ui-test-font/api/1.0.0-beta04.txt

diff --git a/ipc/ipc-annotations/api/current.txt b/compose/ui/ui-test-font/api/1.0.0-beta04.txt
similarity index 100%
rename from ipc/ipc-annotations/api/current.txt
rename to compose/ui/ui-test-font/api/1.0.0-beta04.txt

compose/ui/ui-test-font/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/ipc/ipc-annotations/api/current.txt b/compose/ui/ui-test-font/api/public_plus_experimental_1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-annotations/api/current.txt
copy to compose/ui/ui-test-font/api/public_plus_experimental_1.0.0-beta04.txt

compose/ui/ui-test-font/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-test-font/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-test-font/api/res-1.0.0-beta04.txt

compose/ui/ui-test-font/api/restricted_1.0.0-beta04.txt

diff --git a/ipc/ipc-annotations/api/current.txt b/compose/ui/ui-test-font/api/restricted_1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-annotations/api/current.txt
copy to compose/ui/ui-test-font/api/restricted_1.0.0-beta04.txt

compose/ui/ui-test-junit4/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-test-junit4/api/1.0.0-beta04.txt b/compose/ui/ui-test-junit4/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..6c590bb
--- /dev/null
+++ b/compose/ui/ui-test-junit4/api/1.0.0-beta04.txt
@@ -0,0 +1,84 @@
+// Signature format: 4.0
+package androidx.compose.ui.test.junit4 {
+
+  public final class AndroidComposeTestRule<R extends org.junit.rules.TestRule, A extends androidx.activity.ComponentActivity> implements androidx.compose.ui.test.junit4.ComposeContentTestRule {
+    ctor public AndroidComposeTestRule(R activityRule, kotlin.jvm.functions.Function1<? super R,? extends A> activityProvider);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+    method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public A getActivity();
+    method public R getActivityRule();
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.test.MainTestClock getMainClock();
+    method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+    method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+    method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+    method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public void waitForIdle();
+    method public void waitUntil(long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+    property public final A activity;
+    property public final R activityRule;
+    property public androidx.compose.ui.unit.Density density;
+    property public androidx.compose.ui.test.MainTestClock mainClock;
+  }
+
+  public final class AndroidComposeTestRule.AndroidComposeStatement extends org.junit.runners.model.Statement {
+    ctor public AndroidComposeTestRule.AndroidComposeStatement(org.junit.runners.model.Statement base);
+    method public void evaluate();
+  }
+
+  public final class AndroidComposeTestRule_androidKt {
+    method public static <A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A> createAndroidComposeRule(Class<A> activityClass);
+    method public static inline <reified A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A>! createAndroidComposeRule();
+    method public static androidx.compose.ui.test.junit4.ComposeContentTestRule createComposeRule();
+    method public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule();
+  }
+
+  public final class AndroidSynchronization_androidKt {
+  }
+
+  public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+  public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
+    method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.test.MainTestClock getMainClock();
+    method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+    method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public void waitForIdle();
+    method public void waitUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+    property public abstract androidx.compose.ui.unit.Density density;
+    property public abstract androidx.compose.ui.test.MainTestClock mainClock;
+  }
+
+  public final class StateRestorationTester {
+    ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
+    method public void emulateSavedInstanceStateRestore();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+}
+
+package androidx.compose.ui.test.junit4.android {
+
+  public final class ComposeIdlingResource_androidKt {
+  }
+
+  public final class ComposeNotIdleException extends java.lang.Throwable {
+    ctor public ComposeNotIdleException(String? message, Throwable? cause);
+  }
+
+  public final class ComposeRootRegistry_androidKt {
+  }
+
+  public final class EspressoLink_androidKt {
+  }
+
+}
+

compose/ui/ui-test-junit4/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-test-junit4/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-test-junit4/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..6c590bb
--- /dev/null
+++ b/compose/ui/ui-test-junit4/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,84 @@
+// Signature format: 4.0
+package androidx.compose.ui.test.junit4 {
+
+  public final class AndroidComposeTestRule<R extends org.junit.rules.TestRule, A extends androidx.activity.ComponentActivity> implements androidx.compose.ui.test.junit4.ComposeContentTestRule {
+    ctor public AndroidComposeTestRule(R activityRule, kotlin.jvm.functions.Function1<? super R,? extends A> activityProvider);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+    method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public A getActivity();
+    method public R getActivityRule();
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.test.MainTestClock getMainClock();
+    method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+    method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+    method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+    method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public void waitForIdle();
+    method public void waitUntil(long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+    property public final A activity;
+    property public final R activityRule;
+    property public androidx.compose.ui.unit.Density density;
+    property public androidx.compose.ui.test.MainTestClock mainClock;
+  }
+
+  public final class AndroidComposeTestRule.AndroidComposeStatement extends org.junit.runners.model.Statement {
+    ctor public AndroidComposeTestRule.AndroidComposeStatement(org.junit.runners.model.Statement base);
+    method public void evaluate();
+  }
+
+  public final class AndroidComposeTestRule_androidKt {
+    method public static <A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A> createAndroidComposeRule(Class<A> activityClass);
+    method public static inline <reified A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A>! createAndroidComposeRule();
+    method public static androidx.compose.ui.test.junit4.ComposeContentTestRule createComposeRule();
+    method public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule();
+  }
+
+  public final class AndroidSynchronization_androidKt {
+  }
+
+  public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+  public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
+    method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.test.MainTestClock getMainClock();
+    method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+    method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public void waitForIdle();
+    method public void waitUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+    property public abstract androidx.compose.ui.unit.Density density;
+    property public abstract androidx.compose.ui.test.MainTestClock mainClock;
+  }
+
+  public final class StateRestorationTester {
+    ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
+    method public void emulateSavedInstanceStateRestore();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+}
+
+package androidx.compose.ui.test.junit4.android {
+
+  public final class ComposeIdlingResource_androidKt {
+  }
+
+  public final class ComposeNotIdleException extends java.lang.Throwable {
+    ctor public ComposeNotIdleException(String? message, Throwable? cause);
+  }
+
+  public final class ComposeRootRegistry_androidKt {
+  }
+
+  public final class EspressoLink_androidKt {
+  }
+
+}
+

compose/ui/ui-test-junit4/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-test-junit4/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-test-junit4/api/res-1.0.0-beta04.txt

compose/ui/ui-test-junit4/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-test-junit4/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-test-junit4/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..6c590bb
--- /dev/null
+++ b/compose/ui/ui-test-junit4/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,84 @@
+// Signature format: 4.0
+package androidx.compose.ui.test.junit4 {
+
+  public final class AndroidComposeTestRule<R extends org.junit.rules.TestRule, A extends androidx.activity.ComponentActivity> implements androidx.compose.ui.test.junit4.ComposeContentTestRule {
+    ctor public AndroidComposeTestRule(R activityRule, kotlin.jvm.functions.Function1<? super R,? extends A> activityProvider);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+    method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public A getActivity();
+    method public R getActivityRule();
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.test.MainTestClock getMainClock();
+    method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+    method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+    method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+    method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public void waitForIdle();
+    method public void waitUntil(long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+    property public final A activity;
+    property public final R activityRule;
+    property public androidx.compose.ui.unit.Density density;
+    property public androidx.compose.ui.test.MainTestClock mainClock;
+  }
+
+  public final class AndroidComposeTestRule.AndroidComposeStatement extends org.junit.runners.model.Statement {
+    ctor public AndroidComposeTestRule.AndroidComposeStatement(org.junit.runners.model.Statement base);
+    method public void evaluate();
+  }
+
+  public final class AndroidComposeTestRule_androidKt {
+    method public static <A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A> createAndroidComposeRule(Class<A> activityClass);
+    method public static inline <reified A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A>! createAndroidComposeRule();
+    method public static androidx.compose.ui.test.junit4.ComposeContentTestRule createComposeRule();
+    method public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule();
+  }
+
+  public final class AndroidSynchronization_androidKt {
+  }
+
+  public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+  public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
+    method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.test.MainTestClock getMainClock();
+    method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+    method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+    method public void waitForIdle();
+    method public void waitUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+    property public abstract androidx.compose.ui.unit.Density density;
+    property public abstract androidx.compose.ui.test.MainTestClock mainClock;
+  }
+
+  public final class StateRestorationTester {
+    ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
+    method public void emulateSavedInstanceStateRestore();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+}
+
+package androidx.compose.ui.test.junit4.android {
+
+  public final class ComposeIdlingResource_androidKt {
+  }
+
+  public final class ComposeNotIdleException extends java.lang.Throwable {
+    ctor public ComposeNotIdleException(String? message, Throwable? cause);
+  }
+
+  public final class ComposeRootRegistry_androidKt {
+  }
+
+  public final class EspressoLink_androidKt {
+  }
+
+}
+

compose/ui/ui-test-manifest/api/1.0.0-beta04.txt

diff --git a/ipc/ipc-annotations/api/current.txt b/compose/ui/ui-test-manifest/api/1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-annotations/api/current.txt
copy to compose/ui/ui-test-manifest/api/1.0.0-beta04.txt

compose/ui/ui-test-manifest/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/ipc/ipc-annotations/api/current.txt b/compose/ui/ui-test-manifest/api/public_plus_experimental_1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-annotations/api/current.txt
copy to compose/ui/ui-test-manifest/api/public_plus_experimental_1.0.0-beta04.txt

compose/ui/ui-test-manifest/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-test-manifest/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-test-manifest/api/res-1.0.0-beta04.txt

compose/ui/ui-test-manifest/api/restricted_1.0.0-beta04.txt

diff --git a/ipc/ipc-annotations/api/current.txt b/compose/ui/ui-test-manifest/api/restricted_1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-annotations/api/current.txt
copy to compose/ui/ui-test-manifest/api/restricted_1.0.0-beta04.txt

compose/ui/ui-test/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-test/api/1.0.0-beta04.txt b/compose/ui/ui-test/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..c6c2a27
--- /dev/null
+++ b/compose/ui/ui-test/api/1.0.0-beta04.txt
@@ -0,0 +1,289 @@
+// Signature format: 4.0
+package androidx.compose.ui.test {
+
+  public final class ActionsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction performClick(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction performGesture(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.GestureScope,kotlin.Unit> block);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollTo(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static <T extends kotlin.Function<? extends java.lang.Boolean>> void performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> invocation);
+    method public static void performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> key);
+  }
+
+  public final class AndroidAssertions_androidKt {
+  }
+
+  public final class AndroidImageHelpers_androidKt {
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class AndroidInputDispatcher_androidKt {
+  }
+
+  public final class AndroidOutput_androidKt {
+  }
+
+  public final class AssertionsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAny(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertCountEquals(androidx.compose.ui.test.SemanticsNodeInteractionCollection, int expectedSize);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasNoClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOff(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOn(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelectable(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsToggleable(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertRangeInfoEquals(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.ProgressBarRangeInfo value);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertValueEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value);
+  }
+
+  public final class BoundsAssertionsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsAtLeast-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinHeight);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedHeight);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertLeftPositionInRootIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertPositionInRootIsEqualTo-aELHoiQ(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft, float expectedTop);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTopPositionInRootIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedTop);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsAtLeast-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinWidth);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedWidth);
+    method public static float getAlignmentLinePosition(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public static androidx.compose.ui.unit.DpRect getUnclippedBoundsInRoot(androidx.compose.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class ComposeTimeoutException extends java.lang.Throwable {
+    ctor public ComposeTimeoutException(String? message);
+  }
+
+  public final class ErrorMessagesKt {
+  }
+
+  public final class FiltersKt {
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnyAncestor(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnyChild(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnyDescendant(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnySibling(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasClickAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasContentDescription(String label, optional boolean substring, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasImeAction(androidx.compose.ui.text.input.ImeAction actionType);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasNoClickAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasNoScrollAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasParent(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasProgressBarRangeInfo(androidx.compose.ui.semantics.ProgressBarRangeInfo rangeInfo);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasScrollAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasSetTextAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasStateDescription(String value);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasTestTag(String testTag);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasText(String text, optional boolean substring, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsMatcher isDialog();
+    method public static androidx.compose.ui.test.SemanticsMatcher isEnabled();
+    method public static androidx.compose.ui.test.SemanticsMatcher isFocusable();
+    method public static androidx.compose.ui.test.SemanticsMatcher isFocused();
+    method public static androidx.compose.ui.test.SemanticsMatcher isHeading();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotEnabled();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotFocusable();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotFocused();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotSelected();
+    method public static androidx.compose.ui.test.SemanticsMatcher isOff();
+    method public static androidx.compose.ui.test.SemanticsMatcher isOn();
+    method public static androidx.compose.ui.test.SemanticsMatcher isPopup();
+    method public static androidx.compose.ui.test.SemanticsMatcher isRoot();
+    method public static androidx.compose.ui.test.SemanticsMatcher isSelectable();
+    method public static androidx.compose.ui.test.SemanticsMatcher isSelected();
+    method public static androidx.compose.ui.test.SemanticsMatcher isToggleable();
+  }
+
+  public final class FindersKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onRoot(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, optional boolean useUnmergedTree);
+  }
+
+  public final class GestureScope {
+    ctor public GestureScope(androidx.compose.ui.semantics.SemanticsNode node, androidx.compose.ui.test.TestContext testContext);
+    method public long getVisibleSize-YbymL2g();
+    property public final long visibleSize;
+  }
+
+  public final class GestureScopeKt {
+    method public static void cancel(androidx.compose.ui.test.GestureScope);
+    method public static void click-ssxj34k(androidx.compose.ui.test.GestureScope, optional long position);
+    method public static void doubleClick-LZsBx1o(androidx.compose.ui.test.GestureScope, optional long position, optional long delayMillis);
+    method public static void down-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+    method public static void down-ssxj34k(androidx.compose.ui.test.GestureScope, long position);
+    method public static inline float getBottom(androidx.compose.ui.test.GestureScope);
+    method public static long getBottomCenter(androidx.compose.ui.test.GestureScope);
+    method public static long getBottomLeft(androidx.compose.ui.test.GestureScope);
+    method public static long getBottomRight(androidx.compose.ui.test.GestureScope);
+    method public static long getCenter(androidx.compose.ui.test.GestureScope);
+    method public static long getCenterLeft(androidx.compose.ui.test.GestureScope);
+    method public static long getCenterRight(androidx.compose.ui.test.GestureScope);
+    method public static inline float getCenterX(androidx.compose.ui.test.GestureScope);
+    method public static inline float getCenterY(androidx.compose.ui.test.GestureScope);
+    method public static inline int getHeight(androidx.compose.ui.test.GestureScope);
+    method public static inline float getLeft(androidx.compose.ui.test.GestureScope);
+    method public static inline float getRight(androidx.compose.ui.test.GestureScope);
+    method public static inline float getTop(androidx.compose.ui.test.GestureScope);
+    method public static long getTopCenter(androidx.compose.ui.test.GestureScope);
+    method public static long getTopLeft(androidx.compose.ui.test.GestureScope);
+    method public static long getTopRight(androidx.compose.ui.test.GestureScope);
+    method public static inline int getWidth(androidx.compose.ui.test.GestureScope);
+    method public static void longClick-LZsBx1o(androidx.compose.ui.test.GestureScope, optional long position, optional long durationMillis);
+    method public static void move(androidx.compose.ui.test.GestureScope);
+    method public static void moveBy-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+    method public static void moveBy-ssxj34k(androidx.compose.ui.test.GestureScope, long delta);
+    method public static void movePointerBy-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+    method public static void movePointerTo-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+    method public static void moveTo-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+    method public static void moveTo-ssxj34k(androidx.compose.ui.test.GestureScope, long position);
+    method public static long percentOffset(androidx.compose.ui.test.GestureScope, optional float x, optional float y);
+    method public static void pinch-1c52nSY(androidx.compose.ui.test.GestureScope, long start0, long end0, long start1, long end1, optional long durationMillis);
+    method public static void swipe-DPh1Mgw(androidx.compose.ui.test.GestureScope, long start, long end, optional long durationMillis);
+    method public static void swipeDown(androidx.compose.ui.test.GestureScope);
+    method public static void swipeLeft(androidx.compose.ui.test.GestureScope);
+    method public static void swipeRight(androidx.compose.ui.test.GestureScope);
+    method public static void swipeUp(androidx.compose.ui.test.GestureScope);
+    method public static void swipeWithVelocity-YsXUJPI(androidx.compose.ui.test.GestureScope, long start, long end, float endVelocity, optional long durationMillis);
+    method public static void up(androidx.compose.ui.test.GestureScope, optional int pointerId);
+  }
+
+  public interface IdlingResource {
+    method public default String? getDiagnosticMessageIfBusy();
+    method public boolean isIdleNow();
+    property public abstract boolean isIdleNow;
+  }
+
+  public final class KeyInputHelpersKt {
+    method public static boolean performKeyPress-S8GO8FU(androidx.compose.ui.test.SemanticsNodeInteraction, android.view.KeyEvent keyEvent);
+  }
+
+  public interface MainTestClock {
+    method public void advanceTimeBy(long milliseconds, optional boolean ignoreFrameDuration);
+    method public void advanceTimeByFrame();
+    method public void advanceTimeUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+    method public boolean getAutoAdvance();
+    method public long getCurrentTime();
+    method public void setAutoAdvance(boolean p);
+    property public abstract boolean autoAdvance;
+    property public abstract long currentTime;
+  }
+
+  public final class OutputKt {
+    method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteraction, String tag, optional int maxDepth);
+    method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteractionCollection, String tag, optional int maxDepth);
+    method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteraction, optional int maxDepth);
+    method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteractionCollection, optional int maxDepth);
+  }
+
+  public final class SelectionResult {
+    ctor public SelectionResult(java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes, optional String? customErrorOnNoMatch);
+    method public String? getCustomErrorOnNoMatch();
+    method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getSelectedNodes();
+    property public final String? customErrorOnNoMatch;
+    property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes;
+  }
+
+  public final class SelectorsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection filter(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction filterToOne(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAncestors(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onChild(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onChildAt(androidx.compose.ui.test.SemanticsNodeInteraction, int index);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onChildren(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onFirst(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onLast(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onParent(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onSibling(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onSiblings(androidx.compose.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class SemanticsMatcher {
+    ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsNode,java.lang.Boolean> matcher);
+    method public infix androidx.compose.ui.test.SemanticsMatcher and(androidx.compose.ui.test.SemanticsMatcher other);
+    method public String getDescription();
+    method public boolean matches(androidx.compose.ui.semantics.SemanticsNode node);
+    method public boolean matchesAny(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes);
+    method public operator androidx.compose.ui.test.SemanticsMatcher not();
+    method public infix androidx.compose.ui.test.SemanticsMatcher or(androidx.compose.ui.test.SemanticsMatcher other);
+    property public final String description;
+    field public static final androidx.compose.ui.test.SemanticsMatcher.Companion Companion;
+  }
+
+  public static final class SemanticsMatcher.Companion {
+    method public <T> androidx.compose.ui.test.SemanticsMatcher expectValue(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? expectedValue);
+    method public <T> androidx.compose.ui.test.SemanticsMatcher keyIsDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> androidx.compose.ui.test.SemanticsMatcher keyNotDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+  }
+
+  public final class SemanticsNodeInteraction {
+    ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+    ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public void assertDoesNotExist();
+    method public androidx.compose.ui.test.SemanticsNodeInteraction assertExists(optional String? errorMessageOnFail);
+    method public androidx.compose.ui.semantics.SemanticsNode fetchSemanticsNode(optional String? errorMessageOnFail);
+  }
+
+  public final class SemanticsNodeInteractionCollection {
+    ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+    ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> fetchSemanticsNodes(optional boolean atLeastOneRootRequired, optional String? errorMessageOnFail);
+    method public operator androidx.compose.ui.test.SemanticsNodeInteraction get(int index);
+  }
+
+  public interface SemanticsNodeInteractionsProvider {
+    method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+    method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+  }
+
+  public final class SemanticsSelector {
+    ctor public SemanticsSelector(String description, boolean requiresExactlyOneNode, optional androidx.compose.ui.test.SemanticsSelector? chainedInputSelector, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.compose.ui.semantics.SemanticsNode>,androidx.compose.ui.test.SelectionResult> selector);
+    method public String getDescription();
+    method public androidx.compose.ui.test.SelectionResult map(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes, String errorOnFail);
+    property public final String description;
+  }
+
+  public final class SemanticsSelectorKt {
+  }
+
+  public final class TestContext {
+  }
+
+  public final class TestMonotonicFrameClock_jvmKt {
+  }
+
+  public final class TestOwnerKt {
+  }
+
+  public final class TextActionsKt {
+    method public static void performImeAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static void performTextClearance(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static void performTextInput(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+    method public static void performTextReplacement(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+  }
+
+  public final class UtilsKt {
+  }
+
+}
+
+package androidx.compose.ui.test.android {
+
+  public final class WindowCapture_androidKt {
+  }
+
+}
+

compose/ui/ui-test/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-test/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-test/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..07ac8f8
--- /dev/null
+++ b/compose/ui/ui-test/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,320 @@
+// Signature format: 4.0
+package androidx.compose.ui.test {
+
+  public final class ActionsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction performClick(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction performGesture(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.GestureScope,kotlin.Unit> block);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollTo(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static <T extends kotlin.Function<? extends java.lang.Boolean>> void performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> invocation);
+    method public static void performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> key);
+  }
+
+  public final class AndroidAssertions_androidKt {
+  }
+
+  public final class AndroidImageHelpers_androidKt {
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class AndroidInputDispatcher_androidKt {
+  }
+
+  public final class AndroidOutput_androidKt {
+  }
+
+  public final class AssertionsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAny(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertCountEquals(androidx.compose.ui.test.SemanticsNodeInteractionCollection, int expectedSize);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasNoClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOff(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOn(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelectable(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsToggleable(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertRangeInfoEquals(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.ProgressBarRangeInfo value);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertValueEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value);
+  }
+
+  public final class BoundsAssertionsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsAtLeast-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinHeight);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedHeight);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertLeftPositionInRootIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertPositionInRootIsEqualTo-aELHoiQ(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft, float expectedTop);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTopPositionInRootIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedTop);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsAtLeast-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinWidth);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedWidth);
+    method public static float getAlignmentLinePosition(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public static androidx.compose.ui.unit.DpRect getUnclippedBoundsInRoot(androidx.compose.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class ComposeTimeoutException extends java.lang.Throwable {
+    ctor public ComposeTimeoutException(String? message);
+  }
+
+  public final class ErrorMessagesKt {
+  }
+
+  @kotlin.RequiresOptIn(message="This testing API is experimental and is likely to be changed or removed entirely") public @interface ExperimentalTestApi {
+  }
+
+  public final class FiltersKt {
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnyAncestor(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnyChild(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnyDescendant(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnySibling(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasClickAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasContentDescription(String label, optional boolean substring, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasImeAction(androidx.compose.ui.text.input.ImeAction actionType);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasNoClickAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasNoScrollAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasParent(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasProgressBarRangeInfo(androidx.compose.ui.semantics.ProgressBarRangeInfo rangeInfo);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasScrollAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasSetTextAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasStateDescription(String value);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasTestTag(String testTag);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasText(String text, optional boolean substring, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsMatcher isDialog();
+    method public static androidx.compose.ui.test.SemanticsMatcher isEnabled();
+    method public static androidx.compose.ui.test.SemanticsMatcher isFocusable();
+    method public static androidx.compose.ui.test.SemanticsMatcher isFocused();
+    method public static androidx.compose.ui.test.SemanticsMatcher isHeading();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotEnabled();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotFocusable();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotFocused();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotSelected();
+    method public static androidx.compose.ui.test.SemanticsMatcher isOff();
+    method public static androidx.compose.ui.test.SemanticsMatcher isOn();
+    method public static androidx.compose.ui.test.SemanticsMatcher isPopup();
+    method public static androidx.compose.ui.test.SemanticsMatcher isRoot();
+    method public static androidx.compose.ui.test.SemanticsMatcher isSelectable();
+    method public static androidx.compose.ui.test.SemanticsMatcher isSelected();
+    method public static androidx.compose.ui.test.SemanticsMatcher isToggleable();
+  }
+
+  public final class FindersKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onRoot(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, optional boolean useUnmergedTree);
+  }
+
+  public final class GestureScope {
+    ctor public GestureScope(androidx.compose.ui.semantics.SemanticsNode node, androidx.compose.ui.test.TestContext testContext);
+    method public long getVisibleSize-YbymL2g();
+    property public final long visibleSize;
+  }
+
+  public final class GestureScopeKt {
+    method public static void cancel(androidx.compose.ui.test.GestureScope);
+    method public static void click-ssxj34k(androidx.compose.ui.test.GestureScope, optional long position);
+    method public static void doubleClick-LZsBx1o(androidx.compose.ui.test.GestureScope, optional long position, optional long delayMillis);
+    method public static void down-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+    method public static void down-ssxj34k(androidx.compose.ui.test.GestureScope, long position);
+    method public static inline float getBottom(androidx.compose.ui.test.GestureScope);
+    method public static long getBottomCenter(androidx.compose.ui.test.GestureScope);
+    method public static long getBottomLeft(androidx.compose.ui.test.GestureScope);
+    method public static long getBottomRight(androidx.compose.ui.test.GestureScope);
+    method public static long getCenter(androidx.compose.ui.test.GestureScope);
+    method public static long getCenterLeft(androidx.compose.ui.test.GestureScope);
+    method public static long getCenterRight(androidx.compose.ui.test.GestureScope);
+    method public static inline float getCenterX(androidx.compose.ui.test.GestureScope);
+    method public static inline float getCenterY(androidx.compose.ui.test.GestureScope);
+    method public static inline int getHeight(androidx.compose.ui.test.GestureScope);
+    method public static inline float getLeft(androidx.compose.ui.test.GestureScope);
+    method public static inline float getRight(androidx.compose.ui.test.GestureScope);
+    method public static inline float getTop(androidx.compose.ui.test.GestureScope);
+    method public static long getTopCenter(androidx.compose.ui.test.GestureScope);
+    method public static long getTopLeft(androidx.compose.ui.test.GestureScope);
+    method public static long getTopRight(androidx.compose.ui.test.GestureScope);
+    method public static inline int getWidth(androidx.compose.ui.test.GestureScope);
+    method public static void longClick-LZsBx1o(androidx.compose.ui.test.GestureScope, optional long position, optional long durationMillis);
+    method public static void move(androidx.compose.ui.test.GestureScope);
+    method public static void moveBy-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+    method public static void moveBy-ssxj34k(androidx.compose.ui.test.GestureScope, long delta);
+    method public static void movePointerBy-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+    method public static void movePointerTo-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+    method public static void moveTo-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+    method public static void moveTo-ssxj34k(androidx.compose.ui.test.GestureScope, long position);
+    method public static long percentOffset(androidx.compose.ui.test.GestureScope, optional float x, optional float y);
+    method public static void pinch-1c52nSY(androidx.compose.ui.test.GestureScope, long start0, long end0, long start1, long end1, optional long durationMillis);
+    method public static void swipe-DPh1Mgw(androidx.compose.ui.test.GestureScope, long start, long end, optional long durationMillis);
+    method public static void swipeDown(androidx.compose.ui.test.GestureScope);
+    method @androidx.compose.ui.test.ExperimentalTestApi public static void swipeDown(androidx.compose.ui.test.GestureScope, optional float startY, optional float endY, optional long durationMillis);
+    method public static void swipeLeft(androidx.compose.ui.test.GestureScope);
+    method @androidx.compose.ui.test.ExperimentalTestApi public static void swipeLeft(androidx.compose.ui.test.GestureScope, optional float startX, optional float endX, optional long durationMillis);
+    method public static void swipeRight(androidx.compose.ui.test.GestureScope);
+    method @androidx.compose.ui.test.ExperimentalTestApi public static void swipeRight(androidx.compose.ui.test.GestureScope, optional float startX, optional float endX, optional long durationMillis);
+    method public static void swipeUp(androidx.compose.ui.test.GestureScope);
+    method @androidx.compose.ui.test.ExperimentalTestApi public static void swipeUp(androidx.compose.ui.test.GestureScope, optional float startY, optional float endY, optional long durationMillis);
+    method public static void swipeWithVelocity-YsXUJPI(androidx.compose.ui.test.GestureScope, long start, long end, float endVelocity, optional long durationMillis);
+    method public static void up(androidx.compose.ui.test.GestureScope, optional int pointerId);
+  }
+
+  public interface IdlingResource {
+    method public default String? getDiagnosticMessageIfBusy();
+    method public boolean isIdleNow();
+    property public abstract boolean isIdleNow;
+  }
+
+  @kotlin.RequiresOptIn(message="This is internal API for Compose modules that may change frequently and without warning.") public @interface InternalTestApi {
+  }
+
+  public final class KeyInputHelpersKt {
+    method public static boolean performKeyPress-S8GO8FU(androidx.compose.ui.test.SemanticsNodeInteraction, android.view.KeyEvent keyEvent);
+  }
+
+  public interface MainTestClock {
+    method public void advanceTimeBy(long milliseconds, optional boolean ignoreFrameDuration);
+    method public void advanceTimeByFrame();
+    method public void advanceTimeUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+    method public boolean getAutoAdvance();
+    method public long getCurrentTime();
+    method public void setAutoAdvance(boolean p);
+    property public abstract boolean autoAdvance;
+    property public abstract long currentTime;
+  }
+
+  public final class OutputKt {
+    method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteraction, String tag, optional int maxDepth);
+    method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteractionCollection, String tag, optional int maxDepth);
+    method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteraction, optional int maxDepth);
+    method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteractionCollection, optional int maxDepth);
+  }
+
+  public final class SelectionResult {
+    ctor public SelectionResult(java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes, optional String? customErrorOnNoMatch);
+    method public String? getCustomErrorOnNoMatch();
+    method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getSelectedNodes();
+    property public final String? customErrorOnNoMatch;
+    property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes;
+  }
+
+  public final class SelectorsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection filter(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction filterToOne(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAncestors(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onChild(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onChildAt(androidx.compose.ui.test.SemanticsNodeInteraction, int index);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onChildren(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onFirst(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onLast(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onParent(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onSibling(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onSiblings(androidx.compose.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class SemanticsMatcher {
+    ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsNode,java.lang.Boolean> matcher);
+    method public infix androidx.compose.ui.test.SemanticsMatcher and(androidx.compose.ui.test.SemanticsMatcher other);
+    method public String getDescription();
+    method public boolean matches(androidx.compose.ui.semantics.SemanticsNode node);
+    method public boolean matchesAny(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes);
+    method public operator androidx.compose.ui.test.SemanticsMatcher not();
+    method public infix androidx.compose.ui.test.SemanticsMatcher or(androidx.compose.ui.test.SemanticsMatcher other);
+    property public final String description;
+    field public static final androidx.compose.ui.test.SemanticsMatcher.Companion Companion;
+  }
+
+  public static final class SemanticsMatcher.Companion {
+    method public <T> androidx.compose.ui.test.SemanticsMatcher expectValue(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? expectedValue);
+    method public <T> androidx.compose.ui.test.SemanticsMatcher keyIsDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> androidx.compose.ui.test.SemanticsMatcher keyNotDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+  }
+
+  public final class SemanticsNodeInteraction {
+    ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+    ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public void assertDoesNotExist();
+    method public androidx.compose.ui.test.SemanticsNodeInteraction assertExists(optional String? errorMessageOnFail);
+    method public androidx.compose.ui.semantics.SemanticsNode fetchSemanticsNode(optional String? errorMessageOnFail);
+  }
+
+  public final class SemanticsNodeInteractionCollection {
+    ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+    ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> fetchSemanticsNodes(optional boolean atLeastOneRootRequired, optional String? errorMessageOnFail);
+    method public operator androidx.compose.ui.test.SemanticsNodeInteraction get(int index);
+  }
+
+  public interface SemanticsNodeInteractionsProvider {
+    method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+    method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+  }
+
+  public final class SemanticsSelector {
+    ctor public SemanticsSelector(String description, boolean requiresExactlyOneNode, optional androidx.compose.ui.test.SemanticsSelector? chainedInputSelector, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.compose.ui.semantics.SemanticsNode>,androidx.compose.ui.test.SelectionResult> selector);
+    method public String getDescription();
+    method public androidx.compose.ui.test.SelectionResult map(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes, String errorOnFail);
+    property public final String description;
+  }
+
+  public final class SemanticsSelectorKt {
+  }
+
+  public final class TestContext {
+  }
+
+  @kotlinx.coroutines.ExperimentalCoroutinesApi public final class TestMonotonicFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public TestMonotonicFrameClock(kotlinx.coroutines.CoroutineScope coroutineScope, kotlinx.coroutines.test.DelayController delayController, optional long frameDelayNanos);
+    method public long getFrameDelayNanos();
+    method public boolean getHasAwaiters();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final long frameDelayNanos;
+    property public final boolean hasAwaiters;
+  }
+
+  public final class TestMonotonicFrameClock_jvmKt {
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static androidx.compose.ui.test.TestMonotonicFrameClock TestMonotonicFrameClock(kotlinx.coroutines.CoroutineScope coroutineScope, optional long frameDelayNanos);
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static long getFrameDelayMillis(androidx.compose.ui.test.TestMonotonicFrameClock);
+  }
+
+  @androidx.compose.ui.test.InternalTestApi public interface TestOwner {
+    method public androidx.compose.ui.test.MainTestClock getMainClock();
+    method public java.util.Set<androidx.compose.ui.node.RootForTest> getRoots(boolean atLeastOneRootExpected);
+    method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public void sendImeAction(androidx.compose.ui.semantics.SemanticsNode node, androidx.compose.ui.text.input.ImeAction actionSpecified);
+    method public void sendTextInputCommand(androidx.compose.ui.semantics.SemanticsNode node, java.util.List<? extends androidx.compose.ui.text.input.EditCommand> command);
+    property public abstract androidx.compose.ui.test.MainTestClock mainClock;
+  }
+
+  public final class TestOwnerKt {
+    method @androidx.compose.ui.test.InternalTestApi public static androidx.compose.ui.test.TestContext createTestContext(androidx.compose.ui.test.TestOwner owner);
+  }
+
+  public final class TextActionsKt {
+    method public static void performImeAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static void performTextClearance(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static void performTextInput(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+    method public static void performTextReplacement(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+  }
+
+  public final class UtilsKt {
+  }
+
+}
+
+package androidx.compose.ui.test.android {
+
+  public final class WindowCapture_androidKt {
+  }
+
+}
+

compose/ui/ui-test/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-test/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-test/api/res-1.0.0-beta04.txt

compose/ui/ui-test/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-test/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-test/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..c6c2a27
--- /dev/null
+++ b/compose/ui/ui-test/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,289 @@
+// Signature format: 4.0
+package androidx.compose.ui.test {
+
+  public final class ActionsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction performClick(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction performGesture(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.GestureScope,kotlin.Unit> block);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollTo(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static <T extends kotlin.Function<? extends java.lang.Boolean>> void performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> invocation);
+    method public static void performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> key);
+  }
+
+  public final class AndroidAssertions_androidKt {
+  }
+
+  public final class AndroidImageHelpers_androidKt {
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class AndroidInputDispatcher_androidKt {
+  }
+
+  public final class AndroidOutput_androidKt {
+  }
+
+  public final class AssertionsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAny(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertCountEquals(androidx.compose.ui.test.SemanticsNodeInteractionCollection, int expectedSize);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasNoClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOff(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOn(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelectable(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsToggleable(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertRangeInfoEquals(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.ProgressBarRangeInfo value);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertValueEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value);
+  }
+
+  public final class BoundsAssertionsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsAtLeast-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinHeight);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedHeight);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertLeftPositionInRootIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertPositionInRootIsEqualTo-aELHoiQ(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft, float expectedTop);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTopPositionInRootIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedTop);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsAtLeast-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinWidth);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsEqualTo-3AN6ZEs(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedWidth);
+    method public static float getAlignmentLinePosition(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public static androidx.compose.ui.unit.DpRect getUnclippedBoundsInRoot(androidx.compose.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class ComposeTimeoutException extends java.lang.Throwable {
+    ctor public ComposeTimeoutException(String? message);
+  }
+
+  public final class ErrorMessagesKt {
+  }
+
+  public final class FiltersKt {
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnyAncestor(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnyChild(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnyDescendant(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasAnySibling(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasClickAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasContentDescription(String label, optional boolean substring, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasImeAction(androidx.compose.ui.text.input.ImeAction actionType);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasNoClickAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasNoScrollAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasParent(androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasProgressBarRangeInfo(androidx.compose.ui.semantics.ProgressBarRangeInfo rangeInfo);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasScrollAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasSetTextAction();
+    method public static androidx.compose.ui.test.SemanticsMatcher hasStateDescription(String value);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasTestTag(String testTag);
+    method public static androidx.compose.ui.test.SemanticsMatcher hasText(String text, optional boolean substring, optional boolean ignoreCase);
+    method public static androidx.compose.ui.test.SemanticsMatcher isDialog();
+    method public static androidx.compose.ui.test.SemanticsMatcher isEnabled();
+    method public static androidx.compose.ui.test.SemanticsMatcher isFocusable();
+    method public static androidx.compose.ui.test.SemanticsMatcher isFocused();
+    method public static androidx.compose.ui.test.SemanticsMatcher isHeading();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotEnabled();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotFocusable();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotFocused();
+    method public static androidx.compose.ui.test.SemanticsMatcher isNotSelected();
+    method public static androidx.compose.ui.test.SemanticsMatcher isOff();
+    method public static androidx.compose.ui.test.SemanticsMatcher isOn();
+    method public static androidx.compose.ui.test.SemanticsMatcher isPopup();
+    method public static androidx.compose.ui.test.SemanticsMatcher isRoot();
+    method public static androidx.compose.ui.test.SemanticsMatcher isSelectable();
+    method public static androidx.compose.ui.test.SemanticsMatcher isSelected();
+    method public static androidx.compose.ui.test.SemanticsMatcher isToggleable();
+  }
+
+  public final class FindersKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onRoot(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, optional boolean useUnmergedTree);
+  }
+
+  public final class GestureScope {
+    ctor public GestureScope(androidx.compose.ui.semantics.SemanticsNode node, androidx.compose.ui.test.TestContext testContext);
+    method public long getVisibleSize-YbymL2g();
+    property public final long visibleSize;
+  }
+
+  public final class GestureScopeKt {
+    method public static void cancel(androidx.compose.ui.test.GestureScope);
+    method public static void click-ssxj34k(androidx.compose.ui.test.GestureScope, optional long position);
+    method public static void doubleClick-LZsBx1o(androidx.compose.ui.test.GestureScope, optional long position, optional long delayMillis);
+    method public static void down-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+    method public static void down-ssxj34k(androidx.compose.ui.test.GestureScope, long position);
+    method public static inline float getBottom(androidx.compose.ui.test.GestureScope);
+    method public static long getBottomCenter(androidx.compose.ui.test.GestureScope);
+    method public static long getBottomLeft(androidx.compose.ui.test.GestureScope);
+    method public static long getBottomRight(androidx.compose.ui.test.GestureScope);
+    method public static long getCenter(androidx.compose.ui.test.GestureScope);
+    method public static long getCenterLeft(androidx.compose.ui.test.GestureScope);
+    method public static long getCenterRight(androidx.compose.ui.test.GestureScope);
+    method public static inline float getCenterX(androidx.compose.ui.test.GestureScope);
+    method public static inline float getCenterY(androidx.compose.ui.test.GestureScope);
+    method public static inline int getHeight(androidx.compose.ui.test.GestureScope);
+    method public static inline float getLeft(androidx.compose.ui.test.GestureScope);
+    method public static inline float getRight(androidx.compose.ui.test.GestureScope);
+    method public static inline float getTop(androidx.compose.ui.test.GestureScope);
+    method public static long getTopCenter(androidx.compose.ui.test.GestureScope);
+    method public static long getTopLeft(androidx.compose.ui.test.GestureScope);
+    method public static long getTopRight(androidx.compose.ui.test.GestureScope);
+    method public static inline int getWidth(androidx.compose.ui.test.GestureScope);
+    method public static void longClick-LZsBx1o(androidx.compose.ui.test.GestureScope, optional long position, optional long durationMillis);
+    method public static void move(androidx.compose.ui.test.GestureScope);
+    method public static void moveBy-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+    method public static void moveBy-ssxj34k(androidx.compose.ui.test.GestureScope, long delta);
+    method public static void movePointerBy-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+    method public static void movePointerTo-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+    method public static void moveTo-NAWZHwc(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+    method public static void moveTo-ssxj34k(androidx.compose.ui.test.GestureScope, long position);
+    method public static long percentOffset(androidx.compose.ui.test.GestureScope, optional float x, optional float y);
+    method public static void pinch-1c52nSY(androidx.compose.ui.test.GestureScope, long start0, long end0, long start1, long end1, optional long durationMillis);
+    method public static void swipe-DPh1Mgw(androidx.compose.ui.test.GestureScope, long start, long end, optional long durationMillis);
+    method public static void swipeDown(androidx.compose.ui.test.GestureScope);
+    method public static void swipeLeft(androidx.compose.ui.test.GestureScope);
+    method public static void swipeRight(androidx.compose.ui.test.GestureScope);
+    method public static void swipeUp(androidx.compose.ui.test.GestureScope);
+    method public static void swipeWithVelocity-YsXUJPI(androidx.compose.ui.test.GestureScope, long start, long end, float endVelocity, optional long durationMillis);
+    method public static void up(androidx.compose.ui.test.GestureScope, optional int pointerId);
+  }
+
+  public interface IdlingResource {
+    method public default String? getDiagnosticMessageIfBusy();
+    method public boolean isIdleNow();
+    property public abstract boolean isIdleNow;
+  }
+
+  public final class KeyInputHelpersKt {
+    method public static boolean performKeyPress-S8GO8FU(androidx.compose.ui.test.SemanticsNodeInteraction, android.view.KeyEvent keyEvent);
+  }
+
+  public interface MainTestClock {
+    method public void advanceTimeBy(long milliseconds, optional boolean ignoreFrameDuration);
+    method public void advanceTimeByFrame();
+    method public void advanceTimeUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+    method public boolean getAutoAdvance();
+    method public long getCurrentTime();
+    method public void setAutoAdvance(boolean p);
+    property public abstract boolean autoAdvance;
+    property public abstract long currentTime;
+  }
+
+  public final class OutputKt {
+    method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteraction, String tag, optional int maxDepth);
+    method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteractionCollection, String tag, optional int maxDepth);
+    method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteraction, optional int maxDepth);
+    method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteractionCollection, optional int maxDepth);
+  }
+
+  public final class SelectionResult {
+    ctor public SelectionResult(java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes, optional String? customErrorOnNoMatch);
+    method public String? getCustomErrorOnNoMatch();
+    method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getSelectedNodes();
+    property public final String? customErrorOnNoMatch;
+    property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes;
+  }
+
+  public final class SelectorsKt {
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection filter(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction filterToOne(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAncestors(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onChild(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onChildAt(androidx.compose.ui.test.SemanticsNodeInteraction, int index);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onChildren(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onFirst(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onLast(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onParent(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteraction onSibling(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onSiblings(androidx.compose.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class SemanticsMatcher {
+    ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsNode,java.lang.Boolean> matcher);
+    method public infix androidx.compose.ui.test.SemanticsMatcher and(androidx.compose.ui.test.SemanticsMatcher other);
+    method public String getDescription();
+    method public boolean matches(androidx.compose.ui.semantics.SemanticsNode node);
+    method public boolean matchesAny(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes);
+    method public operator androidx.compose.ui.test.SemanticsMatcher not();
+    method public infix androidx.compose.ui.test.SemanticsMatcher or(androidx.compose.ui.test.SemanticsMatcher other);
+    property public final String description;
+    field public static final androidx.compose.ui.test.SemanticsMatcher.Companion Companion;
+  }
+
+  public static final class SemanticsMatcher.Companion {
+    method public <T> androidx.compose.ui.test.SemanticsMatcher expectValue(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? expectedValue);
+    method public <T> androidx.compose.ui.test.SemanticsMatcher keyIsDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> androidx.compose.ui.test.SemanticsMatcher keyNotDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+  }
+
+  public final class SemanticsNodeInteraction {
+    ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+    ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public void assertDoesNotExist();
+    method public androidx.compose.ui.test.SemanticsNodeInteraction assertExists(optional String? errorMessageOnFail);
+    method public androidx.compose.ui.semantics.SemanticsNode fetchSemanticsNode(optional String? errorMessageOnFail);
+  }
+
+  public final class SemanticsNodeInteractionCollection {
+    ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+    ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+    method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> fetchSemanticsNodes(optional boolean atLeastOneRootRequired, optional String? errorMessageOnFail);
+    method public operator androidx.compose.ui.test.SemanticsNodeInteraction get(int index);
+  }
+
+  public interface SemanticsNodeInteractionsProvider {
+    method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+    method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+  }
+
+  public final class SemanticsSelector {
+    ctor public SemanticsSelector(String description, boolean requiresExactlyOneNode, optional androidx.compose.ui.test.SemanticsSelector? chainedInputSelector, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.compose.ui.semantics.SemanticsNode>,androidx.compose.ui.test.SelectionResult> selector);
+    method public String getDescription();
+    method public androidx.compose.ui.test.SelectionResult map(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes, String errorOnFail);
+    property public final String description;
+  }
+
+  public final class SemanticsSelectorKt {
+  }
+
+  public final class TestContext {
+  }
+
+  public final class TestMonotonicFrameClock_jvmKt {
+  }
+
+  public final class TestOwnerKt {
+  }
+
+  public final class TextActionsKt {
+    method public static void performImeAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static void performTextClearance(androidx.compose.ui.test.SemanticsNodeInteraction);
+    method public static void performTextInput(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+    method public static void performTextReplacement(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+  }
+
+  public final class UtilsKt {
+  }
+
+}
+
+package androidx.compose.ui.test.android {
+
+  public final class WindowCapture_androidKt {
+  }
+
+}
+

compose/ui/ui-text/OWNERS

diff --git a/compose/ui/ui-text/OWNERS b/compose/ui/ui-text/OWNERS
index 8cd9c61..75da977 100644
--- a/compose/ui/ui-text/OWNERS
+++ b/compose/ui/ui-text/OWNERS
@@ -4,7 +4,6 @@
 popam@google.com
 andreykulikov@google.com
 ryanmentley@google.com
-shepshapard@google.com
 njawad@google.com
 haoyuchang@google.com
 nona@google.com

compose/ui/ui-text/api/1.0.0-beta02.txt

diff --git a/compose/ui/ui-text/api/1.0.0-beta02.txt b/compose/ui/ui-text/api/1.0.0-beta02.txt
index 255fb72..6c4d62d 100644
--- a/compose/ui/ui-text/api/1.0.0-beta02.txt
+++ b/compose/ui/ui-text/api/1.0.0-beta02.txt
@@ -1104,6 +1104,7 @@
   public enum TextOverflow {
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Visible;
   }
 
 }

compose/ui/ui-text/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-text/api/1.0.0-beta04.txt b/compose/ui/ui-text/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..6c4d62d
--- /dev/null
+++ b/compose/ui/ui-text/api/1.0.0-beta04.txt
@@ -0,0 +1,1111 @@
+// Signature format: 4.0
+package androidx.compose.ui.text {
+
+  public final class ActualAtomicReferenceJvmKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class AnnotatedString implements java.lang.CharSequence {
+    ctor public AnnotatedString(String text, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
+    method public operator char get(int index);
+    method public int getLength();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+    method public String getText();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.TtsAnnotation>> getTtsAnnotations(int start, int end);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
+    method public androidx.compose.ui.text.AnnotatedString subSequence(int startIndex, int endIndex);
+    method public androidx.compose.ui.text.AnnotatedString subSequence-5zc-tL8(long range);
+    property public int length;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles;
+    property public final String text;
+  }
+
+  public static final class AnnotatedString.Builder {
+    ctor public AnnotatedString.Builder(optional int capacity);
+    ctor public AnnotatedString.Builder(String text);
+    ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
+    method public void addStringAnnotation(String tag, String annotation, int start, int end);
+    method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+    method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
+    method public void append(String text);
+    method public void append(char p);
+    method public void append(androidx.compose.ui.text.AnnotatedString text);
+    method public int getLength();
+    method public void pop();
+    method public void pop(int index);
+    method public int pushStringAnnotation(String tag, String annotation);
+    method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+    method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+    method public int pushTtsAnnotation(androidx.compose.ui.text.TtsAnnotation ttsAnnotation);
+    method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
+    property public final int length;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class AnnotatedString.Range<T> {
+    ctor public AnnotatedString.Range(T? item, int start, int end, String tag);
+    ctor public AnnotatedString.Range(T? item, int start, int end);
+    method public T! component1();
+    method public int component2();
+    method public int component3();
+    method public String component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+    method public int getEnd();
+    method public T! getItem();
+    method public int getStart();
+    method public String getTag();
+    property public final int end;
+    property public final T! item;
+    property public final int start;
+    property public final String tag;
+  }
+
+  public final class AnnotatedStringKt {
+    method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, optional androidx.compose.ui.text.ParagraphStyle? paragraphStyle);
+    method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+    method public static inline androidx.compose.ui.text.AnnotatedString buildAnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+    method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+    method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+  }
+
+  public final class JvmAnnotatedString_jvmKt {
+  }
+
+  public final class JvmCharHelpers_jvmKt {
+  }
+
+  public final class MultiParagraph {
+    ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
+    ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+    method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+    method public boolean getDidExceedMaxLines();
+    method public float getFirstBaseline();
+    method public float getHeight();
+    method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+    method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
+    method public float getLastBaseline();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+    method public int getLineForOffset(int offset);
+    method public int getLineForVerticalPosition(float vertical);
+    method public float getLineHeight(int lineIndex);
+    method public float getLineLeft(int lineIndex);
+    method public float getLineRight(int lineIndex);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public float getLineWidth(int lineIndex);
+    method public float getMaxIntrinsicWidth();
+    method public int getMaxLines();
+    method public float getMinIntrinsicWidth();
+    method public int getOffsetForPosition-k-4lQ0M(long position);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+    method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public long getWordBoundary-d9O1mEE(int offset);
+    method public boolean isLineEllipsized(int lineIndex);
+    method public void paint-TAOIQ28(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
+    property public final boolean didExceedMaxLines;
+    property public final float firstBaseline;
+    property public final float height;
+    property public final androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics;
+    property public final float lastBaseline;
+    property public final int lineCount;
+    property public final float maxIntrinsicWidth;
+    property public final int maxLines;
+    property public final float minIntrinsicWidth;
+    property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+    property public final float width;
+  }
+
+  public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+    ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public float maxIntrinsicWidth;
+    property public float minIntrinsicWidth;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+  }
+
+  public final class MultiParagraphIntrinsicsKt {
+  }
+
+  public final class MultiParagraphKt {
+  }
+
+  public interface Paragraph {
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+    method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+    method public boolean getDidExceedMaxLines();
+    method public float getFirstBaseline();
+    method public float getHeight();
+    method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+    method public float getLastBaseline();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+    method public int getLineForOffset(int offset);
+    method public int getLineForVerticalPosition(float vertical);
+    method public float getLineHeight(int lineIndex);
+    method public float getLineLeft(int lineIndex);
+    method public float getLineRight(int lineIndex);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public float getLineWidth(int lineIndex);
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    method public int getOffsetForPosition-k-4lQ0M(long position);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+    method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public long getWordBoundary-d9O1mEE(int offset);
+    method public boolean isLineEllipsized(int lineIndex);
+    method public void paint-TAOIQ28(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration);
+    property public abstract boolean didExceedMaxLines;
+    property public abstract float firstBaseline;
+    property public abstract float height;
+    property public abstract float lastBaseline;
+    property public abstract int lineCount;
+    property public abstract float maxIntrinsicWidth;
+    property public abstract float minIntrinsicWidth;
+    property public abstract java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+    property public abstract float width;
+  }
+
+  public interface ParagraphIntrinsics {
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    property public abstract float maxIntrinsicWidth;
+    property public abstract float minIntrinsicWidth;
+  }
+
+  public final class ParagraphIntrinsicsKt {
+    method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+  }
+
+  public final class ParagraphKt {
+    method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, optional int maxLines, optional boolean ellipsis, float width);
+  }
+
+  @androidx.compose.runtime.Immutable public final class ParagraphStyle {
+    method public androidx.compose.ui.text.ParagraphStyle copy-QrGfzA0(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+    method public operator boolean equals(Object? other);
+    method public long getLineHeight-XSAIIZE();
+    method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+    method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+    property public final long lineHeight;
+    property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+    property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+    property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+  }
+
+  public final class ParagraphStyleKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Placeholder {
+    method public androidx.compose.ui.text.Placeholder copy-KJSDsNM(optional long width, optional long height, optional androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+    method public operator boolean equals(Object? other);
+    method public long getHeight-XSAIIZE();
+    method public androidx.compose.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+    method public long getWidth-XSAIIZE();
+    property public final long height;
+    property public final androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign;
+    property public final long width;
+  }
+
+  public enum PlaceholderVerticalAlign {
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign AboveBaseline;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Bottom;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Center;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextBottom;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextCenter;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextTop;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Top;
+  }
+
+  @androidx.compose.runtime.Immutable public final class SpanStyle {
+    method public androidx.compose.ui.text.SpanStyle copy-D5kMcog(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+    method public operator boolean equals(Object? other);
+    method public long getBackground-0d7_KjU();
+    method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift-5SSeXJ0();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize-XSAIIZE();
+    method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing-XSAIIZE();
+    method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+    method public androidx.compose.ui.graphics.Shadow? getShadow();
+    method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle merge(optional androidx.compose.ui.text.SpanStyle? other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
+    property public final long background;
+    property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+    property public final long color;
+    property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+    property public final String? fontFeatureSettings;
+    property public final long fontSize;
+    property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+    property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+    property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+    property public final long letterSpacing;
+    property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+    property public final androidx.compose.ui.graphics.Shadow? shadow;
+    property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+    property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+  }
+
+  public final class SpanStyleKt {
+    method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
+  }
+
+  public final class StringKt {
+    method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+  public final class TextLayoutInput {
+    method public androidx.compose.ui.text.TextLayoutInput copy-ih31NyA(optional androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean softWrap, optional androidx.compose.ui.text.style.TextOverflow overflow, optional androidx.compose.ui.unit.Density density, optional androidx.compose.ui.unit.LayoutDirection layoutDirection, optional androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, optional long constraints);
+    method public operator boolean equals(Object? other);
+    method public long getConstraints-msEJaDk();
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public int getMaxLines();
+    method public androidx.compose.ui.text.style.TextOverflow getOverflow();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+    method public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
+    method public boolean getSoftWrap();
+    method public androidx.compose.ui.text.TextStyle getStyle();
+    method public androidx.compose.ui.text.AnnotatedString getText();
+    property public final long constraints;
+    property public final androidx.compose.ui.unit.Density density;
+    property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public final int maxLines;
+    property public final androidx.compose.ui.text.style.TextOverflow overflow;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+    property public final androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader;
+    property public final boolean softWrap;
+    property public final androidx.compose.ui.text.TextStyle style;
+    property public final androidx.compose.ui.text.AnnotatedString text;
+  }
+
+  public final class TextLayoutResult {
+    method public androidx.compose.ui.text.TextLayoutResult copy-1moGK-E(optional androidx.compose.ui.text.TextLayoutInput layoutInput, optional long size);
+    method public operator boolean equals(Object? other);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+    method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+    method public boolean getDidOverflowHeight();
+    method public boolean getDidOverflowWidth();
+    method public float getFirstBaseline();
+    method public boolean getHasVisualOverflow();
+    method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+    method public float getLastBaseline();
+    method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+    method public int getLineForOffset(int offset);
+    method public int getLineForVerticalPosition(float vertical);
+    method public float getLineLeft(int lineIndex);
+    method public float getLineRight(int lineIndex);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public androidx.compose.ui.text.MultiParagraph getMultiParagraph();
+    method public int getOffsetForPosition-k-4lQ0M(long position);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+    method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+    method public long getSize-YbymL2g();
+    method public long getWordBoundary-d9O1mEE(int offset);
+    method public boolean isLineEllipsized(int lineIndex);
+    property public final boolean didOverflowHeight;
+    property public final boolean didOverflowWidth;
+    property public final float firstBaseline;
+    property public final boolean hasVisualOverflow;
+    property public final float lastBaseline;
+    property public final androidx.compose.ui.text.TextLayoutInput layoutInput;
+    property public final int lineCount;
+    property public final androidx.compose.ui.text.MultiParagraph multiParagraph;
+    property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+    property public final long size;
+  }
+
+  public final class TextLayoutResultKt {
+    method public static androidx.compose.ui.text.TextLayoutResult createTextLayoutResult-2H_Vf2E(optional androidx.compose.ui.text.TextLayoutInput layoutInput, optional androidx.compose.ui.text.MultiParagraph multiParagraph, optional long size);
+  }
+
+  public final class TextPainter {
+    method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+    field public static final androidx.compose.ui.text.TextPainter INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class TextRange {
+    ctor public TextRange();
+    method public static operator boolean contains-5zc-tL8(long $this, long other);
+    method public static operator boolean contains-impl(long $this, int offset);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static boolean getCollapsed-impl(long $this);
+    method public static int getEnd-impl(long $this);
+    method public static int getLength-impl(long $this);
+    method public static int getMax-impl(long $this);
+    method public static int getMin-impl(long $this);
+    method public static boolean getReversed-impl(long $this);
+    method public static int getStart-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static boolean intersects-5zc-tL8(long $this, long other);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.text.TextRange.Companion Companion;
+  }
+
+  public static final class TextRange.Companion {
+    method public long getZero-d9O1mEE();
+    property public final long Zero;
+  }
+
+  public final class TextRangeKt {
+    method public static long TextRange(int start, int end);
+    method public static long TextRange(int index);
+    method public static String substring-cWlJSyE(CharSequence, long range);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextStyle {
+    method public androidx.compose.ui.text.TextStyle copy-4skVB9c(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+    method public long getBackground-0d7_KjU();
+    method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift-5SSeXJ0();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize-XSAIIZE();
+    method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing-XSAIIZE();
+    method public long getLineHeight-XSAIIZE();
+    method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+    method public androidx.compose.ui.graphics.Shadow? getShadow();
+    method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+    method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(optional androidx.compose.ui.text.TextStyle? other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+    property public final long background;
+    property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+    property public final long color;
+    property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+    property public final String? fontFeatureSettings;
+    property public final long fontSize;
+    property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+    property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+    property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+    property public final long letterSpacing;
+    property public final long lineHeight;
+    property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+    property public final androidx.compose.ui.graphics.Shadow? shadow;
+    property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+    property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+    property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+    property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+    property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+    field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
+  }
+
+  public static final class TextStyle.Companion {
+    method public androidx.compose.ui.text.TextStyle getDefault();
+    property public final androidx.compose.ui.text.TextStyle Default;
+  }
+
+  public final class TextStyleKt {
+    method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+    method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.compose.ui.unit.LayoutDirection direction);
+  }
+
+  public abstract sealed class TtsAnnotation {
+  }
+
+  public final class VerbatimTtsAnnotation extends androidx.compose.ui.text.TtsAnnotation {
+    ctor public VerbatimTtsAnnotation(String verbatim);
+    method public String getVerbatim();
+    property public final String verbatim;
+  }
+
+}
+
+package androidx.compose.ui.text.android {
+
+  public final class LayoutCompatKt {
+  }
+
+  public final class LayoutHelperKt {
+  }
+
+  public final class LayoutIntrinsicsKt {
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+  public final class TextLayoutKt {
+  }
+
+}
+
+package androidx.compose.ui.text.android.style {
+
+  public final class PlaceholderSpanKt {
+  }
+
+}
+
+package androidx.compose.ui.text.font {
+
+  public final class AndroidTypeface_androidKt {
+    method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
+    method public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<? extends kotlin.Pair<androidx.compose.ui.text.font.FontWeight,? extends androidx.compose.ui.text.font.FontStyle>>? styles);
+    method public static androidx.compose.ui.text.font.Typeface Typeface(android.graphics.Typeface typeface);
+  }
+
+  public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+  }
+
+  @androidx.compose.runtime.Immutable public interface Font {
+    method public androidx.compose.ui.text.font.FontStyle getStyle();
+    method public androidx.compose.ui.text.font.FontWeight getWeight();
+    property public abstract androidx.compose.ui.text.font.FontStyle style;
+    property public abstract androidx.compose.ui.text.font.FontWeight weight;
+  }
+
+  public static interface Font.ResourceLoader {
+    method public Object load(androidx.compose.ui.text.font.Font font);
+  }
+
+  @androidx.compose.runtime.Immutable public abstract sealed class FontFamily {
+    method public final boolean getCanLoadSynchronously();
+    property public final boolean canLoadSynchronously;
+    field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
+  }
+
+  public static final class FontFamily.Companion {
+    method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+    method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+    method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+    method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+    method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+    property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+    property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+    property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+    property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+    property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
+  }
+
+  public final class FontFamilyKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Font... fonts);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
+  }
+
+  public final class FontKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional androidx.compose.ui.text.font.FontStyle style);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily toFontFamily(androidx.compose.ui.text.font.Font);
+  }
+
+  @androidx.compose.runtime.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+    method public boolean contains(androidx.compose.ui.text.font.Font element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public androidx.compose.ui.text.font.Font get(int index);
+    method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
+    method public int getSize();
+    method public int indexOf(androidx.compose.ui.text.font.Font element);
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.compose.ui.text.font.Font> iterator();
+    method public int lastIndexOf(androidx.compose.ui.text.font.Font element);
+    method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator();
+    method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator(int index);
+    method public java.util.List<androidx.compose.ui.text.font.Font> subList(int fromIndex, int toIndex);
+    property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
+  }
+
+  public enum FontStyle {
+    enum_constant public static final androidx.compose.ui.text.font.FontStyle Italic;
+    enum_constant public static final androidx.compose.ui.text.font.FontStyle Normal;
+  }
+
+  public enum FontSynthesis {
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis All;
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis None;
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Style;
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Weight;
+  }
+
+  @androidx.compose.runtime.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
+    method public operator int compareTo(androidx.compose.ui.text.font.FontWeight other);
+    method public int getWeight();
+    property public final int weight;
+    field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
+  }
+
+  public static final class FontWeight.Companion {
+    method public androidx.compose.ui.text.font.FontWeight getBlack();
+    method public androidx.compose.ui.text.font.FontWeight getBold();
+    method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+    method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+    method public androidx.compose.ui.text.font.FontWeight getLight();
+    method public androidx.compose.ui.text.font.FontWeight getMedium();
+    method public androidx.compose.ui.text.font.FontWeight getNormal();
+    method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+    method public androidx.compose.ui.text.font.FontWeight getThin();
+    method public androidx.compose.ui.text.font.FontWeight getW100();
+    method public androidx.compose.ui.text.font.FontWeight getW200();
+    method public androidx.compose.ui.text.font.FontWeight getW300();
+    method public androidx.compose.ui.text.font.FontWeight getW400();
+    method public androidx.compose.ui.text.font.FontWeight getW500();
+    method public androidx.compose.ui.text.font.FontWeight getW600();
+    method public androidx.compose.ui.text.font.FontWeight getW700();
+    method public androidx.compose.ui.text.font.FontWeight getW800();
+    method public androidx.compose.ui.text.font.FontWeight getW900();
+    property public final androidx.compose.ui.text.font.FontWeight Black;
+    property public final androidx.compose.ui.text.font.FontWeight Bold;
+    property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+    property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+    property public final androidx.compose.ui.text.font.FontWeight Light;
+    property public final androidx.compose.ui.text.font.FontWeight Medium;
+    property public final androidx.compose.ui.text.font.FontWeight Normal;
+    property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+    property public final androidx.compose.ui.text.font.FontWeight Thin;
+    property public final androidx.compose.ui.text.font.FontWeight W100;
+    property public final androidx.compose.ui.text.font.FontWeight W200;
+    property public final androidx.compose.ui.text.font.FontWeight W300;
+    property public final androidx.compose.ui.text.font.FontWeight W400;
+    property public final androidx.compose.ui.text.font.FontWeight W500;
+    property public final androidx.compose.ui.text.font.FontWeight W600;
+    property public final androidx.compose.ui.text.font.FontWeight W700;
+    property public final androidx.compose.ui.text.font.FontWeight W800;
+    property public final androidx.compose.ui.text.font.FontWeight W900;
+  }
+
+  public final class FontWeightKt {
+    method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
+    method public String getName();
+    property public final String name;
+  }
+
+  public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+    method public androidx.compose.ui.text.font.Typeface getTypeface();
+    property public final androidx.compose.ui.text.font.Typeface typeface;
+  }
+
+  public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+    method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional androidx.compose.ui.text.font.FontStyle style);
+    method public int getResId();
+    method public androidx.compose.ui.text.font.FontStyle getStyle();
+    method public androidx.compose.ui.text.font.FontWeight getWeight();
+    property public final int resId;
+    property public androidx.compose.ui.text.font.FontStyle style;
+    property public androidx.compose.ui.text.font.FontWeight weight;
+  }
+
+  public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
+  }
+
+  public interface Typeface {
+    method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+    property public abstract androidx.compose.ui.text.font.FontFamily? fontFamily;
+  }
+
+}
+
+package androidx.compose.ui.text.input {
+
+  public final class BackspaceCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public BackspaceCommand();
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class CommitTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public CommitTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+    ctor public CommitTextCommand(String text, int newCursorPosition);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public int getNewCursorPosition();
+    method public String getText();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public final int newCursorPosition;
+    property public final String text;
+  }
+
+  public final class DeleteAllCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public DeleteAllCommand();
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class DeleteSurroundingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public DeleteSurroundingTextCommand(int lengthBeforeCursor, int lengthAfterCursor);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getLengthAfterCursor();
+    method public int getLengthBeforeCursor();
+    property public final int lengthAfterCursor;
+    property public final int lengthBeforeCursor;
+  }
+
+  public final class DeleteSurroundingTextInCodePointsCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public DeleteSurroundingTextInCodePointsCommand(int lengthBeforeCursor, int lengthAfterCursor);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getLengthAfterCursor();
+    method public int getLengthBeforeCursor();
+    property public final int lengthAfterCursor;
+    property public final int lengthBeforeCursor;
+  }
+
+  public interface EditCommand {
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class EditCommandKt {
+  }
+
+  public final class EditProcessor {
+    ctor public EditProcessor();
+    method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+    method public void reset(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.TextInputSession? textInputSession);
+    method public androidx.compose.ui.text.input.TextFieldValue toTextFieldValue();
+  }
+
+  public final class EditingBuffer {
+  }
+
+  public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public FinishComposingTextCommand();
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class GapBufferKt {
+  }
+
+  public enum ImeAction {
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Default;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Done;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Go;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Next;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction None;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Previous;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Search;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Send;
+  }
+
+  @androidx.compose.runtime.Immutable public final class ImeOptions {
+    ctor public ImeOptions(optional boolean singleLine, optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public androidx.compose.ui.text.input.ImeOptions copy(optional boolean singleLine, optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public boolean getAutoCorrect();
+    method public androidx.compose.ui.text.input.KeyboardCapitalization getCapitalization();
+    method public androidx.compose.ui.text.input.ImeAction getImeAction();
+    method public androidx.compose.ui.text.input.KeyboardType getKeyboardType();
+    method public boolean getSingleLine();
+    property public final boolean autoCorrect;
+    property public final androidx.compose.ui.text.input.KeyboardCapitalization capitalization;
+    property public final androidx.compose.ui.text.input.ImeAction imeAction;
+    property public final androidx.compose.ui.text.input.KeyboardType keyboardType;
+    property public final boolean singleLine;
+    field public static final androidx.compose.ui.text.input.ImeOptions.Companion Companion;
+  }
+
+  public static final class ImeOptions.Companion {
+    method public androidx.compose.ui.text.input.ImeOptions getDefault();
+    property public final androidx.compose.ui.text.input.ImeOptions Default;
+  }
+
+  public interface InputEventCallback {
+    method public void onEditCommands(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+    method public void onImeAction(androidx.compose.ui.text.input.ImeAction imeAction);
+  }
+
+  public enum KeyboardCapitalization {
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization Characters;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization None;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization Sentences;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization Words;
+  }
+
+  public enum KeyboardType {
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Ascii;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Email;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Number;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType NumberPassword;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Password;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Phone;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Text;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Uri;
+  }
+
+  public final class MoveCursorCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public MoveCursorCommand(int amount);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getAmount();
+    property public final int amount;
+  }
+
+  public interface OffsetMapping {
+    method public int originalToTransformed(int offset);
+    method public int transformedToOriginal(int offset);
+    field public static final androidx.compose.ui.text.input.OffsetMapping.Companion Companion;
+  }
+
+  public static final class OffsetMapping.Companion {
+    method public androidx.compose.ui.text.input.OffsetMapping getIdentity();
+    property public final androidx.compose.ui.text.input.OffsetMapping Identity;
+  }
+
+  public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+    ctor public PasswordVisualTransformation(optional char mask);
+    method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+    method public char getMask();
+    property public final char mask;
+  }
+
+  public interface PlatformTextInputService {
+    method public void hideSoftwareKeyboard();
+    method public void notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+    method public void showSoftwareKeyboard();
+    method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput();
+    method public void updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+  }
+
+  public final class SetComposingRegionCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public SetComposingRegionCommand(int start, int end);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getEnd();
+    method public int getStart();
+    property public final int end;
+    property public final int start;
+  }
+
+  public final class SetComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public SetComposingTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+    ctor public SetComposingTextCommand(String text, int newCursorPosition);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public int getNewCursorPosition();
+    method public String getText();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public final int newCursorPosition;
+    property public final String text;
+  }
+
+  public final class SetSelectionCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public SetSelectionCommand(int start, int end);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getEnd();
+    method public int getStart();
+    property public final int end;
+    property public final int start;
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextFieldValue {
+    method public androidx.compose.ui.text.input.TextFieldValue copy-Dr2r1M0(String text, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+    method public androidx.compose.ui.text.input.TextFieldValue copy-ec4yWi8(optional androidx.compose.ui.text.AnnotatedString annotatedString, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public androidx.compose.ui.text.TextRange? getComposition-MzsxiRA();
+    method public long getSelection-d9O1mEE();
+    method public String getText();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public final androidx.compose.ui.text.TextRange? composition;
+    property public final long selection;
+    property public final String text;
+    field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+  }
+
+  public static final class TextFieldValue.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+  }
+
+  public final class TextFieldValueKt {
+    method public static androidx.compose.ui.text.AnnotatedString getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+    method public static androidx.compose.ui.text.AnnotatedString getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+    method public static androidx.compose.ui.text.AnnotatedString getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+  }
+
+  public class TextInputService {
+    ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+    method public final void hideSoftwareKeyboard();
+    method public final void showSoftwareKeyboard();
+    method public androidx.compose.ui.text.input.TextInputSession startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput(androidx.compose.ui.text.input.TextInputSession session);
+  }
+
+  public final class TextInputSession {
+    ctor public TextInputSession(androidx.compose.ui.text.input.TextInputService textInputService, androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+    method public void dispose();
+    method public boolean hideSoftwareKeyboard();
+    method public boolean isOpen();
+    method public boolean notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+    method public boolean showSoftwareKeyboard();
+    method public boolean updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+    property public final boolean isOpen;
+  }
+
+  public final class TransformedText {
+    ctor public TransformedText(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.input.OffsetMapping offsetMapping);
+    method public androidx.compose.ui.text.input.OffsetMapping getOffsetMapping();
+    method public androidx.compose.ui.text.AnnotatedString getText();
+    property public final androidx.compose.ui.text.input.OffsetMapping offsetMapping;
+    property public final androidx.compose.ui.text.AnnotatedString text;
+  }
+
+  @androidx.compose.runtime.Immutable public fun interface VisualTransformation {
+    method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+    field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+  }
+
+  public static final class VisualTransformation.Companion {
+    method public androidx.compose.ui.text.input.VisualTransformation getNone();
+    property public final androidx.compose.ui.text.input.VisualTransformation None;
+  }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+  public final class AndroidPlatformLocale_androidKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class Locale {
+    ctor public Locale(String languageTag);
+    method public String getLanguage();
+    method public String getRegion();
+    method public String getScript();
+    method public String toLanguageTag();
+    property public final String language;
+    property public final String region;
+    property public final String script;
+    field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+  }
+
+  public static final class Locale.Companion {
+    method public androidx.compose.ui.text.intl.Locale getCurrent();
+    property public final androidx.compose.ui.text.intl.Locale current;
+  }
+
+  @androidx.compose.runtime.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+    ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+    ctor public LocaleList(String languageTags);
+    ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+    method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public operator androidx.compose.ui.text.intl.Locale get(int i);
+    method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+    method public int getSize();
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+    property public final java.util.List<androidx.compose.ui.text.intl.Locale> localeList;
+    property public int size;
+    field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+  }
+
+  public static final class LocaleList.Companion {
+    method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+    property public final androidx.compose.ui.text.intl.LocaleList current;
+  }
+
+  public final class PlatformLocaleKt {
+  }
+
+}
+
+package androidx.compose.ui.text.platform {
+
+  public final class AndroidAccessibilitySpannableString_androidKt {
+  }
+
+  public final class AndroidParagraphHelper_androidKt {
+  }
+
+  public final class AndroidParagraphIntrinsics_androidKt {
+  }
+
+  public final class AndroidParagraph_androidKt {
+  }
+
+  public final class AndroidStringDelegate_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.text.platform.extensions {
+
+  public final class LocaleExtensions_androidKt {
+  }
+
+  public final class PlaceholderExtensions_androidKt {
+  }
+
+  public final class SpannableExtensions_androidKt {
+  }
+
+  public final class TextPaintExtensions_androidKt {
+  }
+
+  public final class TtsAnnotationExtensions_androidKt {
+    method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
+    method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
+  }
+
+}
+
+package androidx.compose.ui.text.style {
+
+  @androidx.compose.runtime.Immutable public final inline class BaselineShift {
+    ctor public BaselineShift();
+    method public static float constructor-impl(float multiplier);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getMultiplier();
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(float p);
+    method @androidx.compose.runtime.Immutable public static inline String! toString-impl(float p);
+    property public final float multiplier;
+    field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
+  }
+
+  public static final class BaselineShift.Companion {
+    method public float getNone-y9eOQZs();
+    method public float getSubscript-y9eOQZs();
+    method public float getSuperscript-y9eOQZs();
+    property public final float None;
+    property public final float Subscript;
+    property public final float Superscript;
+  }
+
+  public final class BaselineShiftKt {
+    method @androidx.compose.runtime.Stable public static float lerp-ylBt8J4(float start, float stop, float fraction);
+  }
+
+  public enum ResolvedTextDirection {
+    enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+    enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
+  }
+
+  public enum TextAlign {
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Center;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign End;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Justify;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Left;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Right;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Start;
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextDecoration {
+    method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+    method public operator boolean equals(Object? other);
+    method public int getMask();
+    method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+    property public final int mask;
+    field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
+  }
+
+  public static final class TextDecoration.Companion {
+    method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+    method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+    method public androidx.compose.ui.text.style.TextDecoration getNone();
+    method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+    property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+    property public final androidx.compose.ui.text.style.TextDecoration None;
+    property public final androidx.compose.ui.text.style.TextDecoration Underline;
+  }
+
+  public enum TextDirection {
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection Content;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrLtr;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrRtl;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection Ltr;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection Rtl;
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
+    ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
+    method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
+    method public operator boolean equals(Object? other);
+    method public float getScaleX();
+    method public float getSkewX();
+    property public final float scaleX;
+    property public final float skewX;
+    field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
+  }
+
+  public static final class TextGeometricTransform.Companion {
+  }
+
+  public final class TextGeometricTransformKt {
+    method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextIndent {
+    method public androidx.compose.ui.text.style.TextIndent copy-8E83U4Q(optional long firstLine, optional long restLine);
+    method public operator boolean equals(Object? other);
+    method public long getFirstLine-XSAIIZE();
+    method public long getRestLine-XSAIIZE();
+    property public final long firstLine;
+    property public final long restLine;
+    field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
+  }
+
+  public static final class TextIndent.Companion {
+    method public androidx.compose.ui.text.style.TextIndent getNone();
+    property public final androidx.compose.ui.text.style.TextIndent None;
+  }
+
+  public final class TextIndentKt {
+    method public static androidx.compose.ui.text.style.TextIndent lerp(androidx.compose.ui.text.style.TextIndent start, androidx.compose.ui.text.style.TextIndent stop, float fraction);
+  }
+
+  public enum TextOverflow {
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Visible;
+  }
+
+}
+

compose/ui/ui-text/api/current.txt

diff --git a/compose/ui/ui-text/api/current.txt b/compose/ui/ui-text/api/current.txt
index 255fb72..6c4d62d 100644
--- a/compose/ui/ui-text/api/current.txt
+++ b/compose/ui/ui-text/api/current.txt
@@ -1104,6 +1104,7 @@
   public enum TextOverflow {
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Visible;
   }
 
 }

compose/ui/ui-text/api/public_plus_experimental_1.0.0-beta02.txt

diff --git a/compose/ui/ui-text/api/public_plus_experimental_1.0.0-beta02.txt b/compose/ui/ui-text/api/public_plus_experimental_1.0.0-beta02.txt
index 4656604..4ac26f3 100644
--- a/compose/ui/ui-text/api/public_plus_experimental_1.0.0-beta02.txt
+++ b/compose/ui/ui-text/api/public_plus_experimental_1.0.0-beta02.txt
@@ -1110,6 +1110,7 @@
   public enum TextOverflow {
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Visible;
   }
 
 }

compose/ui/ui-text/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-text/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-text/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..4ac26f3
--- /dev/null
+++ b/compose/ui/ui-text/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,1117 @@
+// Signature format: 4.0
+package androidx.compose.ui.text {
+
+  public final class ActualAtomicReferenceJvmKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class AnnotatedString implements java.lang.CharSequence {
+    ctor public AnnotatedString(String text, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
+    method public operator char get(int index);
+    method public int getLength();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+    method public String getText();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.TtsAnnotation>> getTtsAnnotations(int start, int end);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
+    method public androidx.compose.ui.text.AnnotatedString subSequence(int startIndex, int endIndex);
+    method public androidx.compose.ui.text.AnnotatedString subSequence-5zc-tL8(long range);
+    property public int length;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles;
+    property public final String text;
+  }
+
+  public static final class AnnotatedString.Builder {
+    ctor public AnnotatedString.Builder(optional int capacity);
+    ctor public AnnotatedString.Builder(String text);
+    ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
+    method public void addStringAnnotation(String tag, String annotation, int start, int end);
+    method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+    method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
+    method public void append(String text);
+    method public void append(char p);
+    method public void append(androidx.compose.ui.text.AnnotatedString text);
+    method public int getLength();
+    method public void pop();
+    method public void pop(int index);
+    method public int pushStringAnnotation(String tag, String annotation);
+    method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+    method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+    method public int pushTtsAnnotation(androidx.compose.ui.text.TtsAnnotation ttsAnnotation);
+    method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
+    property public final int length;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class AnnotatedString.Range<T> {
+    ctor public AnnotatedString.Range(T? item, int start, int end, String tag);
+    ctor public AnnotatedString.Range(T? item, int start, int end);
+    method public T! component1();
+    method public int component2();
+    method public int component3();
+    method public String component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+    method public int getEnd();
+    method public T! getItem();
+    method public int getStart();
+    method public String getTag();
+    property public final int end;
+    property public final T! item;
+    property public final int start;
+    property public final String tag;
+  }
+
+  public final class AnnotatedStringKt {
+    method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, optional androidx.compose.ui.text.ParagraphStyle? paragraphStyle);
+    method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+    method public static inline androidx.compose.ui.text.AnnotatedString buildAnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+    method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+    method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+  }
+
+  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface InternalTextApi {
+  }
+
+  public final class JvmAnnotatedString_jvmKt {
+  }
+
+  public final class JvmCharHelpers_jvmKt {
+  }
+
+  public final class MultiParagraph {
+    ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
+    ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+    method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+    method public boolean getDidExceedMaxLines();
+    method public float getFirstBaseline();
+    method public float getHeight();
+    method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+    method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
+    method public float getLastBaseline();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+    method public int getLineForOffset(int offset);
+    method public int getLineForVerticalPosition(float vertical);
+    method public float getLineHeight(int lineIndex);
+    method public float getLineLeft(int lineIndex);
+    method public float getLineRight(int lineIndex);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public float getLineWidth(int lineIndex);
+    method public float getMaxIntrinsicWidth();
+    method public int getMaxLines();
+    method public float getMinIntrinsicWidth();
+    method public int getOffsetForPosition-k-4lQ0M(long position);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+    method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public long getWordBoundary-d9O1mEE(int offset);
+    method public boolean isLineEllipsized(int lineIndex);
+    method public void paint-TAOIQ28(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
+    property public final boolean didExceedMaxLines;
+    property public final float firstBaseline;
+    property public final float height;
+    property public final androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics;
+    property public final float lastBaseline;
+    property public final int lineCount;
+    property public final float maxIntrinsicWidth;
+    property public final int maxLines;
+    property public final float minIntrinsicWidth;
+    property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+    property public final float width;
+  }
+
+  public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+    ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public float maxIntrinsicWidth;
+    property public float minIntrinsicWidth;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+  }
+
+  public final class MultiParagraphIntrinsicsKt {
+  }
+
+  public final class MultiParagraphKt {
+  }
+
+  public interface Paragraph {
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+    method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+    method public boolean getDidExceedMaxLines();
+    method public float getFirstBaseline();
+    method public float getHeight();
+    method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+    method public float getLastBaseline();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+    method public int getLineForOffset(int offset);
+    method public int getLineForVerticalPosition(float vertical);
+    method public float getLineHeight(int lineIndex);
+    method public float getLineLeft(int lineIndex);
+    method public float getLineRight(int lineIndex);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public float getLineWidth(int lineIndex);
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    method public int getOffsetForPosition-k-4lQ0M(long position);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+    method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public long getWordBoundary-d9O1mEE(int offset);
+    method public boolean isLineEllipsized(int lineIndex);
+    method public void paint-TAOIQ28(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration);
+    property public abstract boolean didExceedMaxLines;
+    property public abstract float firstBaseline;
+    property public abstract float height;
+    property public abstract float lastBaseline;
+    property public abstract int lineCount;
+    property public abstract float maxIntrinsicWidth;
+    property public abstract float minIntrinsicWidth;
+    property public abstract java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+    property public abstract float width;
+  }
+
+  public interface ParagraphIntrinsics {
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    property public abstract float maxIntrinsicWidth;
+    property public abstract float minIntrinsicWidth;
+  }
+
+  public final class ParagraphIntrinsicsKt {
+    method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+  }
+
+  public final class ParagraphKt {
+    method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, optional int maxLines, optional boolean ellipsis, float width);
+  }
+
+  @androidx.compose.runtime.Immutable public final class ParagraphStyle {
+    method public androidx.compose.ui.text.ParagraphStyle copy-QrGfzA0(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+    method public operator boolean equals(Object? other);
+    method public long getLineHeight-XSAIIZE();
+    method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+    method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+    property public final long lineHeight;
+    property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+    property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+    property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+  }
+
+  public final class ParagraphStyleKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Placeholder {
+    method public androidx.compose.ui.text.Placeholder copy-KJSDsNM(optional long width, optional long height, optional androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+    method public operator boolean equals(Object? other);
+    method public long getHeight-XSAIIZE();
+    method public androidx.compose.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+    method public long getWidth-XSAIIZE();
+    property public final long height;
+    property public final androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign;
+    property public final long width;
+  }
+
+  public enum PlaceholderVerticalAlign {
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign AboveBaseline;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Bottom;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Center;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextBottom;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextCenter;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextTop;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Top;
+  }
+
+  @androidx.compose.runtime.Immutable public final class SpanStyle {
+    method public androidx.compose.ui.text.SpanStyle copy-D5kMcog(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+    method public operator boolean equals(Object? other);
+    method public long getBackground-0d7_KjU();
+    method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift-5SSeXJ0();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize-XSAIIZE();
+    method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing-XSAIIZE();
+    method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+    method public androidx.compose.ui.graphics.Shadow? getShadow();
+    method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle merge(optional androidx.compose.ui.text.SpanStyle? other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
+    property public final long background;
+    property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+    property public final long color;
+    property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+    property public final String? fontFeatureSettings;
+    property public final long fontSize;
+    property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+    property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+    property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+    property public final long letterSpacing;
+    property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+    property public final androidx.compose.ui.graphics.Shadow? shadow;
+    property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+    property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+  }
+
+  public final class SpanStyleKt {
+    method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
+  }
+
+  public final class StringKt {
+    method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+  public final class TextLayoutInput {
+    method public androidx.compose.ui.text.TextLayoutInput copy-ih31NyA(optional androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean softWrap, optional androidx.compose.ui.text.style.TextOverflow overflow, optional androidx.compose.ui.unit.Density density, optional androidx.compose.ui.unit.LayoutDirection layoutDirection, optional androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, optional long constraints);
+    method public operator boolean equals(Object? other);
+    method public long getConstraints-msEJaDk();
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public int getMaxLines();
+    method public androidx.compose.ui.text.style.TextOverflow getOverflow();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+    method public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
+    method public boolean getSoftWrap();
+    method public androidx.compose.ui.text.TextStyle getStyle();
+    method public androidx.compose.ui.text.AnnotatedString getText();
+    property public final long constraints;
+    property public final androidx.compose.ui.unit.Density density;
+    property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public final int maxLines;
+    property public final androidx.compose.ui.text.style.TextOverflow overflow;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+    property public final androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader;
+    property public final boolean softWrap;
+    property public final androidx.compose.ui.text.TextStyle style;
+    property public final androidx.compose.ui.text.AnnotatedString text;
+  }
+
+  public final class TextLayoutResult {
+    method public androidx.compose.ui.text.TextLayoutResult copy-1moGK-E(optional androidx.compose.ui.text.TextLayoutInput layoutInput, optional long size);
+    method public operator boolean equals(Object? other);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+    method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+    method public boolean getDidOverflowHeight();
+    method public boolean getDidOverflowWidth();
+    method public float getFirstBaseline();
+    method public boolean getHasVisualOverflow();
+    method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+    method public float getLastBaseline();
+    method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+    method public int getLineForOffset(int offset);
+    method public int getLineForVerticalPosition(float vertical);
+    method public float getLineLeft(int lineIndex);
+    method public float getLineRight(int lineIndex);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public androidx.compose.ui.text.MultiParagraph getMultiParagraph();
+    method public int getOffsetForPosition-k-4lQ0M(long position);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+    method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+    method public long getSize-YbymL2g();
+    method public long getWordBoundary-d9O1mEE(int offset);
+    method public boolean isLineEllipsized(int lineIndex);
+    property public final boolean didOverflowHeight;
+    property public final boolean didOverflowWidth;
+    property public final float firstBaseline;
+    property public final boolean hasVisualOverflow;
+    property public final float lastBaseline;
+    property public final androidx.compose.ui.text.TextLayoutInput layoutInput;
+    property public final int lineCount;
+    property public final androidx.compose.ui.text.MultiParagraph multiParagraph;
+    property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+    property public final long size;
+  }
+
+  public final class TextLayoutResultKt {
+    method public static androidx.compose.ui.text.TextLayoutResult createTextLayoutResult-2H_Vf2E(optional androidx.compose.ui.text.TextLayoutInput layoutInput, optional androidx.compose.ui.text.MultiParagraph multiParagraph, optional long size);
+  }
+
+  public final class TextPainter {
+    method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+    field public static final androidx.compose.ui.text.TextPainter INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class TextRange {
+    ctor public TextRange();
+    method public static operator boolean contains-5zc-tL8(long $this, long other);
+    method public static operator boolean contains-impl(long $this, int offset);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static boolean getCollapsed-impl(long $this);
+    method public static int getEnd-impl(long $this);
+    method public static int getLength-impl(long $this);
+    method public static int getMax-impl(long $this);
+    method public static int getMin-impl(long $this);
+    method public static boolean getReversed-impl(long $this);
+    method public static int getStart-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static boolean intersects-5zc-tL8(long $this, long other);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.text.TextRange.Companion Companion;
+  }
+
+  public static final class TextRange.Companion {
+    method public long getZero-d9O1mEE();
+    property public final long Zero;
+  }
+
+  public final class TextRangeKt {
+    method public static long TextRange(int start, int end);
+    method public static long TextRange(int index);
+    method public static String substring-cWlJSyE(CharSequence, long range);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextStyle {
+    method public androidx.compose.ui.text.TextStyle copy-4skVB9c(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+    method public long getBackground-0d7_KjU();
+    method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift-5SSeXJ0();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize-XSAIIZE();
+    method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing-XSAIIZE();
+    method public long getLineHeight-XSAIIZE();
+    method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+    method public androidx.compose.ui.graphics.Shadow? getShadow();
+    method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+    method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(optional androidx.compose.ui.text.TextStyle? other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+    property public final long background;
+    property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+    property public final long color;
+    property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+    property public final String? fontFeatureSettings;
+    property public final long fontSize;
+    property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+    property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+    property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+    property public final long letterSpacing;
+    property public final long lineHeight;
+    property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+    property public final androidx.compose.ui.graphics.Shadow? shadow;
+    property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+    property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+    property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+    property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+    property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+    field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
+  }
+
+  public static final class TextStyle.Companion {
+    method public androidx.compose.ui.text.TextStyle getDefault();
+    property public final androidx.compose.ui.text.TextStyle Default;
+  }
+
+  public final class TextStyleKt {
+    method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+    method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.compose.ui.unit.LayoutDirection direction);
+  }
+
+  public abstract sealed class TtsAnnotation {
+  }
+
+  public final class VerbatimTtsAnnotation extends androidx.compose.ui.text.TtsAnnotation {
+    ctor public VerbatimTtsAnnotation(String verbatim);
+    method public String getVerbatim();
+    property public final String verbatim;
+  }
+
+}
+
+package androidx.compose.ui.text.android {
+
+  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface InternalPlatformTextApi {
+  }
+
+  public final class LayoutCompatKt {
+  }
+
+  public final class LayoutHelperKt {
+  }
+
+  public final class LayoutIntrinsicsKt {
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+  public final class TextLayoutKt {
+  }
+
+}
+
+package androidx.compose.ui.text.android.style {
+
+  public final class PlaceholderSpanKt {
+  }
+
+}
+
+package androidx.compose.ui.text.font {
+
+  public final class AndroidTypeface_androidKt {
+    method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
+    method public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<? extends kotlin.Pair<androidx.compose.ui.text.font.FontWeight,? extends androidx.compose.ui.text.font.FontStyle>>? styles);
+    method public static androidx.compose.ui.text.font.Typeface Typeface(android.graphics.Typeface typeface);
+  }
+
+  public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+  }
+
+  @androidx.compose.runtime.Immutable public interface Font {
+    method public androidx.compose.ui.text.font.FontStyle getStyle();
+    method public androidx.compose.ui.text.font.FontWeight getWeight();
+    property public abstract androidx.compose.ui.text.font.FontStyle style;
+    property public abstract androidx.compose.ui.text.font.FontWeight weight;
+  }
+
+  public static interface Font.ResourceLoader {
+    method public Object load(androidx.compose.ui.text.font.Font font);
+  }
+
+  @androidx.compose.runtime.Immutable public abstract sealed class FontFamily {
+    method public final boolean getCanLoadSynchronously();
+    property public final boolean canLoadSynchronously;
+    field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
+  }
+
+  public static final class FontFamily.Companion {
+    method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+    method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+    method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+    method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+    method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+    property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+    property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+    property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+    property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+    property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
+  }
+
+  public final class FontFamilyKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Font... fonts);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
+  }
+
+  public final class FontKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional androidx.compose.ui.text.font.FontStyle style);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily toFontFamily(androidx.compose.ui.text.font.Font);
+  }
+
+  @androidx.compose.runtime.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+    method public boolean contains(androidx.compose.ui.text.font.Font element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public androidx.compose.ui.text.font.Font get(int index);
+    method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
+    method public int getSize();
+    method public int indexOf(androidx.compose.ui.text.font.Font element);
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.compose.ui.text.font.Font> iterator();
+    method public int lastIndexOf(androidx.compose.ui.text.font.Font element);
+    method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator();
+    method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator(int index);
+    method public java.util.List<androidx.compose.ui.text.font.Font> subList(int fromIndex, int toIndex);
+    property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
+  }
+
+  public enum FontStyle {
+    enum_constant public static final androidx.compose.ui.text.font.FontStyle Italic;
+    enum_constant public static final androidx.compose.ui.text.font.FontStyle Normal;
+  }
+
+  public enum FontSynthesis {
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis All;
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis None;
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Style;
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Weight;
+  }
+
+  @androidx.compose.runtime.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
+    method public operator int compareTo(androidx.compose.ui.text.font.FontWeight other);
+    method public int getWeight();
+    property public final int weight;
+    field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
+  }
+
+  public static final class FontWeight.Companion {
+    method public androidx.compose.ui.text.font.FontWeight getBlack();
+    method public androidx.compose.ui.text.font.FontWeight getBold();
+    method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+    method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+    method public androidx.compose.ui.text.font.FontWeight getLight();
+    method public androidx.compose.ui.text.font.FontWeight getMedium();
+    method public androidx.compose.ui.text.font.FontWeight getNormal();
+    method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+    method public androidx.compose.ui.text.font.FontWeight getThin();
+    method public androidx.compose.ui.text.font.FontWeight getW100();
+    method public androidx.compose.ui.text.font.FontWeight getW200();
+    method public androidx.compose.ui.text.font.FontWeight getW300();
+    method public androidx.compose.ui.text.font.FontWeight getW400();
+    method public androidx.compose.ui.text.font.FontWeight getW500();
+    method public androidx.compose.ui.text.font.FontWeight getW600();
+    method public androidx.compose.ui.text.font.FontWeight getW700();
+    method public androidx.compose.ui.text.font.FontWeight getW800();
+    method public androidx.compose.ui.text.font.FontWeight getW900();
+    property public final androidx.compose.ui.text.font.FontWeight Black;
+    property public final androidx.compose.ui.text.font.FontWeight Bold;
+    property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+    property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+    property public final androidx.compose.ui.text.font.FontWeight Light;
+    property public final androidx.compose.ui.text.font.FontWeight Medium;
+    property public final androidx.compose.ui.text.font.FontWeight Normal;
+    property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+    property public final androidx.compose.ui.text.font.FontWeight Thin;
+    property public final androidx.compose.ui.text.font.FontWeight W100;
+    property public final androidx.compose.ui.text.font.FontWeight W200;
+    property public final androidx.compose.ui.text.font.FontWeight W300;
+    property public final androidx.compose.ui.text.font.FontWeight W400;
+    property public final androidx.compose.ui.text.font.FontWeight W500;
+    property public final androidx.compose.ui.text.font.FontWeight W600;
+    property public final androidx.compose.ui.text.font.FontWeight W700;
+    property public final androidx.compose.ui.text.font.FontWeight W800;
+    property public final androidx.compose.ui.text.font.FontWeight W900;
+  }
+
+  public final class FontWeightKt {
+    method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
+    method public String getName();
+    property public final String name;
+  }
+
+  public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+    method public androidx.compose.ui.text.font.Typeface getTypeface();
+    property public final androidx.compose.ui.text.font.Typeface typeface;
+  }
+
+  public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+    method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional androidx.compose.ui.text.font.FontStyle style);
+    method public int getResId();
+    method public androidx.compose.ui.text.font.FontStyle getStyle();
+    method public androidx.compose.ui.text.font.FontWeight getWeight();
+    property public final int resId;
+    property public androidx.compose.ui.text.font.FontStyle style;
+    property public androidx.compose.ui.text.font.FontWeight weight;
+  }
+
+  public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
+  }
+
+  public interface Typeface {
+    method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+    property public abstract androidx.compose.ui.text.font.FontFamily? fontFamily;
+  }
+
+}
+
+package androidx.compose.ui.text.input {
+
+  public final class BackspaceCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public BackspaceCommand();
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class CommitTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public CommitTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+    ctor public CommitTextCommand(String text, int newCursorPosition);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public int getNewCursorPosition();
+    method public String getText();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public final int newCursorPosition;
+    property public final String text;
+  }
+
+  public final class DeleteAllCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public DeleteAllCommand();
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class DeleteSurroundingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public DeleteSurroundingTextCommand(int lengthBeforeCursor, int lengthAfterCursor);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getLengthAfterCursor();
+    method public int getLengthBeforeCursor();
+    property public final int lengthAfterCursor;
+    property public final int lengthBeforeCursor;
+  }
+
+  public final class DeleteSurroundingTextInCodePointsCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public DeleteSurroundingTextInCodePointsCommand(int lengthBeforeCursor, int lengthAfterCursor);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getLengthAfterCursor();
+    method public int getLengthBeforeCursor();
+    property public final int lengthAfterCursor;
+    property public final int lengthBeforeCursor;
+  }
+
+  public interface EditCommand {
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class EditCommandKt {
+  }
+
+  public final class EditProcessor {
+    ctor public EditProcessor();
+    method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+    method public void reset(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.TextInputSession? textInputSession);
+    method public androidx.compose.ui.text.input.TextFieldValue toTextFieldValue();
+  }
+
+  public final class EditingBuffer {
+  }
+
+  public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public FinishComposingTextCommand();
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class GapBufferKt {
+  }
+
+  public enum ImeAction {
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Default;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Done;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Go;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Next;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction None;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Previous;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Search;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Send;
+  }
+
+  @androidx.compose.runtime.Immutable public final class ImeOptions {
+    ctor public ImeOptions(optional boolean singleLine, optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public androidx.compose.ui.text.input.ImeOptions copy(optional boolean singleLine, optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public boolean getAutoCorrect();
+    method public androidx.compose.ui.text.input.KeyboardCapitalization getCapitalization();
+    method public androidx.compose.ui.text.input.ImeAction getImeAction();
+    method public androidx.compose.ui.text.input.KeyboardType getKeyboardType();
+    method public boolean getSingleLine();
+    property public final boolean autoCorrect;
+    property public final androidx.compose.ui.text.input.KeyboardCapitalization capitalization;
+    property public final androidx.compose.ui.text.input.ImeAction imeAction;
+    property public final androidx.compose.ui.text.input.KeyboardType keyboardType;
+    property public final boolean singleLine;
+    field public static final androidx.compose.ui.text.input.ImeOptions.Companion Companion;
+  }
+
+  public static final class ImeOptions.Companion {
+    method public androidx.compose.ui.text.input.ImeOptions getDefault();
+    property public final androidx.compose.ui.text.input.ImeOptions Default;
+  }
+
+  public interface InputEventCallback {
+    method public void onEditCommands(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+    method public void onImeAction(androidx.compose.ui.text.input.ImeAction imeAction);
+  }
+
+  public enum KeyboardCapitalization {
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization Characters;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization None;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization Sentences;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization Words;
+  }
+
+  public enum KeyboardType {
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Ascii;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Email;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Number;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType NumberPassword;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Password;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Phone;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Text;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Uri;
+  }
+
+  public final class MoveCursorCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public MoveCursorCommand(int amount);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getAmount();
+    property public final int amount;
+  }
+
+  public interface OffsetMapping {
+    method public int originalToTransformed(int offset);
+    method public int transformedToOriginal(int offset);
+    field public static final androidx.compose.ui.text.input.OffsetMapping.Companion Companion;
+  }
+
+  public static final class OffsetMapping.Companion {
+    method public androidx.compose.ui.text.input.OffsetMapping getIdentity();
+    property public final androidx.compose.ui.text.input.OffsetMapping Identity;
+  }
+
+  public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+    ctor public PasswordVisualTransformation(optional char mask);
+    method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+    method public char getMask();
+    property public final char mask;
+  }
+
+  public interface PlatformTextInputService {
+    method public void hideSoftwareKeyboard();
+    method public void notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+    method public void showSoftwareKeyboard();
+    method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput();
+    method public void updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+  }
+
+  public final class SetComposingRegionCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public SetComposingRegionCommand(int start, int end);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getEnd();
+    method public int getStart();
+    property public final int end;
+    property public final int start;
+  }
+
+  public final class SetComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public SetComposingTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+    ctor public SetComposingTextCommand(String text, int newCursorPosition);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public int getNewCursorPosition();
+    method public String getText();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public final int newCursorPosition;
+    property public final String text;
+  }
+
+  public final class SetSelectionCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public SetSelectionCommand(int start, int end);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getEnd();
+    method public int getStart();
+    property public final int end;
+    property public final int start;
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextFieldValue {
+    method public androidx.compose.ui.text.input.TextFieldValue copy-Dr2r1M0(String text, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+    method public androidx.compose.ui.text.input.TextFieldValue copy-ec4yWi8(optional androidx.compose.ui.text.AnnotatedString annotatedString, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public androidx.compose.ui.text.TextRange? getComposition-MzsxiRA();
+    method public long getSelection-d9O1mEE();
+    method public String getText();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public final androidx.compose.ui.text.TextRange? composition;
+    property public final long selection;
+    property public final String text;
+    field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+  }
+
+  public static final class TextFieldValue.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+  }
+
+  public final class TextFieldValueKt {
+    method public static androidx.compose.ui.text.AnnotatedString getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+    method public static androidx.compose.ui.text.AnnotatedString getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+    method public static androidx.compose.ui.text.AnnotatedString getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+  }
+
+  public class TextInputService {
+    ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+    method public final void hideSoftwareKeyboard();
+    method public final void showSoftwareKeyboard();
+    method public androidx.compose.ui.text.input.TextInputSession startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput(androidx.compose.ui.text.input.TextInputSession session);
+  }
+
+  public final class TextInputSession {
+    ctor public TextInputSession(androidx.compose.ui.text.input.TextInputService textInputService, androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+    method public void dispose();
+    method public boolean hideSoftwareKeyboard();
+    method public boolean isOpen();
+    method public boolean notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+    method public boolean showSoftwareKeyboard();
+    method public boolean updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+    property public final boolean isOpen;
+  }
+
+  public final class TransformedText {
+    ctor public TransformedText(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.input.OffsetMapping offsetMapping);
+    method public androidx.compose.ui.text.input.OffsetMapping getOffsetMapping();
+    method public androidx.compose.ui.text.AnnotatedString getText();
+    property public final androidx.compose.ui.text.input.OffsetMapping offsetMapping;
+    property public final androidx.compose.ui.text.AnnotatedString text;
+  }
+
+  @androidx.compose.runtime.Immutable public fun interface VisualTransformation {
+    method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+    field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+  }
+
+  public static final class VisualTransformation.Companion {
+    method public androidx.compose.ui.text.input.VisualTransformation getNone();
+    property public final androidx.compose.ui.text.input.VisualTransformation None;
+  }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+  public final class AndroidPlatformLocale_androidKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class Locale {
+    ctor public Locale(String languageTag);
+    method public String getLanguage();
+    method public String getRegion();
+    method public String getScript();
+    method public String toLanguageTag();
+    property public final String language;
+    property public final String region;
+    property public final String script;
+    field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+  }
+
+  public static final class Locale.Companion {
+    method public androidx.compose.ui.text.intl.Locale getCurrent();
+    property public final androidx.compose.ui.text.intl.Locale current;
+  }
+
+  @androidx.compose.runtime.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+    ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+    ctor public LocaleList(String languageTags);
+    ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+    method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public operator androidx.compose.ui.text.intl.Locale get(int i);
+    method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+    method public int getSize();
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+    property public final java.util.List<androidx.compose.ui.text.intl.Locale> localeList;
+    property public int size;
+    field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+  }
+
+  public static final class LocaleList.Companion {
+    method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+    property public final androidx.compose.ui.text.intl.LocaleList current;
+  }
+
+  public final class PlatformLocaleKt {
+  }
+
+}
+
+package androidx.compose.ui.text.platform {
+
+  public final class AndroidAccessibilitySpannableString_androidKt {
+  }
+
+  public final class AndroidParagraphHelper_androidKt {
+  }
+
+  public final class AndroidParagraphIntrinsics_androidKt {
+  }
+
+  public final class AndroidParagraph_androidKt {
+  }
+
+  public final class AndroidStringDelegate_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.text.platform.extensions {
+
+  public final class LocaleExtensions_androidKt {
+  }
+
+  public final class PlaceholderExtensions_androidKt {
+  }
+
+  public final class SpannableExtensions_androidKt {
+  }
+
+  public final class TextPaintExtensions_androidKt {
+  }
+
+  public final class TtsAnnotationExtensions_androidKt {
+    method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
+    method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
+  }
+
+}
+
+package androidx.compose.ui.text.style {
+
+  @androidx.compose.runtime.Immutable public final inline class BaselineShift {
+    ctor public BaselineShift();
+    method public static float constructor-impl(float multiplier);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getMultiplier();
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(float p);
+    method @androidx.compose.runtime.Immutable public static inline String! toString-impl(float p);
+    property public final float multiplier;
+    field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
+  }
+
+  public static final class BaselineShift.Companion {
+    method public float getNone-y9eOQZs();
+    method public float getSubscript-y9eOQZs();
+    method public float getSuperscript-y9eOQZs();
+    property public final float None;
+    property public final float Subscript;
+    property public final float Superscript;
+  }
+
+  public final class BaselineShiftKt {
+    method @androidx.compose.runtime.Stable public static float lerp-ylBt8J4(float start, float stop, float fraction);
+  }
+
+  public enum ResolvedTextDirection {
+    enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+    enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
+  }
+
+  public enum TextAlign {
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Center;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign End;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Justify;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Left;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Right;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Start;
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextDecoration {
+    method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+    method public operator boolean equals(Object? other);
+    method public int getMask();
+    method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+    property public final int mask;
+    field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
+  }
+
+  public static final class TextDecoration.Companion {
+    method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+    method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+    method public androidx.compose.ui.text.style.TextDecoration getNone();
+    method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+    property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+    property public final androidx.compose.ui.text.style.TextDecoration None;
+    property public final androidx.compose.ui.text.style.TextDecoration Underline;
+  }
+
+  public enum TextDirection {
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection Content;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrLtr;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrRtl;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection Ltr;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection Rtl;
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
+    ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
+    method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
+    method public operator boolean equals(Object? other);
+    method public float getScaleX();
+    method public float getSkewX();
+    property public final float scaleX;
+    property public final float skewX;
+    field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
+  }
+
+  public static final class TextGeometricTransform.Companion {
+  }
+
+  public final class TextGeometricTransformKt {
+    method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextIndent {
+    method public androidx.compose.ui.text.style.TextIndent copy-8E83U4Q(optional long firstLine, optional long restLine);
+    method public operator boolean equals(Object? other);
+    method public long getFirstLine-XSAIIZE();
+    method public long getRestLine-XSAIIZE();
+    property public final long firstLine;
+    property public final long restLine;
+    field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
+  }
+
+  public static final class TextIndent.Companion {
+    method public androidx.compose.ui.text.style.TextIndent getNone();
+    property public final androidx.compose.ui.text.style.TextIndent None;
+  }
+
+  public final class TextIndentKt {
+    method public static androidx.compose.ui.text.style.TextIndent lerp(androidx.compose.ui.text.style.TextIndent start, androidx.compose.ui.text.style.TextIndent stop, float fraction);
+  }
+
+  public enum TextOverflow {
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Visible;
+  }
+
+}
+

compose/ui/ui-text/api/public_plus_experimental_current.txt

diff --git a/compose/ui/ui-text/api/public_plus_experimental_current.txt b/compose/ui/ui-text/api/public_plus_experimental_current.txt
index 4656604..4ac26f3 100644
--- a/compose/ui/ui-text/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-text/api/public_plus_experimental_current.txt
@@ -1110,6 +1110,7 @@
   public enum TextOverflow {
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Visible;
   }
 
 }

compose/ui/ui-text/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-text/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-text/api/res-1.0.0-beta04.txt

compose/ui/ui-text/api/restricted_1.0.0-beta02.txt

diff --git a/compose/ui/ui-text/api/restricted_1.0.0-beta02.txt b/compose/ui/ui-text/api/restricted_1.0.0-beta02.txt
index 255fb72..6c4d62d 100644
--- a/compose/ui/ui-text/api/restricted_1.0.0-beta02.txt
+++ b/compose/ui/ui-text/api/restricted_1.0.0-beta02.txt
@@ -1104,6 +1104,7 @@
   public enum TextOverflow {
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Visible;
   }
 
 }

compose/ui/ui-text/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-text/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-text/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..6c4d62d
--- /dev/null
+++ b/compose/ui/ui-text/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,1111 @@
+// Signature format: 4.0
+package androidx.compose.ui.text {
+
+  public final class ActualAtomicReferenceJvmKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class AnnotatedString implements java.lang.CharSequence {
+    ctor public AnnotatedString(String text, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
+    method public operator char get(int index);
+    method public int getLength();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+    method public String getText();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.TtsAnnotation>> getTtsAnnotations(int start, int end);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
+    method public androidx.compose.ui.text.AnnotatedString subSequence(int startIndex, int endIndex);
+    method public androidx.compose.ui.text.AnnotatedString subSequence-5zc-tL8(long range);
+    property public int length;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles;
+    property public final String text;
+  }
+
+  public static final class AnnotatedString.Builder {
+    ctor public AnnotatedString.Builder(optional int capacity);
+    ctor public AnnotatedString.Builder(String text);
+    ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
+    method public void addStringAnnotation(String tag, String annotation, int start, int end);
+    method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+    method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
+    method public void append(String text);
+    method public void append(char p);
+    method public void append(androidx.compose.ui.text.AnnotatedString text);
+    method public int getLength();
+    method public void pop();
+    method public void pop(int index);
+    method public int pushStringAnnotation(String tag, String annotation);
+    method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+    method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+    method public int pushTtsAnnotation(androidx.compose.ui.text.TtsAnnotation ttsAnnotation);
+    method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
+    property public final int length;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class AnnotatedString.Range<T> {
+    ctor public AnnotatedString.Range(T? item, int start, int end, String tag);
+    ctor public AnnotatedString.Range(T? item, int start, int end);
+    method public T! component1();
+    method public int component2();
+    method public int component3();
+    method public String component4();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+    method public int getEnd();
+    method public T! getItem();
+    method public int getStart();
+    method public String getTag();
+    property public final int end;
+    property public final T! item;
+    property public final int start;
+    property public final String tag;
+  }
+
+  public final class AnnotatedStringKt {
+    method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, optional androidx.compose.ui.text.ParagraphStyle? paragraphStyle);
+    method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+    method public static inline androidx.compose.ui.text.AnnotatedString buildAnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+    method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+    method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+  }
+
+  public final class JvmAnnotatedString_jvmKt {
+  }
+
+  public final class JvmCharHelpers_jvmKt {
+  }
+
+  public final class MultiParagraph {
+    ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
+    ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+    method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+    method public boolean getDidExceedMaxLines();
+    method public float getFirstBaseline();
+    method public float getHeight();
+    method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+    method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
+    method public float getLastBaseline();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+    method public int getLineForOffset(int offset);
+    method public int getLineForVerticalPosition(float vertical);
+    method public float getLineHeight(int lineIndex);
+    method public float getLineLeft(int lineIndex);
+    method public float getLineRight(int lineIndex);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public float getLineWidth(int lineIndex);
+    method public float getMaxIntrinsicWidth();
+    method public int getMaxLines();
+    method public float getMinIntrinsicWidth();
+    method public int getOffsetForPosition-k-4lQ0M(long position);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+    method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public long getWordBoundary-d9O1mEE(int offset);
+    method public boolean isLineEllipsized(int lineIndex);
+    method public void paint-TAOIQ28(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
+    property public final boolean didExceedMaxLines;
+    property public final float firstBaseline;
+    property public final float height;
+    property public final androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics;
+    property public final float lastBaseline;
+    property public final int lineCount;
+    property public final float maxIntrinsicWidth;
+    property public final int maxLines;
+    property public final float minIntrinsicWidth;
+    property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+    property public final float width;
+  }
+
+  public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+    ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public float maxIntrinsicWidth;
+    property public float minIntrinsicWidth;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+  }
+
+  public final class MultiParagraphIntrinsicsKt {
+  }
+
+  public final class MultiParagraphKt {
+  }
+
+  public interface Paragraph {
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+    method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+    method public boolean getDidExceedMaxLines();
+    method public float getFirstBaseline();
+    method public float getHeight();
+    method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+    method public float getLastBaseline();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+    method public int getLineForOffset(int offset);
+    method public int getLineForVerticalPosition(float vertical);
+    method public float getLineHeight(int lineIndex);
+    method public float getLineLeft(int lineIndex);
+    method public float getLineRight(int lineIndex);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public float getLineWidth(int lineIndex);
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    method public int getOffsetForPosition-k-4lQ0M(long position);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+    method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public long getWordBoundary-d9O1mEE(int offset);
+    method public boolean isLineEllipsized(int lineIndex);
+    method public void paint-TAOIQ28(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration);
+    property public abstract boolean didExceedMaxLines;
+    property public abstract float firstBaseline;
+    property public abstract float height;
+    property public abstract float lastBaseline;
+    property public abstract int lineCount;
+    property public abstract float maxIntrinsicWidth;
+    property public abstract float minIntrinsicWidth;
+    property public abstract java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+    property public abstract float width;
+  }
+
+  public interface ParagraphIntrinsics {
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    property public abstract float maxIntrinsicWidth;
+    property public abstract float minIntrinsicWidth;
+  }
+
+  public final class ParagraphIntrinsicsKt {
+    method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+  }
+
+  public final class ParagraphKt {
+    method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, optional int maxLines, optional boolean ellipsis, float width);
+  }
+
+  @androidx.compose.runtime.Immutable public final class ParagraphStyle {
+    method public androidx.compose.ui.text.ParagraphStyle copy-QrGfzA0(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+    method public operator boolean equals(Object? other);
+    method public long getLineHeight-XSAIIZE();
+    method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+    method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+    property public final long lineHeight;
+    property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+    property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+    property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+  }
+
+  public final class ParagraphStyleKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class Placeholder {
+    method public androidx.compose.ui.text.Placeholder copy-KJSDsNM(optional long width, optional long height, optional androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+    method public operator boolean equals(Object? other);
+    method public long getHeight-XSAIIZE();
+    method public androidx.compose.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+    method public long getWidth-XSAIIZE();
+    property public final long height;
+    property public final androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign;
+    property public final long width;
+  }
+
+  public enum PlaceholderVerticalAlign {
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign AboveBaseline;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Bottom;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Center;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextBottom;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextCenter;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextTop;
+    enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Top;
+  }
+
+  @androidx.compose.runtime.Immutable public final class SpanStyle {
+    method public androidx.compose.ui.text.SpanStyle copy-D5kMcog(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+    method public operator boolean equals(Object? other);
+    method public long getBackground-0d7_KjU();
+    method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift-5SSeXJ0();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize-XSAIIZE();
+    method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing-XSAIIZE();
+    method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+    method public androidx.compose.ui.graphics.Shadow? getShadow();
+    method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle merge(optional androidx.compose.ui.text.SpanStyle? other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
+    property public final long background;
+    property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+    property public final long color;
+    property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+    property public final String? fontFeatureSettings;
+    property public final long fontSize;
+    property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+    property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+    property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+    property public final long letterSpacing;
+    property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+    property public final androidx.compose.ui.graphics.Shadow? shadow;
+    property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+    property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+  }
+
+  public final class SpanStyleKt {
+    method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
+  }
+
+  public final class StringKt {
+    method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+    method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+    method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+  public final class TextLayoutInput {
+    method public androidx.compose.ui.text.TextLayoutInput copy-ih31NyA(optional androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean softWrap, optional androidx.compose.ui.text.style.TextOverflow overflow, optional androidx.compose.ui.unit.Density density, optional androidx.compose.ui.unit.LayoutDirection layoutDirection, optional androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, optional long constraints);
+    method public operator boolean equals(Object? other);
+    method public long getConstraints-msEJaDk();
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public int getMaxLines();
+    method public androidx.compose.ui.text.style.TextOverflow getOverflow();
+    method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+    method public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
+    method public boolean getSoftWrap();
+    method public androidx.compose.ui.text.TextStyle getStyle();
+    method public androidx.compose.ui.text.AnnotatedString getText();
+    property public final long constraints;
+    property public final androidx.compose.ui.unit.Density density;
+    property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public final int maxLines;
+    property public final androidx.compose.ui.text.style.TextOverflow overflow;
+    property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+    property public final androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader;
+    property public final boolean softWrap;
+    property public final androidx.compose.ui.text.TextStyle style;
+    property public final androidx.compose.ui.text.AnnotatedString text;
+  }
+
+  public final class TextLayoutResult {
+    method public androidx.compose.ui.text.TextLayoutResult copy-1moGK-E(optional androidx.compose.ui.text.TextLayoutInput layoutInput, optional long size);
+    method public operator boolean equals(Object? other);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+    method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+    method public boolean getDidOverflowHeight();
+    method public boolean getDidOverflowWidth();
+    method public float getFirstBaseline();
+    method public boolean getHasVisualOverflow();
+    method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+    method public float getLastBaseline();
+    method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+    method public int getLineForOffset(int offset);
+    method public int getLineForVerticalPosition(float vertical);
+    method public float getLineLeft(int lineIndex);
+    method public float getLineRight(int lineIndex);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public androidx.compose.ui.text.MultiParagraph getMultiParagraph();
+    method public int getOffsetForPosition-k-4lQ0M(long position);
+    method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+    method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+    method public long getSize-YbymL2g();
+    method public long getWordBoundary-d9O1mEE(int offset);
+    method public boolean isLineEllipsized(int lineIndex);
+    property public final boolean didOverflowHeight;
+    property public final boolean didOverflowWidth;
+    property public final float firstBaseline;
+    property public final boolean hasVisualOverflow;
+    property public final float lastBaseline;
+    property public final androidx.compose.ui.text.TextLayoutInput layoutInput;
+    property public final int lineCount;
+    property public final androidx.compose.ui.text.MultiParagraph multiParagraph;
+    property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+    property public final long size;
+  }
+
+  public final class TextLayoutResultKt {
+    method public static androidx.compose.ui.text.TextLayoutResult createTextLayoutResult-2H_Vf2E(optional androidx.compose.ui.text.TextLayoutInput layoutInput, optional androidx.compose.ui.text.MultiParagraph multiParagraph, optional long size);
+  }
+
+  public final class TextPainter {
+    method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+    field public static final androidx.compose.ui.text.TextPainter INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class TextRange {
+    ctor public TextRange();
+    method public static operator boolean contains-5zc-tL8(long $this, long other);
+    method public static operator boolean contains-impl(long $this, int offset);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static boolean getCollapsed-impl(long $this);
+    method public static int getEnd-impl(long $this);
+    method public static int getLength-impl(long $this);
+    method public static int getMax-impl(long $this);
+    method public static int getMin-impl(long $this);
+    method public static boolean getReversed-impl(long $this);
+    method public static int getStart-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static boolean intersects-5zc-tL8(long $this, long other);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.text.TextRange.Companion Companion;
+  }
+
+  public static final class TextRange.Companion {
+    method public long getZero-d9O1mEE();
+    property public final long Zero;
+  }
+
+  public final class TextRangeKt {
+    method public static long TextRange(int start, int end);
+    method public static long TextRange(int index);
+    method public static String substring-cWlJSyE(CharSequence, long range);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextStyle {
+    method public androidx.compose.ui.text.TextStyle copy-4skVB9c(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+    method public long getBackground-0d7_KjU();
+    method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift-5SSeXJ0();
+    method public long getColor-0d7_KjU();
+    method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize-XSAIIZE();
+    method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing-XSAIIZE();
+    method public long getLineHeight-XSAIIZE();
+    method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+    method public androidx.compose.ui.graphics.Shadow? getShadow();
+    method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+    method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(optional androidx.compose.ui.text.TextStyle? other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+    method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+    property public final long background;
+    property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+    property public final long color;
+    property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+    property public final String? fontFeatureSettings;
+    property public final long fontSize;
+    property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+    property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+    property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+    property public final long letterSpacing;
+    property public final long lineHeight;
+    property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+    property public final androidx.compose.ui.graphics.Shadow? shadow;
+    property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+    property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+    property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+    property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+    property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+    field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
+  }
+
+  public static final class TextStyle.Companion {
+    method public androidx.compose.ui.text.TextStyle getDefault();
+    property public final androidx.compose.ui.text.TextStyle Default;
+  }
+
+  public final class TextStyleKt {
+    method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+    method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.compose.ui.unit.LayoutDirection direction);
+  }
+
+  public abstract sealed class TtsAnnotation {
+  }
+
+  public final class VerbatimTtsAnnotation extends androidx.compose.ui.text.TtsAnnotation {
+    ctor public VerbatimTtsAnnotation(String verbatim);
+    method public String getVerbatim();
+    property public final String verbatim;
+  }
+
+}
+
+package androidx.compose.ui.text.android {
+
+  public final class LayoutCompatKt {
+  }
+
+  public final class LayoutHelperKt {
+  }
+
+  public final class LayoutIntrinsicsKt {
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+  public final class TextLayoutKt {
+  }
+
+}
+
+package androidx.compose.ui.text.android.style {
+
+  public final class PlaceholderSpanKt {
+  }
+
+}
+
+package androidx.compose.ui.text.font {
+
+  public final class AndroidTypeface_androidKt {
+    method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
+    method public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<? extends kotlin.Pair<androidx.compose.ui.text.font.FontWeight,? extends androidx.compose.ui.text.font.FontStyle>>? styles);
+    method public static androidx.compose.ui.text.font.Typeface Typeface(android.graphics.Typeface typeface);
+  }
+
+  public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+  }
+
+  @androidx.compose.runtime.Immutable public interface Font {
+    method public androidx.compose.ui.text.font.FontStyle getStyle();
+    method public androidx.compose.ui.text.font.FontWeight getWeight();
+    property public abstract androidx.compose.ui.text.font.FontStyle style;
+    property public abstract androidx.compose.ui.text.font.FontWeight weight;
+  }
+
+  public static interface Font.ResourceLoader {
+    method public Object load(androidx.compose.ui.text.font.Font font);
+  }
+
+  @androidx.compose.runtime.Immutable public abstract sealed class FontFamily {
+    method public final boolean getCanLoadSynchronously();
+    property public final boolean canLoadSynchronously;
+    field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
+  }
+
+  public static final class FontFamily.Companion {
+    method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+    method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+    method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+    method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+    method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+    property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+    property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+    property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+    property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+    property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
+  }
+
+  public final class FontFamilyKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Font... fonts);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
+  }
+
+  public final class FontKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional androidx.compose.ui.text.font.FontStyle style);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily toFontFamily(androidx.compose.ui.text.font.Font);
+  }
+
+  @androidx.compose.runtime.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+    method public boolean contains(androidx.compose.ui.text.font.Font element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public androidx.compose.ui.text.font.Font get(int index);
+    method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
+    method public int getSize();
+    method public int indexOf(androidx.compose.ui.text.font.Font element);
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.compose.ui.text.font.Font> iterator();
+    method public int lastIndexOf(androidx.compose.ui.text.font.Font element);
+    method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator();
+    method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator(int index);
+    method public java.util.List<androidx.compose.ui.text.font.Font> subList(int fromIndex, int toIndex);
+    property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
+  }
+
+  public enum FontStyle {
+    enum_constant public static final androidx.compose.ui.text.font.FontStyle Italic;
+    enum_constant public static final androidx.compose.ui.text.font.FontStyle Normal;
+  }
+
+  public enum FontSynthesis {
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis All;
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis None;
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Style;
+    enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Weight;
+  }
+
+  @androidx.compose.runtime.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
+    method public operator int compareTo(androidx.compose.ui.text.font.FontWeight other);
+    method public int getWeight();
+    property public final int weight;
+    field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
+  }
+
+  public static final class FontWeight.Companion {
+    method public androidx.compose.ui.text.font.FontWeight getBlack();
+    method public androidx.compose.ui.text.font.FontWeight getBold();
+    method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+    method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+    method public androidx.compose.ui.text.font.FontWeight getLight();
+    method public androidx.compose.ui.text.font.FontWeight getMedium();
+    method public androidx.compose.ui.text.font.FontWeight getNormal();
+    method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+    method public androidx.compose.ui.text.font.FontWeight getThin();
+    method public androidx.compose.ui.text.font.FontWeight getW100();
+    method public androidx.compose.ui.text.font.FontWeight getW200();
+    method public androidx.compose.ui.text.font.FontWeight getW300();
+    method public androidx.compose.ui.text.font.FontWeight getW400();
+    method public androidx.compose.ui.text.font.FontWeight getW500();
+    method public androidx.compose.ui.text.font.FontWeight getW600();
+    method public androidx.compose.ui.text.font.FontWeight getW700();
+    method public androidx.compose.ui.text.font.FontWeight getW800();
+    method public androidx.compose.ui.text.font.FontWeight getW900();
+    property public final androidx.compose.ui.text.font.FontWeight Black;
+    property public final androidx.compose.ui.text.font.FontWeight Bold;
+    property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+    property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+    property public final androidx.compose.ui.text.font.FontWeight Light;
+    property public final androidx.compose.ui.text.font.FontWeight Medium;
+    property public final androidx.compose.ui.text.font.FontWeight Normal;
+    property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+    property public final androidx.compose.ui.text.font.FontWeight Thin;
+    property public final androidx.compose.ui.text.font.FontWeight W100;
+    property public final androidx.compose.ui.text.font.FontWeight W200;
+    property public final androidx.compose.ui.text.font.FontWeight W300;
+    property public final androidx.compose.ui.text.font.FontWeight W400;
+    property public final androidx.compose.ui.text.font.FontWeight W500;
+    property public final androidx.compose.ui.text.font.FontWeight W600;
+    property public final androidx.compose.ui.text.font.FontWeight W700;
+    property public final androidx.compose.ui.text.font.FontWeight W800;
+    property public final androidx.compose.ui.text.font.FontWeight W900;
+  }
+
+  public final class FontWeightKt {
+    method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
+    method public String getName();
+    property public final String name;
+  }
+
+  public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+    method public androidx.compose.ui.text.font.Typeface getTypeface();
+    property public final androidx.compose.ui.text.font.Typeface typeface;
+  }
+
+  public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+    method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional androidx.compose.ui.text.font.FontStyle style);
+    method public int getResId();
+    method public androidx.compose.ui.text.font.FontStyle getStyle();
+    method public androidx.compose.ui.text.font.FontWeight getWeight();
+    property public final int resId;
+    property public androidx.compose.ui.text.font.FontStyle style;
+    property public androidx.compose.ui.text.font.FontWeight weight;
+  }
+
+  public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
+  }
+
+  public interface Typeface {
+    method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+    property public abstract androidx.compose.ui.text.font.FontFamily? fontFamily;
+  }
+
+}
+
+package androidx.compose.ui.text.input {
+
+  public final class BackspaceCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public BackspaceCommand();
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class CommitTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public CommitTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+    ctor public CommitTextCommand(String text, int newCursorPosition);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public int getNewCursorPosition();
+    method public String getText();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public final int newCursorPosition;
+    property public final String text;
+  }
+
+  public final class DeleteAllCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public DeleteAllCommand();
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class DeleteSurroundingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public DeleteSurroundingTextCommand(int lengthBeforeCursor, int lengthAfterCursor);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getLengthAfterCursor();
+    method public int getLengthBeforeCursor();
+    property public final int lengthAfterCursor;
+    property public final int lengthBeforeCursor;
+  }
+
+  public final class DeleteSurroundingTextInCodePointsCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public DeleteSurroundingTextInCodePointsCommand(int lengthBeforeCursor, int lengthAfterCursor);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getLengthAfterCursor();
+    method public int getLengthBeforeCursor();
+    property public final int lengthAfterCursor;
+    property public final int lengthBeforeCursor;
+  }
+
+  public interface EditCommand {
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class EditCommandKt {
+  }
+
+  public final class EditProcessor {
+    ctor public EditProcessor();
+    method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+    method public void reset(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.TextInputSession? textInputSession);
+    method public androidx.compose.ui.text.input.TextFieldValue toTextFieldValue();
+  }
+
+  public final class EditingBuffer {
+  }
+
+  public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public FinishComposingTextCommand();
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+  }
+
+  public final class GapBufferKt {
+  }
+
+  public enum ImeAction {
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Default;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Done;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Go;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Next;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction None;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Previous;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Search;
+    enum_constant public static final androidx.compose.ui.text.input.ImeAction Send;
+  }
+
+  @androidx.compose.runtime.Immutable public final class ImeOptions {
+    ctor public ImeOptions(optional boolean singleLine, optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public androidx.compose.ui.text.input.ImeOptions copy(optional boolean singleLine, optional androidx.compose.ui.text.input.KeyboardCapitalization capitalization, optional boolean autoCorrect, optional androidx.compose.ui.text.input.KeyboardType keyboardType, optional androidx.compose.ui.text.input.ImeAction imeAction);
+    method public boolean getAutoCorrect();
+    method public androidx.compose.ui.text.input.KeyboardCapitalization getCapitalization();
+    method public androidx.compose.ui.text.input.ImeAction getImeAction();
+    method public androidx.compose.ui.text.input.KeyboardType getKeyboardType();
+    method public boolean getSingleLine();
+    property public final boolean autoCorrect;
+    property public final androidx.compose.ui.text.input.KeyboardCapitalization capitalization;
+    property public final androidx.compose.ui.text.input.ImeAction imeAction;
+    property public final androidx.compose.ui.text.input.KeyboardType keyboardType;
+    property public final boolean singleLine;
+    field public static final androidx.compose.ui.text.input.ImeOptions.Companion Companion;
+  }
+
+  public static final class ImeOptions.Companion {
+    method public androidx.compose.ui.text.input.ImeOptions getDefault();
+    property public final androidx.compose.ui.text.input.ImeOptions Default;
+  }
+
+  public interface InputEventCallback {
+    method public void onEditCommands(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+    method public void onImeAction(androidx.compose.ui.text.input.ImeAction imeAction);
+  }
+
+  public enum KeyboardCapitalization {
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization Characters;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization None;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization Sentences;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardCapitalization Words;
+  }
+
+  public enum KeyboardType {
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Ascii;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Email;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Number;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType NumberPassword;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Password;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Phone;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Text;
+    enum_constant public static final androidx.compose.ui.text.input.KeyboardType Uri;
+  }
+
+  public final class MoveCursorCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public MoveCursorCommand(int amount);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getAmount();
+    property public final int amount;
+  }
+
+  public interface OffsetMapping {
+    method public int originalToTransformed(int offset);
+    method public int transformedToOriginal(int offset);
+    field public static final androidx.compose.ui.text.input.OffsetMapping.Companion Companion;
+  }
+
+  public static final class OffsetMapping.Companion {
+    method public androidx.compose.ui.text.input.OffsetMapping getIdentity();
+    property public final androidx.compose.ui.text.input.OffsetMapping Identity;
+  }
+
+  public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+    ctor public PasswordVisualTransformation(optional char mask);
+    method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+    method public char getMask();
+    property public final char mask;
+  }
+
+  public interface PlatformTextInputService {
+    method public void hideSoftwareKeyboard();
+    method public void notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+    method public void showSoftwareKeyboard();
+    method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput();
+    method public void updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+  }
+
+  public final class SetComposingRegionCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public SetComposingRegionCommand(int start, int end);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getEnd();
+    method public int getStart();
+    property public final int end;
+    property public final int start;
+  }
+
+  public final class SetComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public SetComposingTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+    ctor public SetComposingTextCommand(String text, int newCursorPosition);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public int getNewCursorPosition();
+    method public String getText();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public final int newCursorPosition;
+    property public final String text;
+  }
+
+  public final class SetSelectionCommand implements androidx.compose.ui.text.input.EditCommand {
+    ctor public SetSelectionCommand(int start, int end);
+    method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+    method public int getEnd();
+    method public int getStart();
+    property public final int end;
+    property public final int start;
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextFieldValue {
+    method public androidx.compose.ui.text.input.TextFieldValue copy-Dr2r1M0(String text, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+    method public androidx.compose.ui.text.input.TextFieldValue copy-ec4yWi8(optional androidx.compose.ui.text.AnnotatedString annotatedString, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+    method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+    method public androidx.compose.ui.text.TextRange? getComposition-MzsxiRA();
+    method public long getSelection-d9O1mEE();
+    method public String getText();
+    property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+    property public final androidx.compose.ui.text.TextRange? composition;
+    property public final long selection;
+    property public final String text;
+    field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+  }
+
+  public static final class TextFieldValue.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+  }
+
+  public final class TextFieldValueKt {
+    method public static androidx.compose.ui.text.AnnotatedString getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+    method public static androidx.compose.ui.text.AnnotatedString getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+    method public static androidx.compose.ui.text.AnnotatedString getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+  }
+
+  public class TextInputService {
+    ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+    method public final void hideSoftwareKeyboard();
+    method public final void showSoftwareKeyboard();
+    method public androidx.compose.ui.text.input.TextInputSession startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput(androidx.compose.ui.text.input.TextInputSession session);
+  }
+
+  public final class TextInputSession {
+    ctor public TextInputSession(androidx.compose.ui.text.input.TextInputService textInputService, androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+    method public void dispose();
+    method public boolean hideSoftwareKeyboard();
+    method public boolean isOpen();
+    method public boolean notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+    method public boolean showSoftwareKeyboard();
+    method public boolean updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+    property public final boolean isOpen;
+  }
+
+  public final class TransformedText {
+    ctor public TransformedText(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.input.OffsetMapping offsetMapping);
+    method public androidx.compose.ui.text.input.OffsetMapping getOffsetMapping();
+    method public androidx.compose.ui.text.AnnotatedString getText();
+    property public final androidx.compose.ui.text.input.OffsetMapping offsetMapping;
+    property public final androidx.compose.ui.text.AnnotatedString text;
+  }
+
+  @androidx.compose.runtime.Immutable public fun interface VisualTransformation {
+    method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+    field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+  }
+
+  public static final class VisualTransformation.Companion {
+    method public androidx.compose.ui.text.input.VisualTransformation getNone();
+    property public final androidx.compose.ui.text.input.VisualTransformation None;
+  }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+  public final class AndroidPlatformLocale_androidKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class Locale {
+    ctor public Locale(String languageTag);
+    method public String getLanguage();
+    method public String getRegion();
+    method public String getScript();
+    method public String toLanguageTag();
+    property public final String language;
+    property public final String region;
+    property public final String script;
+    field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+  }
+
+  public static final class Locale.Companion {
+    method public androidx.compose.ui.text.intl.Locale getCurrent();
+    property public final androidx.compose.ui.text.intl.Locale current;
+  }
+
+  @androidx.compose.runtime.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+    ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+    ctor public LocaleList(String languageTags);
+    ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+    method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public operator androidx.compose.ui.text.intl.Locale get(int i);
+    method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+    method public int getSize();
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+    property public final java.util.List<androidx.compose.ui.text.intl.Locale> localeList;
+    property public int size;
+    field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+  }
+
+  public static final class LocaleList.Companion {
+    method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+    property public final androidx.compose.ui.text.intl.LocaleList current;
+  }
+
+  public final class PlatformLocaleKt {
+  }
+
+}
+
+package androidx.compose.ui.text.platform {
+
+  public final class AndroidAccessibilitySpannableString_androidKt {
+  }
+
+  public final class AndroidParagraphHelper_androidKt {
+  }
+
+  public final class AndroidParagraphIntrinsics_androidKt {
+  }
+
+  public final class AndroidParagraph_androidKt {
+  }
+
+  public final class AndroidStringDelegate_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.text.platform.extensions {
+
+  public final class LocaleExtensions_androidKt {
+  }
+
+  public final class PlaceholderExtensions_androidKt {
+  }
+
+  public final class SpannableExtensions_androidKt {
+  }
+
+  public final class TextPaintExtensions_androidKt {
+  }
+
+  public final class TtsAnnotationExtensions_androidKt {
+    method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
+    method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
+  }
+
+}
+
+package androidx.compose.ui.text.style {
+
+  @androidx.compose.runtime.Immutable public final inline class BaselineShift {
+    ctor public BaselineShift();
+    method public static float constructor-impl(float multiplier);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getMultiplier();
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(float p);
+    method @androidx.compose.runtime.Immutable public static inline String! toString-impl(float p);
+    property public final float multiplier;
+    field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
+  }
+
+  public static final class BaselineShift.Companion {
+    method public float getNone-y9eOQZs();
+    method public float getSubscript-y9eOQZs();
+    method public float getSuperscript-y9eOQZs();
+    property public final float None;
+    property public final float Subscript;
+    property public final float Superscript;
+  }
+
+  public final class BaselineShiftKt {
+    method @androidx.compose.runtime.Stable public static float lerp-ylBt8J4(float start, float stop, float fraction);
+  }
+
+  public enum ResolvedTextDirection {
+    enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+    enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
+  }
+
+  public enum TextAlign {
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Center;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign End;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Justify;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Left;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Right;
+    enum_constant public static final androidx.compose.ui.text.style.TextAlign Start;
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextDecoration {
+    method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+    method public operator boolean equals(Object? other);
+    method public int getMask();
+    method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+    property public final int mask;
+    field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
+  }
+
+  public static final class TextDecoration.Companion {
+    method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+    method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+    method public androidx.compose.ui.text.style.TextDecoration getNone();
+    method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+    property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+    property public final androidx.compose.ui.text.style.TextDecoration None;
+    property public final androidx.compose.ui.text.style.TextDecoration Underline;
+  }
+
+  public enum TextDirection {
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection Content;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrLtr;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrRtl;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection Ltr;
+    enum_constant public static final androidx.compose.ui.text.style.TextDirection Rtl;
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
+    ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
+    method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
+    method public operator boolean equals(Object? other);
+    method public float getScaleX();
+    method public float getSkewX();
+    property public final float scaleX;
+    property public final float skewX;
+    field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
+  }
+
+  public static final class TextGeometricTransform.Companion {
+  }
+
+  public final class TextGeometricTransformKt {
+    method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final class TextIndent {
+    method public androidx.compose.ui.text.style.TextIndent copy-8E83U4Q(optional long firstLine, optional long restLine);
+    method public operator boolean equals(Object? other);
+    method public long getFirstLine-XSAIIZE();
+    method public long getRestLine-XSAIIZE();
+    property public final long firstLine;
+    property public final long restLine;
+    field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
+  }
+
+  public static final class TextIndent.Companion {
+    method public androidx.compose.ui.text.style.TextIndent getNone();
+    property public final androidx.compose.ui.text.style.TextIndent None;
+  }
+
+  public final class TextIndentKt {
+    method public static androidx.compose.ui.text.style.TextIndent lerp(androidx.compose.ui.text.style.TextIndent start, androidx.compose.ui.text.style.TextIndent stop, float fraction);
+  }
+
+  public enum TextOverflow {
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Visible;
+  }
+
+}
+

compose/ui/ui-text/api/restricted_current.txt

diff --git a/compose/ui/ui-text/api/restricted_current.txt b/compose/ui/ui-text/api/restricted_current.txt
index 255fb72..6c4d62d 100644
--- a/compose/ui/ui-text/api/restricted_current.txt
+++ b/compose/ui/ui-text/api/restricted_current.txt
@@ -1104,6 +1104,7 @@
   public enum TextOverflow {
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
+    enum_constant public static final androidx.compose.ui.text.style.TextOverflow Visible;
   }
 
 }

compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/TextOverflowSamples.kt

diff --git a/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/TextOverflowSamples.kt b/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/TextOverflowSamples.kt
new file mode 100644
index 0000000..da91000
--- /dev/null
+++ b/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/TextOverflowSamples.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.text.samples
+
+import androidx.annotation.Sampled
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@Sampled
+@Composable
+fun TextOverflowClipSample() {
+    Text(
+        text = "Hello ".repeat(2),
+        modifier = Modifier.size(100.dp, 70.dp).background(Color.Cyan),
+        fontSize = 35.sp,
+        overflow = TextOverflow.Clip
+    )
+}
+
+@Sampled
+@Composable
+fun TextOverflowEllipsisSample() {
+    Text(
+        text = "Hello ".repeat(2),
+        modifier = Modifier.width(100.dp).background(Color.Cyan),
+        fontSize = 35.sp,
+        overflow = TextOverflow.Ellipsis,
+        maxLines = 1
+    )
+}
+
+@Sampled
+@Composable
+fun TextOverflowVisibleFixedSizeSample() {
+    val background = remember { mutableStateOf(Color.Cyan) }
+    Box(modifier = Modifier.size(100.dp, 100.dp)) {
+        Text(
+            text = "Hello ".repeat(2),
+            modifier = Modifier.size(100.dp, 70.dp)
+                .background(background.value)
+                .clickable {
+                    background.value = if (background.value == Color.Cyan) {
+                        Color.Gray
+                    } else {
+                        Color.Cyan
+                    }
+                },
+            fontSize = 35.sp,
+            overflow = TextOverflow.Visible
+        )
+    }
+}
+
+@Sampled
+@Composable
+fun TextOverflowVisibleMinHeightSample() {
+    val background = remember { mutableStateOf(Color.Cyan) }
+    val count = remember { mutableStateOf(1) }
+    Box(modifier = Modifier.size(100.dp, 100.dp)) {
+        Text(
+            text = "Hello".repeat(count.value),
+            modifier = Modifier.width(100.dp).heightIn(min = 70.dp)
+                .background(background.value)
+                .clickable {
+                    background.value =
+                        if (background.value == Color.Cyan) Color.Gray else Color.Cyan
+                    count.value = if (count.value == 1) 2 else 1
+                },
+            fontSize = 35.sp,
+            overflow = TextOverflow.Visible
+        )
+    }
+}

compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/font/FontFamily.kt

diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/font/FontFamily.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/font/FontFamily.kt
index 80ae2fc..e11d9cb 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/font/FontFamily.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/font/FontFamily.kt
@@ -39,7 +39,7 @@
          *
          * @sample androidx.compose.ui.text.samples.FontFamilySansSerifSample
          *
-         * @see [CSS sans-serif](https://www.w3.org/TR/css-fonts-3/#sans-serif)
+         * See [CSS sans-serif](https://www.w3.org/TR/css-fonts-3/#sans-serif)
          */
         val SansSerif = GenericFontFamily("sans-serif")
 
@@ -48,7 +48,7 @@
          *
          * @sample androidx.compose.ui.text.samples.FontFamilySerifSample
          *
-         * @see [CSS serif](https://www.w3.org/TR/css-fonts-3/#serif)
+         * See [CSS serif](https://www.w3.org/TR/css-fonts-3/#serif)
          */
         val Serif = GenericFontFamily("serif")
 
@@ -57,7 +57,7 @@
          *
          * @sample androidx.compose.ui.text.samples.FontFamilyMonospaceSample
          *
-         * @see [CSS monospace](https://www.w3.org/TR/css-fonts-3/#monospace)
+         * See [CSS monospace](https://www.w3.org/TR/css-fonts-3/#monospace)
          */
         val Monospace = GenericFontFamily("monospace")
 
@@ -69,7 +69,7 @@
          *
          * @sample androidx.compose.ui.text.samples.FontFamilyCursiveSample
          *
-         * @see [CSS cursive](https://www.w3.org/TR/css-fonts-3/#cursive)
+         * See [CSS cursive](https://www.w3.org/TR/css-fonts-3/#cursive)
          */
         val Cursive = GenericFontFamily("cursive")
     }

compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/input/TextInputService.kt

diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/input/TextInputService.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/input/TextInputService.kt
index 6924d17..e145592 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/input/TextInputService.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/input/TextInputService.kt
@@ -87,6 +87,7 @@
      * There is no guarantee that the keyboard will be shown. The software keyboard or
      * system service may silently ignore this request.
      */
+    // TODO(b/183448615) @InternalTextApi
     fun showSoftwareKeyboard() {
         if (_currentInputSession.get() != null) {
             platformTextInputService.showSoftwareKeyboard()
@@ -96,6 +97,7 @@
     /**
      * Hide onscreen keyboard.
      */
+    // TODO(b/183448615) @InternalTextApi
     fun hideSoftwareKeyboard(): Unit = platformTextInputService.hideSoftwareKeyboard()
 }
 /**
@@ -194,7 +196,7 @@
      * @return false if this session expired and no action was performed
      */
     fun showSoftwareKeyboard(): Boolean = ensureOpenSession {
-        textInputService.showSoftwareKeyboard()
+        platformTextInputService.showSoftwareKeyboard()
     }
 
     /**
@@ -209,7 +211,7 @@
      * @return false if this session expired and no action was performed
      */
     fun hideSoftwareKeyboard(): Boolean = ensureOpenSession {
-        textInputService.hideSoftwareKeyboard()
+        platformTextInputService.hideSoftwareKeyboard()
     }
 }
 

compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextOverflow.kt

diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextOverflow.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextOverflow.kt
index 8061c84..da92b2d 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextOverflow.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextOverflow.kt
@@ -18,9 +18,36 @@
 
 /** How overflowing text should be handled. */
 enum class TextOverflow {
-    /** Clip the overflowing text to fix its container. */
+    /**
+     * Clip the overflowing text to fix its container.
+     * @sample androidx.compose.ui.text.samples.TextOverflowClipSample
+     */
     Clip,
 
-    /** Use an ellipsis to indicate that the text has overflowed. */
+    /**
+     * Use an ellipsis to indicate that the text has overflowed.
+     * @sample androidx.compose.ui.text.samples.TextOverflowEllipsisSample
+     */
     Ellipsis,
+
+    /**
+     * Display all text, even if there is not enough space in the specified bounds.
+     * When overflow is visible, text may be rendered outside the bounds of the composable
+     * displaying the text. This ensures that all text is displayed to the user, and is typically
+     * the right choice for most text display. It does mean that the text may visually occupy a
+     * region larger than the bounds of it's composable. This can lead to situations where text
+     * displays outside the bounds of the background and clickable on a Text composable with a
+     * fixed height and width.
+     *
+     * @sample androidx.compose.ui.text.samples.TextOverflowVisibleFixedSizeSample
+     *
+     * To make the background and click region expand to match the size of the text, allow it to
+     * expand vertically/horizontally using `Modifier.heightIn`/`Modifier.widthIn` or similar.
+     *
+     * @sample androidx.compose.ui.text.samples.TextOverflowVisibleMinHeightSample
+     *
+     * Note: text that expands past its bounds using `Visible` may be clipped by other modifiers
+     * such as `Modifier.clipToBounds`.
+     */
+    Visible
 }
\ No newline at end of file

compose/ui/ui-tooling-data/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-tooling-data/api/1.0.0-beta04.txt b/compose/ui/ui-tooling-data/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..ab1e1a2
--- /dev/null
+++ b/compose/ui/ui-tooling-data/api/1.0.0-beta04.txt
@@ -0,0 +1,8 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling.data {
+
+  public final class SlotTreeKt {
+  }
+
+}
+

compose/ui/ui-tooling-data/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-tooling-data/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-tooling-data/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..14c7473
--- /dev/null
+++ b/compose/ui/ui-tooling-data/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,101 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling.data {
+
+  @androidx.compose.ui.tooling.data.UiToolingDataApi public final class CallGroup extends androidx.compose.ui.tooling.data.Group {
+    ctor public CallGroup(Object? key, String? name, androidx.compose.ui.unit.IntRect box, androidx.compose.ui.tooling.data.SourceLocation? location, java.util.List<androidx.compose.ui.tooling.data.ParameterInformation> parameters, java.util.Collection<?> data, java.util.Collection<? extends androidx.compose.ui.tooling.data.Group> children);
+    property public java.util.List<androidx.compose.ui.tooling.data.ParameterInformation> parameters;
+  }
+
+  @androidx.compose.ui.tooling.data.UiToolingDataApi public abstract sealed class Group {
+    method public final androidx.compose.ui.unit.IntRect getBox();
+    method public final java.util.Collection<androidx.compose.ui.tooling.data.Group> getChildren();
+    method public final java.util.Collection<java.lang.Object> getData();
+    method public final Object? getKey();
+    method public final androidx.compose.ui.tooling.data.SourceLocation? getLocation();
+    method public java.util.List<androidx.compose.ui.layout.ModifierInfo> getModifierInfo();
+    method public final String? getName();
+    method public java.util.List<androidx.compose.ui.tooling.data.ParameterInformation> getParameters();
+    property public final androidx.compose.ui.unit.IntRect box;
+    property public final java.util.Collection<androidx.compose.ui.tooling.data.Group> children;
+    property public final java.util.Collection<java.lang.Object> data;
+    property public final Object? key;
+    property public final androidx.compose.ui.tooling.data.SourceLocation? location;
+    property public java.util.List<androidx.compose.ui.layout.ModifierInfo> modifierInfo;
+    property public final String? name;
+    property public java.util.List<androidx.compose.ui.tooling.data.ParameterInformation> parameters;
+  }
+
+  @androidx.compose.ui.tooling.data.UiToolingDataApi public final class JoinedKey {
+    ctor public JoinedKey(Object? left, Object? right);
+    method public Object? component1();
+    method public Object? component2();
+    method @androidx.compose.ui.tooling.data.UiToolingDataApi public androidx.compose.ui.tooling.data.JoinedKey copy(Object? left, Object? right);
+    method public Object? getLeft();
+    method public Object? getRight();
+    property public final Object? left;
+    property public final Object? right;
+  }
+
+  @androidx.compose.ui.tooling.data.UiToolingDataApi public final class NodeGroup extends androidx.compose.ui.tooling.data.Group {
+    ctor public NodeGroup(Object? key, Object node, androidx.compose.ui.unit.IntRect box, java.util.Collection<?> data, java.util.List<androidx.compose.ui.layout.ModifierInfo> modifierInfo, java.util.Collection<? extends androidx.compose.ui.tooling.data.Group> children);
+    method public Object getNode();
+    property public java.util.List<androidx.compose.ui.layout.ModifierInfo> modifierInfo;
+    property public final Object node;
+  }
+
+  @androidx.compose.ui.tooling.data.UiToolingDataApi public final class ParameterInformation {
+    ctor public ParameterInformation(String name, Object? value, boolean fromDefault, boolean p, boolean compared, String? inlineClass, boolean stable);
+    method public String component1();
+    method public Object? component2();
+    method public boolean component3();
+    method public boolean component4();
+    method public boolean component5();
+    method public String? component6();
+    method public boolean component7();
+    method @androidx.compose.ui.tooling.data.UiToolingDataApi public androidx.compose.ui.tooling.data.ParameterInformation copy(String name, Object? value, boolean fromDefault, boolean p, boolean compared, String? inlineClass, boolean stable);
+    method public boolean getCompared();
+    method public boolean getFromDefault();
+    method public String? getInlineClass();
+    method public String getName();
+    method public boolean getStable();
+    method public boolean getStatic();
+    method public Object? getValue();
+    property public final boolean compared;
+    property public final boolean fromDefault;
+    property public final String? inlineClass;
+    property public final String name;
+    property public final boolean stable;
+    property public final boolean static;
+    property public final Object? value;
+  }
+
+  public final class SlotTreeKt {
+    method @androidx.compose.ui.tooling.data.UiToolingDataApi public static androidx.compose.ui.tooling.data.Group asTree(androidx.compose.runtime.tooling.CompositionData);
+    method @androidx.compose.ui.tooling.data.UiToolingDataApi public static String? getPosition(androidx.compose.ui.tooling.data.Group);
+  }
+
+  @androidx.compose.ui.tooling.data.UiToolingDataApi public final class SourceLocation {
+    ctor public SourceLocation(int lineNumber, int offset, int length, String? sourceFile, int packageHash);
+    method public int component1();
+    method public int component2();
+    method public int component3();
+    method public String? component4();
+    method public int component5();
+    method @androidx.compose.ui.tooling.data.UiToolingDataApi public androidx.compose.ui.tooling.data.SourceLocation copy(int lineNumber, int offset, int length, String? sourceFile, int packageHash);
+    method public int getLength();
+    method public int getLineNumber();
+    method public int getOffset();
+    method public int getPackageHash();
+    method public String? getSourceFile();
+    property public final int length;
+    property public final int lineNumber;
+    property public final int offset;
+    property public final int packageHash;
+    property public final String? sourceFile;
+  }
+
+  @kotlin.RequiresOptIn(message="This API is for tooling only and is likely to change in the future.") public @interface UiToolingDataApi {
+  }
+
+}
+

compose/ui/ui-tooling-data/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-tooling-data/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-tooling-data/api/res-1.0.0-beta04.txt

compose/ui/ui-tooling-data/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-tooling-data/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-tooling-data/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..ab1e1a2
--- /dev/null
+++ b/compose/ui/ui-tooling-data/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,8 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling.data {
+
+  public final class SlotTreeKt {
+  }
+
+}
+

compose/ui/ui-tooling/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-tooling/api/1.0.0-beta04.txt b/compose/ui/ui-tooling/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..e392e95
--- /dev/null
+++ b/compose/ui/ui-tooling/api/1.0.0-beta04.txt
@@ -0,0 +1,202 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling {
+
+  public final class InspectableKt {
+    method @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+}
+
+package androidx.compose.ui.tooling.inspector {
+
+  public final class InspectorNode {
+    method public int[] getBounds();
+    method public java.util.List<androidx.compose.ui.tooling.inspector.InspectorNode> getChildren();
+    method public String getFileName();
+    method public int getHeight();
+    method public long getId();
+    method public int getLeft();
+    method public int getLength();
+    method public int getLineNumber();
+    method public String getName();
+    method public int getOffset();
+    method public int getPackageHash();
+    method public java.util.List<androidx.compose.ui.tooling.inspector.RawParameter> getParameters();
+    method public int getTop();
+    method public int getWidth();
+    property public final int[] bounds;
+    property public final java.util.List<androidx.compose.ui.tooling.inspector.InspectorNode> children;
+    property public final String fileName;
+    property public final int height;
+    property public final long id;
+    property public final int left;
+    property public final int length;
+    property public final int lineNumber;
+    property public final String name;
+    property public final int offset;
+    property public final int packageHash;
+    property public final java.util.List<androidx.compose.ui.tooling.inspector.RawParameter> parameters;
+    property public final int top;
+    property public final int width;
+  }
+
+  public final class InspectorNodeKt {
+  }
+
+  public final class LayoutInspectorTree {
+    ctor public LayoutInspectorTree();
+    method public java.util.List<androidx.compose.ui.tooling.inspector.InspectorNode> convert(android.view.View view);
+    method public java.util.List<androidx.compose.ui.tooling.inspector.NodeParameter> convertParameters(androidx.compose.ui.tooling.inspector.InspectorNode node);
+    method public boolean getHideSystemNodes();
+    method public void resetGeneratedId();
+    method public void setHideSystemNodes(boolean p);
+    property public final boolean hideSystemNodes;
+  }
+
+  public final class LayoutInspectorTreeKt {
+  }
+
+  public final class NodeParameter {
+    method public java.util.List<androidx.compose.ui.tooling.inspector.NodeParameter> getElements();
+    method public String getName();
+    method public androidx.compose.ui.tooling.inspector.ParameterType getType();
+    method public Object? getValue();
+    property public final java.util.List<androidx.compose.ui.tooling.inspector.NodeParameter> elements;
+    property public final String name;
+    property public final androidx.compose.ui.tooling.inspector.ParameterType type;
+    property public final Object? value;
+  }
+
+  public final class ParameterFactoryKt {
+  }
+
+  public enum ParameterType {
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Boolean;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Color;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType DimensionDp;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType DimensionEm;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType DimensionSp;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Double;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Float;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType FunctionReference;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Int32;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Int64;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Lambda;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Resource;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType String;
+  }
+
+  public final class RawParameter {
+    ctor public RawParameter(String name, Object? value);
+    method public String getName();
+    method public Object? getValue();
+    property public final String name;
+    property public final Object? value;
+  }
+
+}
+
+package androidx.compose.ui.tooling.preview {
+
+  public final class ComposeViewAdapterKt {
+    field public static final String TOOLS_NS_URI = "http://schemas.android.com/tools";
+  }
+
+  public final class Devices {
+    field public static final String AUTOMOTIVE_1024p = "id:automotive_1024p_landscape";
+    field public static final String DEFAULT = "";
+    field public static final androidx.compose.ui.tooling.preview.Devices INSTANCE;
+    field public static final String NEXUS_10 = "name:Nexus 10";
+    field public static final String NEXUS_5 = "id:Nexus 5";
+    field public static final String NEXUS_5X = "id:Nexus 5X";
+    field public static final String NEXUS_6 = "id:Nexus 6";
+    field public static final String NEXUS_6P = "id:Nexus 6P";
+    field public static final String NEXUS_7 = "id:Nexus 7";
+    field public static final String NEXUS_7_2013 = "id:Nexus 7 2013";
+    field public static final String NEXUS_9 = "id:Nexus 9";
+    field public static final String PIXEL = "id:pixel";
+    field public static final String PIXEL_2 = "id:pixel_2";
+    field public static final String PIXEL_2_XL = "id:pixel_2_xl";
+    field public static final String PIXEL_3 = "id:pixel_3";
+    field public static final String PIXEL_3A = "id:pixel_3a";
+    field public static final String PIXEL_3A_XL = "id:pixel_3a_xl";
+    field public static final String PIXEL_3_XL = "id:pixel_3_xl";
+    field public static final String PIXEL_4 = "id:pixel_4";
+    field public static final String PIXEL_4_XL = "id:pixel_4_xl";
+    field public static final String PIXEL_C = "id:pixel_c";
+    field public static final String PIXEL_XL = "id:pixel_xl";
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Preview {
+    method public abstract int apiLevel() default -1;
+    method public abstract long backgroundColor() default 0L;
+    method public abstract String device() default "";
+    method public abstract float fontScale() default 1.0f;
+    method public abstract String group() default "";
+    method public abstract int heightDp() default -1;
+    method public abstract String locale() default "";
+    method public abstract String name() default "";
+    method public abstract boolean showBackground() default false;
+    method public abstract boolean showSystemUi() default false;
+    method public abstract int uiMode() default 0;
+    method public abstract int widthDp() default -1;
+    property public abstract int apiLevel;
+    property public abstract long backgroundColor;
+    property public abstract String device;
+    property public abstract float fontScale;
+    property public abstract String group;
+    property public abstract int heightDp;
+    property public abstract String locale;
+    property public abstract String name;
+    property public abstract boolean showBackground;
+    property public abstract boolean showSystemUi;
+    property public abstract int uiMode;
+    property public abstract int widthDp;
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) public @interface PreviewParameter {
+    method public abstract int limit() default 2147483647;
+    method public abstract Class<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider();
+    property public abstract int limit;
+    property public abstract Class<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider;
+  }
+
+  public interface PreviewParameterProvider<T> {
+    method public default int getCount();
+    method public kotlin.sequences.Sequence<T> getValues();
+    property public default int count;
+    property public abstract kotlin.sequences.Sequence<T> values;
+  }
+
+  public final class PreviewUtilsKt {
+  }
+
+}
+
+package androidx.compose.ui.tooling.preview.animation {
+
+  public final class ComposeAnimationParserKt {
+  }
+
+}
+
+package androidx.compose.ui.tooling.preview.datasource {
+
+  public class CollectionPreviewParameterProvider<T> implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<T> {
+    ctor public CollectionPreviewParameterProvider(java.util.Collection<? extends T> collection);
+    method public kotlin.sequences.Sequence<T> getValues();
+    property public kotlin.sequences.Sequence<T> values;
+  }
+
+  public final class LoremIpsum implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<java.lang.String> {
+    ctor public LoremIpsum(int words);
+    ctor public LoremIpsum();
+    method public kotlin.sequences.Sequence<java.lang.String> getValues();
+    property public kotlin.sequences.Sequence<java.lang.String> values;
+  }
+
+  public final class LoremIpsumKt {
+  }
+
+}
+

compose/ui/ui-tooling/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-tooling/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-tooling/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..e392e95
--- /dev/null
+++ b/compose/ui/ui-tooling/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,202 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling {
+
+  public final class InspectableKt {
+    method @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+}
+
+package androidx.compose.ui.tooling.inspector {
+
+  public final class InspectorNode {
+    method public int[] getBounds();
+    method public java.util.List<androidx.compose.ui.tooling.inspector.InspectorNode> getChildren();
+    method public String getFileName();
+    method public int getHeight();
+    method public long getId();
+    method public int getLeft();
+    method public int getLength();
+    method public int getLineNumber();
+    method public String getName();
+    method public int getOffset();
+    method public int getPackageHash();
+    method public java.util.List<androidx.compose.ui.tooling.inspector.RawParameter> getParameters();
+    method public int getTop();
+    method public int getWidth();
+    property public final int[] bounds;
+    property public final java.util.List<androidx.compose.ui.tooling.inspector.InspectorNode> children;
+    property public final String fileName;
+    property public final int height;
+    property public final long id;
+    property public final int left;
+    property public final int length;
+    property public final int lineNumber;
+    property public final String name;
+    property public final int offset;
+    property public final int packageHash;
+    property public final java.util.List<androidx.compose.ui.tooling.inspector.RawParameter> parameters;
+    property public final int top;
+    property public final int width;
+  }
+
+  public final class InspectorNodeKt {
+  }
+
+  public final class LayoutInspectorTree {
+    ctor public LayoutInspectorTree();
+    method public java.util.List<androidx.compose.ui.tooling.inspector.InspectorNode> convert(android.view.View view);
+    method public java.util.List<androidx.compose.ui.tooling.inspector.NodeParameter> convertParameters(androidx.compose.ui.tooling.inspector.InspectorNode node);
+    method public boolean getHideSystemNodes();
+    method public void resetGeneratedId();
+    method public void setHideSystemNodes(boolean p);
+    property public final boolean hideSystemNodes;
+  }
+
+  public final class LayoutInspectorTreeKt {
+  }
+
+  public final class NodeParameter {
+    method public java.util.List<androidx.compose.ui.tooling.inspector.NodeParameter> getElements();
+    method public String getName();
+    method public androidx.compose.ui.tooling.inspector.ParameterType getType();
+    method public Object? getValue();
+    property public final java.util.List<androidx.compose.ui.tooling.inspector.NodeParameter> elements;
+    property public final String name;
+    property public final androidx.compose.ui.tooling.inspector.ParameterType type;
+    property public final Object? value;
+  }
+
+  public final class ParameterFactoryKt {
+  }
+
+  public enum ParameterType {
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Boolean;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Color;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType DimensionDp;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType DimensionEm;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType DimensionSp;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Double;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Float;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType FunctionReference;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Int32;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Int64;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Lambda;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Resource;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType String;
+  }
+
+  public final class RawParameter {
+    ctor public RawParameter(String name, Object? value);
+    method public String getName();
+    method public Object? getValue();
+    property public final String name;
+    property public final Object? value;
+  }
+
+}
+
+package androidx.compose.ui.tooling.preview {
+
+  public final class ComposeViewAdapterKt {
+    field public static final String TOOLS_NS_URI = "http://schemas.android.com/tools";
+  }
+
+  public final class Devices {
+    field public static final String AUTOMOTIVE_1024p = "id:automotive_1024p_landscape";
+    field public static final String DEFAULT = "";
+    field public static final androidx.compose.ui.tooling.preview.Devices INSTANCE;
+    field public static final String NEXUS_10 = "name:Nexus 10";
+    field public static final String NEXUS_5 = "id:Nexus 5";
+    field public static final String NEXUS_5X = "id:Nexus 5X";
+    field public static final String NEXUS_6 = "id:Nexus 6";
+    field public static final String NEXUS_6P = "id:Nexus 6P";
+    field public static final String NEXUS_7 = "id:Nexus 7";
+    field public static final String NEXUS_7_2013 = "id:Nexus 7 2013";
+    field public static final String NEXUS_9 = "id:Nexus 9";
+    field public static final String PIXEL = "id:pixel";
+    field public static final String PIXEL_2 = "id:pixel_2";
+    field public static final String PIXEL_2_XL = "id:pixel_2_xl";
+    field public static final String PIXEL_3 = "id:pixel_3";
+    field public static final String PIXEL_3A = "id:pixel_3a";
+    field public static final String PIXEL_3A_XL = "id:pixel_3a_xl";
+    field public static final String PIXEL_3_XL = "id:pixel_3_xl";
+    field public static final String PIXEL_4 = "id:pixel_4";
+    field public static final String PIXEL_4_XL = "id:pixel_4_xl";
+    field public static final String PIXEL_C = "id:pixel_c";
+    field public static final String PIXEL_XL = "id:pixel_xl";
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Preview {
+    method public abstract int apiLevel() default -1;
+    method public abstract long backgroundColor() default 0L;
+    method public abstract String device() default "";
+    method public abstract float fontScale() default 1.0f;
+    method public abstract String group() default "";
+    method public abstract int heightDp() default -1;
+    method public abstract String locale() default "";
+    method public abstract String name() default "";
+    method public abstract boolean showBackground() default false;
+    method public abstract boolean showSystemUi() default false;
+    method public abstract int uiMode() default 0;
+    method public abstract int widthDp() default -1;
+    property public abstract int apiLevel;
+    property public abstract long backgroundColor;
+    property public abstract String device;
+    property public abstract float fontScale;
+    property public abstract String group;
+    property public abstract int heightDp;
+    property public abstract String locale;
+    property public abstract String name;
+    property public abstract boolean showBackground;
+    property public abstract boolean showSystemUi;
+    property public abstract int uiMode;
+    property public abstract int widthDp;
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) public @interface PreviewParameter {
+    method public abstract int limit() default 2147483647;
+    method public abstract Class<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider();
+    property public abstract int limit;
+    property public abstract Class<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider;
+  }
+
+  public interface PreviewParameterProvider<T> {
+    method public default int getCount();
+    method public kotlin.sequences.Sequence<T> getValues();
+    property public default int count;
+    property public abstract kotlin.sequences.Sequence<T> values;
+  }
+
+  public final class PreviewUtilsKt {
+  }
+
+}
+
+package androidx.compose.ui.tooling.preview.animation {
+
+  public final class ComposeAnimationParserKt {
+  }
+
+}
+
+package androidx.compose.ui.tooling.preview.datasource {
+
+  public class CollectionPreviewParameterProvider<T> implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<T> {
+    ctor public CollectionPreviewParameterProvider(java.util.Collection<? extends T> collection);
+    method public kotlin.sequences.Sequence<T> getValues();
+    property public kotlin.sequences.Sequence<T> values;
+  }
+
+  public final class LoremIpsum implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<java.lang.String> {
+    ctor public LoremIpsum(int words);
+    ctor public LoremIpsum();
+    method public kotlin.sequences.Sequence<java.lang.String> getValues();
+    property public kotlin.sequences.Sequence<java.lang.String> values;
+  }
+
+  public final class LoremIpsumKt {
+  }
+
+}
+

compose/ui/ui-tooling/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-tooling/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-tooling/api/res-1.0.0-beta04.txt

compose/ui/ui-tooling/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-tooling/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-tooling/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..e392e95
--- /dev/null
+++ b/compose/ui/ui-tooling/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,202 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling {
+
+  public final class InspectableKt {
+    method @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+}
+
+package androidx.compose.ui.tooling.inspector {
+
+  public final class InspectorNode {
+    method public int[] getBounds();
+    method public java.util.List<androidx.compose.ui.tooling.inspector.InspectorNode> getChildren();
+    method public String getFileName();
+    method public int getHeight();
+    method public long getId();
+    method public int getLeft();
+    method public int getLength();
+    method public int getLineNumber();
+    method public String getName();
+    method public int getOffset();
+    method public int getPackageHash();
+    method public java.util.List<androidx.compose.ui.tooling.inspector.RawParameter> getParameters();
+    method public int getTop();
+    method public int getWidth();
+    property public final int[] bounds;
+    property public final java.util.List<androidx.compose.ui.tooling.inspector.InspectorNode> children;
+    property public final String fileName;
+    property public final int height;
+    property public final long id;
+    property public final int left;
+    property public final int length;
+    property public final int lineNumber;
+    property public final String name;
+    property public final int offset;
+    property public final int packageHash;
+    property public final java.util.List<androidx.compose.ui.tooling.inspector.RawParameter> parameters;
+    property public final int top;
+    property public final int width;
+  }
+
+  public final class InspectorNodeKt {
+  }
+
+  public final class LayoutInspectorTree {
+    ctor public LayoutInspectorTree();
+    method public java.util.List<androidx.compose.ui.tooling.inspector.InspectorNode> convert(android.view.View view);
+    method public java.util.List<androidx.compose.ui.tooling.inspector.NodeParameter> convertParameters(androidx.compose.ui.tooling.inspector.InspectorNode node);
+    method public boolean getHideSystemNodes();
+    method public void resetGeneratedId();
+    method public void setHideSystemNodes(boolean p);
+    property public final boolean hideSystemNodes;
+  }
+
+  public final class LayoutInspectorTreeKt {
+  }
+
+  public final class NodeParameter {
+    method public java.util.List<androidx.compose.ui.tooling.inspector.NodeParameter> getElements();
+    method public String getName();
+    method public androidx.compose.ui.tooling.inspector.ParameterType getType();
+    method public Object? getValue();
+    property public final java.util.List<androidx.compose.ui.tooling.inspector.NodeParameter> elements;
+    property public final String name;
+    property public final androidx.compose.ui.tooling.inspector.ParameterType type;
+    property public final Object? value;
+  }
+
+  public final class ParameterFactoryKt {
+  }
+
+  public enum ParameterType {
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Boolean;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Color;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType DimensionDp;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType DimensionEm;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType DimensionSp;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Double;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Float;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType FunctionReference;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Int32;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Int64;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Lambda;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType Resource;
+    enum_constant public static final androidx.compose.ui.tooling.inspector.ParameterType String;
+  }
+
+  public final class RawParameter {
+    ctor public RawParameter(String name, Object? value);
+    method public String getName();
+    method public Object? getValue();
+    property public final String name;
+    property public final Object? value;
+  }
+
+}
+
+package androidx.compose.ui.tooling.preview {
+
+  public final class ComposeViewAdapterKt {
+    field public static final String TOOLS_NS_URI = "http://schemas.android.com/tools";
+  }
+
+  public final class Devices {
+    field public static final String AUTOMOTIVE_1024p = "id:automotive_1024p_landscape";
+    field public static final String DEFAULT = "";
+    field public static final androidx.compose.ui.tooling.preview.Devices INSTANCE;
+    field public static final String NEXUS_10 = "name:Nexus 10";
+    field public static final String NEXUS_5 = "id:Nexus 5";
+    field public static final String NEXUS_5X = "id:Nexus 5X";
+    field public static final String NEXUS_6 = "id:Nexus 6";
+    field public static final String NEXUS_6P = "id:Nexus 6P";
+    field public static final String NEXUS_7 = "id:Nexus 7";
+    field public static final String NEXUS_7_2013 = "id:Nexus 7 2013";
+    field public static final String NEXUS_9 = "id:Nexus 9";
+    field public static final String PIXEL = "id:pixel";
+    field public static final String PIXEL_2 = "id:pixel_2";
+    field public static final String PIXEL_2_XL = "id:pixel_2_xl";
+    field public static final String PIXEL_3 = "id:pixel_3";
+    field public static final String PIXEL_3A = "id:pixel_3a";
+    field public static final String PIXEL_3A_XL = "id:pixel_3a_xl";
+    field public static final String PIXEL_3_XL = "id:pixel_3_xl";
+    field public static final String PIXEL_4 = "id:pixel_4";
+    field public static final String PIXEL_4_XL = "id:pixel_4_xl";
+    field public static final String PIXEL_C = "id:pixel_c";
+    field public static final String PIXEL_XL = "id:pixel_xl";
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Preview {
+    method public abstract int apiLevel() default -1;
+    method public abstract long backgroundColor() default 0L;
+    method public abstract String device() default "";
+    method public abstract float fontScale() default 1.0f;
+    method public abstract String group() default "";
+    method public abstract int heightDp() default -1;
+    method public abstract String locale() default "";
+    method public abstract String name() default "";
+    method public abstract boolean showBackground() default false;
+    method public abstract boolean showSystemUi() default false;
+    method public abstract int uiMode() default 0;
+    method public abstract int widthDp() default -1;
+    property public abstract int apiLevel;
+    property public abstract long backgroundColor;
+    property public abstract String device;
+    property public abstract float fontScale;
+    property public abstract String group;
+    property public abstract int heightDp;
+    property public abstract String locale;
+    property public abstract String name;
+    property public abstract boolean showBackground;
+    property public abstract boolean showSystemUi;
+    property public abstract int uiMode;
+    property public abstract int widthDp;
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) public @interface PreviewParameter {
+    method public abstract int limit() default 2147483647;
+    method public abstract Class<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider();
+    property public abstract int limit;
+    property public abstract Class<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider;
+  }
+
+  public interface PreviewParameterProvider<T> {
+    method public default int getCount();
+    method public kotlin.sequences.Sequence<T> getValues();
+    property public default int count;
+    property public abstract kotlin.sequences.Sequence<T> values;
+  }
+
+  public final class PreviewUtilsKt {
+  }
+
+}
+
+package androidx.compose.ui.tooling.preview.animation {
+
+  public final class ComposeAnimationParserKt {
+  }
+
+}
+
+package androidx.compose.ui.tooling.preview.datasource {
+
+  public class CollectionPreviewParameterProvider<T> implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<T> {
+    ctor public CollectionPreviewParameterProvider(java.util.Collection<? extends T> collection);
+    method public kotlin.sequences.Sequence<T> getValues();
+    property public kotlin.sequences.Sequence<T> values;
+  }
+
+  public final class LoremIpsum implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<java.lang.String> {
+    ctor public LoremIpsum(int words);
+    ctor public LoremIpsum();
+    method public kotlin.sequences.Sequence<java.lang.String> getValues();
+    property public kotlin.sequences.Sequence<java.lang.String> values;
+  }
+
+  public final class LoremIpsumKt {
+  }
+
+}
+

compose/ui/ui-unit/OWNERS

diff --git a/compose/ui/ui-unit/OWNERS b/compose/ui/ui-unit/OWNERS
index 26955e2..8d434cf 100644
--- a/compose/ui/ui-unit/OWNERS
+++ b/compose/ui/ui-unit/OWNERS
@@ -1,5 +1,4 @@
 mount@google.com
-shepshapard@google.com
 ryanmentley@google.com
 njawad@google.com
 popam@google.com

compose/ui/ui-unit/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-unit/api/1.0.0-beta04.txt b/compose/ui/ui-unit/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..747f176
--- /dev/null
+++ b/compose/ui/ui-unit/api/1.0.0-beta04.txt
@@ -0,0 +1,374 @@
+// Signature format: 4.0
+package androidx.compose.ui.unit {
+
+  public final class AndroidDensity_androidKt {
+    method public static androidx.compose.ui.unit.Density Density(android.content.Context context);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Constraints {
+    ctor public Constraints();
+    method public static long constructor-impl(long value);
+    method public static long copy-msEJaDk(long $this, optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static boolean getHasBoundedHeight-impl(long $this);
+    method public static boolean getHasBoundedWidth-impl(long $this);
+    method public static boolean getHasFixedHeight-impl(long $this);
+    method public static boolean getHasFixedWidth-impl(long $this);
+    method public static int getMaxHeight-impl(long $this);
+    method public static int getMaxWidth-impl(long $this);
+    method public static int getMinHeight-impl(long $this);
+    method public static int getMinWidth-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static boolean isZero-impl(long $this);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.unit.Constraints.Companion Companion;
+    field public static final int Infinity = 2147483647; // 0x7fffffff
+  }
+
+  public static final class Constraints.Companion {
+    method @androidx.compose.runtime.Stable public long fixed-msEJaDk(int width, int height);
+    method @androidx.compose.runtime.Stable public long fixedHeight-msEJaDk(int height);
+    method @androidx.compose.runtime.Stable public long fixedWidth-msEJaDk(int width);
+  }
+
+  public final class ConstraintsKt {
+    method @androidx.compose.runtime.Stable public static long Constraints(optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+    method public static long constrain-WVSBfsc(long, long otherConstraints);
+    method @androidx.compose.runtime.Stable public static long constrain-m9CmiCs(long, long size);
+    method @androidx.compose.runtime.Stable public static int constrainHeight-4A1wEdY(long, int height);
+    method @androidx.compose.runtime.Stable public static int constrainWidth-4A1wEdY(long, int width);
+    method @androidx.compose.runtime.Stable public static boolean isSatisfiedBy-m9CmiCs(long, long size);
+    method @androidx.compose.runtime.Stable public static long offset-dAqVMF8(long, optional int horizontal, optional int vertical);
+  }
+
+  @androidx.compose.runtime.Immutable public interface Density {
+    method public float getDensity();
+    method public float getFontScale();
+    method @androidx.compose.runtime.Stable public default int roundToPx--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public default int roundToPx-0680j_4(float);
+    method @androidx.compose.runtime.Stable public default float toDp--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public default float toDp-D9Ej5fM(int);
+    method @androidx.compose.runtime.Stable public default float toDp-D9Ej5fM(float);
+    method @androidx.compose.runtime.Stable public default float toPx--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public default float toPx-0680j_4(float);
+    method @androidx.compose.runtime.Stable public default androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.unit.DpRect);
+    method @androidx.compose.runtime.Stable public default long toSp-0680j_4(float);
+    method @androidx.compose.runtime.Stable public default long toSp-XSAIIZE(int);
+    method @androidx.compose.runtime.Stable public default long toSp-XSAIIZE(float);
+    property public abstract float density;
+    property public abstract float fontScale;
+  }
+
+  public final class DensityKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.Density Density(float density, optional float fontScale);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Dp implements java.lang.Comparable<androidx.compose.ui.unit.Dp> {
+    ctor public Dp();
+    method @androidx.compose.runtime.Stable public operator int compareTo-0680j_4(float p);
+    method @androidx.compose.runtime.Stable public static operator int compareTo-0680j_4(float $this, float other);
+    method public static float constructor-impl(float value);
+    method @androidx.compose.runtime.Stable public static inline operator float div-0680j_4(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float div-D9Ej5fM(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float div-D9Ej5fM(float $this, int other);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(float p);
+    method @androidx.compose.runtime.Stable public static inline operator float minus-0680j_4(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float plus-0680j_4(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-D9Ej5fM(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-D9Ej5fM(float $this, int other);
+    method @androidx.compose.runtime.Stable public static String toString-impl(float $this);
+    method @androidx.compose.runtime.Stable public static inline operator float unaryMinus-D9Ej5fM(float $this);
+    property public final float value;
+    field public static final androidx.compose.ui.unit.Dp.Companion Companion;
+  }
+
+  public static final class Dp.Companion {
+    method public float getHairline-D9Ej5fM();
+    method public float getInfinity-D9Ej5fM();
+    method public float getUnspecified-D9Ej5fM();
+    property public final float Hairline;
+    property public final float Infinity;
+    property public final float Unspecified;
+  }
+
+  public final class DpKt {
+    method @androidx.compose.runtime.Stable public static long DpOffset-ioHfwGI(float x, float y);
+    method @androidx.compose.runtime.Stable public static inline float coerceAtLeast-ioHfwGI(float, float minimumValue);
+    method @androidx.compose.runtime.Stable public static inline float coerceAtMost-ioHfwGI(float, float maximumValue);
+    method @androidx.compose.runtime.Stable public static inline float coerceIn-qYQSm_w(float, float minimumValue, float maximumValue);
+    method public static inline float getDp(int);
+    method public static inline float getDp(double);
+    method public static inline float getDp(float);
+    method public static inline float getHeight(androidx.compose.ui.unit.DpRect);
+    method public static inline float getWidth(androidx.compose.ui.unit.DpRect);
+    method public static inline boolean isFinite-0680j_4(float);
+    method public static inline boolean isSpecified-0680j_4(float);
+    method public static inline boolean isUnspecified-0680j_4(float);
+    method @androidx.compose.runtime.Stable public static float lerp-7oHWEOI(float start, float stop, float fraction);
+    method @androidx.compose.runtime.Stable public static long lerp-O0PuQT4(long start, long stop, float fraction);
+    method @androidx.compose.runtime.Stable public static inline float max-ioHfwGI(float a, float b);
+    method @androidx.compose.runtime.Stable public static inline float min-ioHfwGI(float a, float b);
+    method public static inline float takeOrElse-RiydCdY(float, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.Dp> block);
+    method @androidx.compose.runtime.Stable public static inline operator float times-Cp9Wa6o(int, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-NSq4UQk(double, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-NnR5yEA(float, float other);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class DpOffset {
+    ctor public DpOffset();
+    method public static long copy-ioHfwGI(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getX-D9Ej5fM(long $this);
+    method public static float getY-D9Ej5fM(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static inline operator long minus-jo-Fl9I(long $this, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long plus-jo-Fl9I(long $this, long other);
+    method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.unit.DpOffset.Companion Companion;
+  }
+
+  public static final class DpOffset.Companion {
+    method public long getZero-RKDOV3M();
+    property public final long Zero;
+  }
+
+  @androidx.compose.runtime.Immutable public final class DpRect {
+    method public float component1-D9Ej5fM();
+    method public float component2-D9Ej5fM();
+    method public float component3-D9Ej5fM();
+    method public float component4-D9Ej5fM();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.DpRect copy-ZmiikuI(float left, float top, float right, float bottom);
+    method public float getBottom-D9Ej5fM();
+    method public float getLeft-D9Ej5fM();
+    method public float getRight-D9Ej5fM();
+    method public float getTop-D9Ej5fM();
+    property public final float bottom;
+    property public final float left;
+    property public final float right;
+    property public final float top;
+    field public static final androidx.compose.ui.unit.DpRect.Companion Companion;
+  }
+
+  public static final class DpRect.Companion {
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class IntOffset {
+    ctor public IntOffset();
+    method @androidx.compose.runtime.Stable public static operator int component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator int component2-impl(long $this);
+    method public static long copy-nOcc-ac(long $this, optional int x, optional int y);
+    method @androidx.compose.runtime.Stable public static operator long div-nOcc-ac(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static int getX-impl(long $this);
+    method public static int getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static inline operator long minus--gyyYBs(long $this, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long plus--gyyYBs(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long rem-nOcc-ac(long $this, int operand);
+    method @androidx.compose.runtime.Stable public static operator long times-nOcc-ac(long $this, float operand);
+    method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator long unaryMinus-nOcc-ac(long $this);
+    field public static final androidx.compose.ui.unit.IntOffset.Companion Companion;
+  }
+
+  public static final class IntOffset.Companion {
+    method public long getZero-nOcc-ac();
+    property public final long Zero;
+  }
+
+  public final class IntOffsetKt {
+    method @androidx.compose.runtime.Stable public static long IntOffset(int x, int y);
+    method @androidx.compose.runtime.Stable public static long lerp-t0UgTr0(long start, long stop, float fraction);
+    method @androidx.compose.runtime.Stable public static operator long minus-k5bmQ1s(long, long offset);
+    method @androidx.compose.runtime.Stable public static operator long minus-tRj9Ofw(long, long offset);
+    method @androidx.compose.runtime.Stable public static operator long plus-k5bmQ1s(long, long offset);
+    method @androidx.compose.runtime.Stable public static operator long plus-tRj9Ofw(long, long offset);
+    method @androidx.compose.runtime.Stable public static inline long round-k-4lQ0M(long);
+    method @androidx.compose.runtime.Stable public static inline long toOffset--gyyYBs(long);
+  }
+
+  @androidx.compose.runtime.Immutable public final class IntRect {
+    ctor public IntRect(@androidx.compose.runtime.Stable int left, @androidx.compose.runtime.Stable int top, @androidx.compose.runtime.Stable int right, @androidx.compose.runtime.Stable int bottom);
+    method public int component1();
+    method public int component2();
+    method public int component3();
+    method public int component4();
+    method public boolean contains--gyyYBs(long offset);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.IntRect copy(int left, int top, int right, int bottom);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect deflate(int delta);
+    method public int getBottom();
+    method public long getBottomCenter-nOcc-ac();
+    method public long getBottomLeft-nOcc-ac();
+    method public long getBottomRight-nOcc-ac();
+    method public long getCenter-nOcc-ac();
+    method public long getCenterLeft-nOcc-ac();
+    method public long getCenterRight-nOcc-ac();
+    method public int getHeight();
+    method public int getLeft();
+    method public int getMaxDimension();
+    method public int getMinDimension();
+    method public int getRight();
+    method public long getSize-YbymL2g();
+    method public int getTop();
+    method public long getTopCenter-nOcc-ac();
+    method public long getTopLeft-nOcc-ac();
+    method public long getTopRight-nOcc-ac();
+    method public int getWidth();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect inflate(int delta);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect intersect(androidx.compose.ui.unit.IntRect other);
+    method public boolean isEmpty();
+    method public boolean overlaps(androidx.compose.ui.unit.IntRect other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate(int translateX, int translateY);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate--gyyYBs(long offset);
+    property public final int bottom;
+    property public final long bottomCenter;
+    property public final long bottomLeft;
+    property public final long bottomRight;
+    property public final long center;
+    property public final long centerLeft;
+    property public final long centerRight;
+    property public final int height;
+    property public final boolean isEmpty;
+    property public final int left;
+    property public final int maxDimension;
+    property public final int minDimension;
+    property public final int right;
+    property public final long size;
+    property public final int top;
+    property public final long topCenter;
+    property public final long topLeft;
+    property public final long topRight;
+    property public final int width;
+    field public static final androidx.compose.ui.unit.IntRect.Companion Companion;
+  }
+
+  public static final class IntRect.Companion {
+    method public androidx.compose.ui.unit.IntRect getZero();
+    property public final androidx.compose.ui.unit.IntRect Zero;
+  }
+
+  public final class IntRectKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect-TtQJ-B4(long offset, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect-cS3zvqc(long topLeft, long bottomRight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect-iAZ9QSk(long center, int radius);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect lerp(androidx.compose.ui.unit.IntRect start, androidx.compose.ui.unit.IntRect stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class IntSize {
+    ctor public IntSize();
+    method @androidx.compose.runtime.Stable public static inline operator int component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator int component2-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long div-YbymL2g(long $this, int other);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static int getHeight-impl(long $this);
+    method public static int getWidth-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long times-YbymL2g(long $this, int other);
+    method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.unit.IntSize.Companion Companion;
+  }
+
+  public static final class IntSize.Companion {
+    method public long getZero-YbymL2g();
+    property public final long Zero;
+  }
+
+  public final class IntSizeKt {
+    method @androidx.compose.runtime.Stable public static long IntSize(int width, int height);
+    method public static long getCenter-ozmzZPI(long);
+    method @androidx.compose.runtime.Stable public static operator long times-U1E2UwY(int, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect toIntRect-ozmzZPI(long);
+    method @androidx.compose.runtime.Stable public static long toSize-ozmzZPI(long);
+  }
+
+  public enum LayoutDirection {
+    enum_constant public static final androidx.compose.ui.unit.LayoutDirection Ltr;
+    enum_constant public static final androidx.compose.ui.unit.LayoutDirection Rtl;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class TextUnit {
+    ctor public TextUnit();
+    method public static inline operator int compareTo--R2X_6o(long $this, long other);
+    method public static inline operator long div-XSAIIZE(long $this, float other);
+    method public static inline operator long div-XSAIIZE(long $this, double other);
+    method public static inline operator long div-XSAIIZE(long $this, int other);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static androidx.compose.ui.unit.TextUnitType getType-impl(long $this);
+    method public static float getValue-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static boolean isEm-impl(long $this);
+    method public static boolean isSp-impl(long $this);
+    method public static inline operator long times-XSAIIZE(long $this, float other);
+    method public static inline operator long times-XSAIIZE(long $this, double other);
+    method public static inline operator long times-XSAIIZE(long $this, int other);
+    method public static String toString-impl(long $this);
+    method public static inline operator long unaryMinus-XSAIIZE(long $this);
+    field public static final androidx.compose.ui.unit.TextUnit.Companion Companion;
+  }
+
+  public static final class TextUnit.Companion {
+    method public long getUnspecified-XSAIIZE();
+    property public final long Unspecified;
+  }
+
+  public final class TextUnitKt {
+    method public static long getEm(float);
+    method public static long getEm(double);
+    method public static long getEm(int);
+    method public static long getSp(float);
+    method public static long getSp(double);
+    method public static long getSp(int);
+    method public static inline boolean isSpecified--R2X_6o(long);
+    method public static boolean isUnspecified--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public static long lerp-KeuwX78(long start, long stop, float fraction);
+    method public static inline long takeOrElse-bAewZlA(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.TextUnit> block);
+    method @androidx.compose.runtime.Stable public static inline operator long times-0PRCd3Q(double, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long times-Ew26DjI(float, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long times-VJWtCv4(int, long other);
+  }
+
+  public enum TextUnitType {
+    enum_constant public static final androidx.compose.ui.unit.TextUnitType Em;
+    enum_constant public static final androidx.compose.ui.unit.TextUnitType Sp;
+    enum_constant public static final androidx.compose.ui.unit.TextUnitType Unspecified;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Velocity {
+    ctor public Velocity();
+    method @androidx.compose.runtime.Stable public static operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component2-impl(long $this);
+    method public static long copy-9UxMQ8M(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Stable public static operator long div-9UxMQ8M(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getX-impl(long $this);
+    method public static float getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long minus-TH1AsA0(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long plus-TH1AsA0(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long rem-9UxMQ8M(long $this, float operand);
+    method @androidx.compose.runtime.Stable public static operator long times-9UxMQ8M(long $this, float operand);
+    method public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long unaryMinus-9UxMQ8M(long $this);
+    field public static final androidx.compose.ui.unit.Velocity.Companion Companion;
+  }
+
+  public static final class Velocity.Companion {
+    method public long getZero-9UxMQ8M();
+    property public final long Zero;
+  }
+
+  public final class VelocityKt {
+    method @androidx.compose.runtime.Stable public static long Velocity(float x, float y);
+  }
+
+}
+

compose/ui/ui-unit/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-unit/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-unit/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..747f176
--- /dev/null
+++ b/compose/ui/ui-unit/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,374 @@
+// Signature format: 4.0
+package androidx.compose.ui.unit {
+
+  public final class AndroidDensity_androidKt {
+    method public static androidx.compose.ui.unit.Density Density(android.content.Context context);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Constraints {
+    ctor public Constraints();
+    method public static long constructor-impl(long value);
+    method public static long copy-msEJaDk(long $this, optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static boolean getHasBoundedHeight-impl(long $this);
+    method public static boolean getHasBoundedWidth-impl(long $this);
+    method public static boolean getHasFixedHeight-impl(long $this);
+    method public static boolean getHasFixedWidth-impl(long $this);
+    method public static int getMaxHeight-impl(long $this);
+    method public static int getMaxWidth-impl(long $this);
+    method public static int getMinHeight-impl(long $this);
+    method public static int getMinWidth-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static boolean isZero-impl(long $this);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.unit.Constraints.Companion Companion;
+    field public static final int Infinity = 2147483647; // 0x7fffffff
+  }
+
+  public static final class Constraints.Companion {
+    method @androidx.compose.runtime.Stable public long fixed-msEJaDk(int width, int height);
+    method @androidx.compose.runtime.Stable public long fixedHeight-msEJaDk(int height);
+    method @androidx.compose.runtime.Stable public long fixedWidth-msEJaDk(int width);
+  }
+
+  public final class ConstraintsKt {
+    method @androidx.compose.runtime.Stable public static long Constraints(optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+    method public static long constrain-WVSBfsc(long, long otherConstraints);
+    method @androidx.compose.runtime.Stable public static long constrain-m9CmiCs(long, long size);
+    method @androidx.compose.runtime.Stable public static int constrainHeight-4A1wEdY(long, int height);
+    method @androidx.compose.runtime.Stable public static int constrainWidth-4A1wEdY(long, int width);
+    method @androidx.compose.runtime.Stable public static boolean isSatisfiedBy-m9CmiCs(long, long size);
+    method @androidx.compose.runtime.Stable public static long offset-dAqVMF8(long, optional int horizontal, optional int vertical);
+  }
+
+  @androidx.compose.runtime.Immutable public interface Density {
+    method public float getDensity();
+    method public float getFontScale();
+    method @androidx.compose.runtime.Stable public default int roundToPx--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public default int roundToPx-0680j_4(float);
+    method @androidx.compose.runtime.Stable public default float toDp--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public default float toDp-D9Ej5fM(int);
+    method @androidx.compose.runtime.Stable public default float toDp-D9Ej5fM(float);
+    method @androidx.compose.runtime.Stable public default float toPx--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public default float toPx-0680j_4(float);
+    method @androidx.compose.runtime.Stable public default androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.unit.DpRect);
+    method @androidx.compose.runtime.Stable public default long toSp-0680j_4(float);
+    method @androidx.compose.runtime.Stable public default long toSp-XSAIIZE(int);
+    method @androidx.compose.runtime.Stable public default long toSp-XSAIIZE(float);
+    property public abstract float density;
+    property public abstract float fontScale;
+  }
+
+  public final class DensityKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.Density Density(float density, optional float fontScale);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Dp implements java.lang.Comparable<androidx.compose.ui.unit.Dp> {
+    ctor public Dp();
+    method @androidx.compose.runtime.Stable public operator int compareTo-0680j_4(float p);
+    method @androidx.compose.runtime.Stable public static operator int compareTo-0680j_4(float $this, float other);
+    method public static float constructor-impl(float value);
+    method @androidx.compose.runtime.Stable public static inline operator float div-0680j_4(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float div-D9Ej5fM(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float div-D9Ej5fM(float $this, int other);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(float p);
+    method @androidx.compose.runtime.Stable public static inline operator float minus-0680j_4(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float plus-0680j_4(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-D9Ej5fM(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-D9Ej5fM(float $this, int other);
+    method @androidx.compose.runtime.Stable public static String toString-impl(float $this);
+    method @androidx.compose.runtime.Stable public static inline operator float unaryMinus-D9Ej5fM(float $this);
+    property public final float value;
+    field public static final androidx.compose.ui.unit.Dp.Companion Companion;
+  }
+
+  public static final class Dp.Companion {
+    method public float getHairline-D9Ej5fM();
+    method public float getInfinity-D9Ej5fM();
+    method public float getUnspecified-D9Ej5fM();
+    property public final float Hairline;
+    property public final float Infinity;
+    property public final float Unspecified;
+  }
+
+  public final class DpKt {
+    method @androidx.compose.runtime.Stable public static long DpOffset-ioHfwGI(float x, float y);
+    method @androidx.compose.runtime.Stable public static inline float coerceAtLeast-ioHfwGI(float, float minimumValue);
+    method @androidx.compose.runtime.Stable public static inline float coerceAtMost-ioHfwGI(float, float maximumValue);
+    method @androidx.compose.runtime.Stable public static inline float coerceIn-qYQSm_w(float, float minimumValue, float maximumValue);
+    method public static inline float getDp(int);
+    method public static inline float getDp(double);
+    method public static inline float getDp(float);
+    method public static inline float getHeight(androidx.compose.ui.unit.DpRect);
+    method public static inline float getWidth(androidx.compose.ui.unit.DpRect);
+    method public static inline boolean isFinite-0680j_4(float);
+    method public static inline boolean isSpecified-0680j_4(float);
+    method public static inline boolean isUnspecified-0680j_4(float);
+    method @androidx.compose.runtime.Stable public static float lerp-7oHWEOI(float start, float stop, float fraction);
+    method @androidx.compose.runtime.Stable public static long lerp-O0PuQT4(long start, long stop, float fraction);
+    method @androidx.compose.runtime.Stable public static inline float max-ioHfwGI(float a, float b);
+    method @androidx.compose.runtime.Stable public static inline float min-ioHfwGI(float a, float b);
+    method public static inline float takeOrElse-RiydCdY(float, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.Dp> block);
+    method @androidx.compose.runtime.Stable public static inline operator float times-Cp9Wa6o(int, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-NSq4UQk(double, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-NnR5yEA(float, float other);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class DpOffset {
+    ctor public DpOffset();
+    method public static long copy-ioHfwGI(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getX-D9Ej5fM(long $this);
+    method public static float getY-D9Ej5fM(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static inline operator long minus-jo-Fl9I(long $this, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long plus-jo-Fl9I(long $this, long other);
+    method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.unit.DpOffset.Companion Companion;
+  }
+
+  public static final class DpOffset.Companion {
+    method public long getZero-RKDOV3M();
+    property public final long Zero;
+  }
+
+  @androidx.compose.runtime.Immutable public final class DpRect {
+    method public float component1-D9Ej5fM();
+    method public float component2-D9Ej5fM();
+    method public float component3-D9Ej5fM();
+    method public float component4-D9Ej5fM();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.DpRect copy-ZmiikuI(float left, float top, float right, float bottom);
+    method public float getBottom-D9Ej5fM();
+    method public float getLeft-D9Ej5fM();
+    method public float getRight-D9Ej5fM();
+    method public float getTop-D9Ej5fM();
+    property public final float bottom;
+    property public final float left;
+    property public final float right;
+    property public final float top;
+    field public static final androidx.compose.ui.unit.DpRect.Companion Companion;
+  }
+
+  public static final class DpRect.Companion {
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class IntOffset {
+    ctor public IntOffset();
+    method @androidx.compose.runtime.Stable public static operator int component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator int component2-impl(long $this);
+    method public static long copy-nOcc-ac(long $this, optional int x, optional int y);
+    method @androidx.compose.runtime.Stable public static operator long div-nOcc-ac(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static int getX-impl(long $this);
+    method public static int getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static inline operator long minus--gyyYBs(long $this, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long plus--gyyYBs(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long rem-nOcc-ac(long $this, int operand);
+    method @androidx.compose.runtime.Stable public static operator long times-nOcc-ac(long $this, float operand);
+    method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator long unaryMinus-nOcc-ac(long $this);
+    field public static final androidx.compose.ui.unit.IntOffset.Companion Companion;
+  }
+
+  public static final class IntOffset.Companion {
+    method public long getZero-nOcc-ac();
+    property public final long Zero;
+  }
+
+  public final class IntOffsetKt {
+    method @androidx.compose.runtime.Stable public static long IntOffset(int x, int y);
+    method @androidx.compose.runtime.Stable public static long lerp-t0UgTr0(long start, long stop, float fraction);
+    method @androidx.compose.runtime.Stable public static operator long minus-k5bmQ1s(long, long offset);
+    method @androidx.compose.runtime.Stable public static operator long minus-tRj9Ofw(long, long offset);
+    method @androidx.compose.runtime.Stable public static operator long plus-k5bmQ1s(long, long offset);
+    method @androidx.compose.runtime.Stable public static operator long plus-tRj9Ofw(long, long offset);
+    method @androidx.compose.runtime.Stable public static inline long round-k-4lQ0M(long);
+    method @androidx.compose.runtime.Stable public static inline long toOffset--gyyYBs(long);
+  }
+
+  @androidx.compose.runtime.Immutable public final class IntRect {
+    ctor public IntRect(@androidx.compose.runtime.Stable int left, @androidx.compose.runtime.Stable int top, @androidx.compose.runtime.Stable int right, @androidx.compose.runtime.Stable int bottom);
+    method public int component1();
+    method public int component2();
+    method public int component3();
+    method public int component4();
+    method public boolean contains--gyyYBs(long offset);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.IntRect copy(int left, int top, int right, int bottom);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect deflate(int delta);
+    method public int getBottom();
+    method public long getBottomCenter-nOcc-ac();
+    method public long getBottomLeft-nOcc-ac();
+    method public long getBottomRight-nOcc-ac();
+    method public long getCenter-nOcc-ac();
+    method public long getCenterLeft-nOcc-ac();
+    method public long getCenterRight-nOcc-ac();
+    method public int getHeight();
+    method public int getLeft();
+    method public int getMaxDimension();
+    method public int getMinDimension();
+    method public int getRight();
+    method public long getSize-YbymL2g();
+    method public int getTop();
+    method public long getTopCenter-nOcc-ac();
+    method public long getTopLeft-nOcc-ac();
+    method public long getTopRight-nOcc-ac();
+    method public int getWidth();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect inflate(int delta);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect intersect(androidx.compose.ui.unit.IntRect other);
+    method public boolean isEmpty();
+    method public boolean overlaps(androidx.compose.ui.unit.IntRect other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate(int translateX, int translateY);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate--gyyYBs(long offset);
+    property public final int bottom;
+    property public final long bottomCenter;
+    property public final long bottomLeft;
+    property public final long bottomRight;
+    property public final long center;
+    property public final long centerLeft;
+    property public final long centerRight;
+    property public final int height;
+    property public final boolean isEmpty;
+    property public final int left;
+    property public final int maxDimension;
+    property public final int minDimension;
+    property public final int right;
+    property public final long size;
+    property public final int top;
+    property public final long topCenter;
+    property public final long topLeft;
+    property public final long topRight;
+    property public final int width;
+    field public static final androidx.compose.ui.unit.IntRect.Companion Companion;
+  }
+
+  public static final class IntRect.Companion {
+    method public androidx.compose.ui.unit.IntRect getZero();
+    property public final androidx.compose.ui.unit.IntRect Zero;
+  }
+
+  public final class IntRectKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect-TtQJ-B4(long offset, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect-cS3zvqc(long topLeft, long bottomRight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect-iAZ9QSk(long center, int radius);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect lerp(androidx.compose.ui.unit.IntRect start, androidx.compose.ui.unit.IntRect stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class IntSize {
+    ctor public IntSize();
+    method @androidx.compose.runtime.Stable public static inline operator int component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator int component2-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long div-YbymL2g(long $this, int other);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static int getHeight-impl(long $this);
+    method public static int getWidth-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long times-YbymL2g(long $this, int other);
+    method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.unit.IntSize.Companion Companion;
+  }
+
+  public static final class IntSize.Companion {
+    method public long getZero-YbymL2g();
+    property public final long Zero;
+  }
+
+  public final class IntSizeKt {
+    method @androidx.compose.runtime.Stable public static long IntSize(int width, int height);
+    method public static long getCenter-ozmzZPI(long);
+    method @androidx.compose.runtime.Stable public static operator long times-U1E2UwY(int, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect toIntRect-ozmzZPI(long);
+    method @androidx.compose.runtime.Stable public static long toSize-ozmzZPI(long);
+  }
+
+  public enum LayoutDirection {
+    enum_constant public static final androidx.compose.ui.unit.LayoutDirection Ltr;
+    enum_constant public static final androidx.compose.ui.unit.LayoutDirection Rtl;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class TextUnit {
+    ctor public TextUnit();
+    method public static inline operator int compareTo--R2X_6o(long $this, long other);
+    method public static inline operator long div-XSAIIZE(long $this, float other);
+    method public static inline operator long div-XSAIIZE(long $this, double other);
+    method public static inline operator long div-XSAIIZE(long $this, int other);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static androidx.compose.ui.unit.TextUnitType getType-impl(long $this);
+    method public static float getValue-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static boolean isEm-impl(long $this);
+    method public static boolean isSp-impl(long $this);
+    method public static inline operator long times-XSAIIZE(long $this, float other);
+    method public static inline operator long times-XSAIIZE(long $this, double other);
+    method public static inline operator long times-XSAIIZE(long $this, int other);
+    method public static String toString-impl(long $this);
+    method public static inline operator long unaryMinus-XSAIIZE(long $this);
+    field public static final androidx.compose.ui.unit.TextUnit.Companion Companion;
+  }
+
+  public static final class TextUnit.Companion {
+    method public long getUnspecified-XSAIIZE();
+    property public final long Unspecified;
+  }
+
+  public final class TextUnitKt {
+    method public static long getEm(float);
+    method public static long getEm(double);
+    method public static long getEm(int);
+    method public static long getSp(float);
+    method public static long getSp(double);
+    method public static long getSp(int);
+    method public static inline boolean isSpecified--R2X_6o(long);
+    method public static boolean isUnspecified--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public static long lerp-KeuwX78(long start, long stop, float fraction);
+    method public static inline long takeOrElse-bAewZlA(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.TextUnit> block);
+    method @androidx.compose.runtime.Stable public static inline operator long times-0PRCd3Q(double, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long times-Ew26DjI(float, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long times-VJWtCv4(int, long other);
+  }
+
+  public enum TextUnitType {
+    enum_constant public static final androidx.compose.ui.unit.TextUnitType Em;
+    enum_constant public static final androidx.compose.ui.unit.TextUnitType Sp;
+    enum_constant public static final androidx.compose.ui.unit.TextUnitType Unspecified;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Velocity {
+    ctor public Velocity();
+    method @androidx.compose.runtime.Stable public static operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component2-impl(long $this);
+    method public static long copy-9UxMQ8M(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Stable public static operator long div-9UxMQ8M(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getX-impl(long $this);
+    method public static float getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long minus-TH1AsA0(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long plus-TH1AsA0(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long rem-9UxMQ8M(long $this, float operand);
+    method @androidx.compose.runtime.Stable public static operator long times-9UxMQ8M(long $this, float operand);
+    method public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long unaryMinus-9UxMQ8M(long $this);
+    field public static final androidx.compose.ui.unit.Velocity.Companion Companion;
+  }
+
+  public static final class Velocity.Companion {
+    method public long getZero-9UxMQ8M();
+    property public final long Zero;
+  }
+
+  public final class VelocityKt {
+    method @androidx.compose.runtime.Stable public static long Velocity(float x, float y);
+  }
+
+}
+

compose/ui/ui-unit/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-unit/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-unit/api/res-1.0.0-beta04.txt

compose/ui/ui-unit/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-unit/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-unit/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..5e27162
--- /dev/null
+++ b/compose/ui/ui-unit/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,378 @@
+// Signature format: 4.0
+package androidx.compose.ui.unit {
+
+  public final class AndroidDensity_androidKt {
+    method public static androidx.compose.ui.unit.Density Density(android.content.Context context);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Constraints {
+    ctor public Constraints();
+    method public static long constructor-impl(long value);
+    method public static long copy-msEJaDk(long $this, optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static boolean getHasBoundedHeight-impl(long $this);
+    method public static boolean getHasBoundedWidth-impl(long $this);
+    method public static boolean getHasFixedHeight-impl(long $this);
+    method public static boolean getHasFixedWidth-impl(long $this);
+    method public static int getMaxHeight-impl(long $this);
+    method public static int getMaxWidth-impl(long $this);
+    method public static int getMinHeight-impl(long $this);
+    method public static int getMinWidth-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static boolean isZero-impl(long $this);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.unit.Constraints.Companion Companion;
+    field public static final int Infinity = 2147483647; // 0x7fffffff
+  }
+
+  public static final class Constraints.Companion {
+    method @androidx.compose.runtime.Stable public long fixed-msEJaDk(int width, int height);
+    method @androidx.compose.runtime.Stable public long fixedHeight-msEJaDk(int height);
+    method @androidx.compose.runtime.Stable public long fixedWidth-msEJaDk(int width);
+  }
+
+  public final class ConstraintsKt {
+    method @androidx.compose.runtime.Stable public static long Constraints(optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+    method public static long constrain-WVSBfsc(long, long otherConstraints);
+    method @androidx.compose.runtime.Stable public static long constrain-m9CmiCs(long, long size);
+    method @androidx.compose.runtime.Stable public static int constrainHeight-4A1wEdY(long, int height);
+    method @androidx.compose.runtime.Stable public static int constrainWidth-4A1wEdY(long, int width);
+    method @androidx.compose.runtime.Stable public static boolean isSatisfiedBy-m9CmiCs(long, long size);
+    method @androidx.compose.runtime.Stable public static long offset-dAqVMF8(long, optional int horizontal, optional int vertical);
+  }
+
+  @androidx.compose.runtime.Immutable public interface Density {
+    method public float getDensity();
+    method public float getFontScale();
+    method @androidx.compose.runtime.Stable public default int roundToPx--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public default int roundToPx-0680j_4(float);
+    method @androidx.compose.runtime.Stable public default float toDp--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public default float toDp-D9Ej5fM(int);
+    method @androidx.compose.runtime.Stable public default float toDp-D9Ej5fM(float);
+    method @androidx.compose.runtime.Stable public default float toPx--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public default float toPx-0680j_4(float);
+    method @androidx.compose.runtime.Stable public default androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.unit.DpRect);
+    method @androidx.compose.runtime.Stable public default long toSp-0680j_4(float);
+    method @androidx.compose.runtime.Stable public default long toSp-XSAIIZE(int);
+    method @androidx.compose.runtime.Stable public default long toSp-XSAIIZE(float);
+    property public abstract float density;
+    property public abstract float fontScale;
+  }
+
+  public final class DensityKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.Density Density(float density, optional float fontScale);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Dp implements java.lang.Comparable<androidx.compose.ui.unit.Dp> {
+    ctor public Dp();
+    method @androidx.compose.runtime.Stable public operator int compareTo-0680j_4(float p);
+    method @androidx.compose.runtime.Stable public static operator int compareTo-0680j_4(float $this, float other);
+    method public static float constructor-impl(float value);
+    method @androidx.compose.runtime.Stable public static inline operator float div-0680j_4(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float div-D9Ej5fM(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float div-D9Ej5fM(float $this, int other);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(float p);
+    method @androidx.compose.runtime.Stable public static inline operator float minus-0680j_4(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float plus-0680j_4(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-D9Ej5fM(float $this, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-D9Ej5fM(float $this, int other);
+    method @androidx.compose.runtime.Stable public static String toString-impl(float $this);
+    method @androidx.compose.runtime.Stable public static inline operator float unaryMinus-D9Ej5fM(float $this);
+    property public final float value;
+    field public static final androidx.compose.ui.unit.Dp.Companion Companion;
+  }
+
+  public static final class Dp.Companion {
+    method public float getHairline-D9Ej5fM();
+    method public float getInfinity-D9Ej5fM();
+    method public float getUnspecified-D9Ej5fM();
+    property public final float Hairline;
+    property public final float Infinity;
+    property public final float Unspecified;
+  }
+
+  public final class DpKt {
+    method @androidx.compose.runtime.Stable public static long DpOffset-ioHfwGI(float x, float y);
+    method @androidx.compose.runtime.Stable public static inline float coerceAtLeast-ioHfwGI(float, float minimumValue);
+    method @androidx.compose.runtime.Stable public static inline float coerceAtMost-ioHfwGI(float, float maximumValue);
+    method @androidx.compose.runtime.Stable public static inline float coerceIn-qYQSm_w(float, float minimumValue, float maximumValue);
+    method public static inline float getDp(int);
+    method public static inline float getDp(double);
+    method public static inline float getDp(float);
+    method public static inline float getHeight(androidx.compose.ui.unit.DpRect);
+    method public static inline float getWidth(androidx.compose.ui.unit.DpRect);
+    method public static inline boolean isFinite-0680j_4(float);
+    method public static inline boolean isSpecified-0680j_4(float);
+    method public static inline boolean isUnspecified-0680j_4(float);
+    method @androidx.compose.runtime.Stable public static float lerp-7oHWEOI(float start, float stop, float fraction);
+    method @androidx.compose.runtime.Stable public static long lerp-O0PuQT4(long start, long stop, float fraction);
+    method @androidx.compose.runtime.Stable public static inline float max-ioHfwGI(float a, float b);
+    method @androidx.compose.runtime.Stable public static inline float min-ioHfwGI(float a, float b);
+    method public static inline float takeOrElse-RiydCdY(float, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.Dp> block);
+    method @androidx.compose.runtime.Stable public static inline operator float times-Cp9Wa6o(int, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-NSq4UQk(double, float other);
+    method @androidx.compose.runtime.Stable public static inline operator float times-NnR5yEA(float, float other);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class DpOffset {
+    ctor public DpOffset();
+    method public static long copy-ioHfwGI(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getX-D9Ej5fM(long $this);
+    method public static float getY-D9Ej5fM(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static inline operator long minus-jo-Fl9I(long $this, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long plus-jo-Fl9I(long $this, long other);
+    method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.unit.DpOffset.Companion Companion;
+  }
+
+  public static final class DpOffset.Companion {
+    method public long getZero-RKDOV3M();
+    property public final long Zero;
+  }
+
+  @androidx.compose.runtime.Immutable public final class DpRect {
+    method public float component1-D9Ej5fM();
+    method public float component2-D9Ej5fM();
+    method public float component3-D9Ej5fM();
+    method public float component4-D9Ej5fM();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.DpRect copy-ZmiikuI(float left, float top, float right, float bottom);
+    method public float getBottom-D9Ej5fM();
+    method public float getLeft-D9Ej5fM();
+    method public float getRight-D9Ej5fM();
+    method public float getTop-D9Ej5fM();
+    property public final float bottom;
+    property public final float left;
+    property public final float right;
+    property public final float top;
+    field public static final androidx.compose.ui.unit.DpRect.Companion Companion;
+  }
+
+  public static final class DpRect.Companion {
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class IntOffset {
+    ctor public IntOffset();
+    method @androidx.compose.runtime.Stable public static operator int component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator int component2-impl(long $this);
+    method public static long copy-nOcc-ac(long $this, optional int x, optional int y);
+    method @androidx.compose.runtime.Stable public static operator long div-nOcc-ac(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static int getX-impl(long $this);
+    method public static int getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static inline operator long minus--gyyYBs(long $this, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long plus--gyyYBs(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long rem-nOcc-ac(long $this, int operand);
+    method @androidx.compose.runtime.Stable public static operator long times-nOcc-ac(long $this, float operand);
+    method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator long unaryMinus-nOcc-ac(long $this);
+    field public static final androidx.compose.ui.unit.IntOffset.Companion Companion;
+  }
+
+  public static final class IntOffset.Companion {
+    method public long getZero-nOcc-ac();
+    property public final long Zero;
+  }
+
+  public final class IntOffsetKt {
+    method @androidx.compose.runtime.Stable public static long IntOffset(int x, int y);
+    method @androidx.compose.runtime.Stable public static long lerp-t0UgTr0(long start, long stop, float fraction);
+    method @androidx.compose.runtime.Stable public static operator long minus-k5bmQ1s(long, long offset);
+    method @androidx.compose.runtime.Stable public static operator long minus-tRj9Ofw(long, long offset);
+    method @androidx.compose.runtime.Stable public static operator long plus-k5bmQ1s(long, long offset);
+    method @androidx.compose.runtime.Stable public static operator long plus-tRj9Ofw(long, long offset);
+    method @androidx.compose.runtime.Stable public static inline long round-k-4lQ0M(long);
+    method @androidx.compose.runtime.Stable public static inline long toOffset--gyyYBs(long);
+  }
+
+  @androidx.compose.runtime.Immutable public final class IntRect {
+    ctor public IntRect(@androidx.compose.runtime.Stable int left, @androidx.compose.runtime.Stable int top, @androidx.compose.runtime.Stable int right, @androidx.compose.runtime.Stable int bottom);
+    method public int component1();
+    method public int component2();
+    method public int component3();
+    method public int component4();
+    method public boolean contains--gyyYBs(long offset);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.IntRect copy(int left, int top, int right, int bottom);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect deflate(int delta);
+    method public int getBottom();
+    method public long getBottomCenter-nOcc-ac();
+    method public long getBottomLeft-nOcc-ac();
+    method public long getBottomRight-nOcc-ac();
+    method public long getCenter-nOcc-ac();
+    method public long getCenterLeft-nOcc-ac();
+    method public long getCenterRight-nOcc-ac();
+    method public int getHeight();
+    method public int getLeft();
+    method public int getMaxDimension();
+    method public int getMinDimension();
+    method public int getRight();
+    method public long getSize-YbymL2g();
+    method public int getTop();
+    method public long getTopCenter-nOcc-ac();
+    method public long getTopLeft-nOcc-ac();
+    method public long getTopRight-nOcc-ac();
+    method public int getWidth();
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect inflate(int delta);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect intersect(androidx.compose.ui.unit.IntRect other);
+    method public boolean isEmpty();
+    method public boolean overlaps(androidx.compose.ui.unit.IntRect other);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate(int translateX, int translateY);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate--gyyYBs(long offset);
+    property public final int bottom;
+    property public final long bottomCenter;
+    property public final long bottomLeft;
+    property public final long bottomRight;
+    property public final long center;
+    property public final long centerLeft;
+    property public final long centerRight;
+    property public final int height;
+    property public final boolean isEmpty;
+    property public final int left;
+    property public final int maxDimension;
+    property public final int minDimension;
+    property public final int right;
+    property public final long size;
+    property public final int top;
+    property public final long topCenter;
+    property public final long topLeft;
+    property public final long topRight;
+    property public final int width;
+    field public static final androidx.compose.ui.unit.IntRect.Companion Companion;
+  }
+
+  public static final class IntRect.Companion {
+    method public androidx.compose.ui.unit.IntRect getZero();
+    property public final androidx.compose.ui.unit.IntRect Zero;
+  }
+
+  public final class IntRectKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect-TtQJ-B4(long offset, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect-cS3zvqc(long topLeft, long bottomRight);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect-iAZ9QSk(long center, int radius);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect lerp(androidx.compose.ui.unit.IntRect start, androidx.compose.ui.unit.IntRect stop, float fraction);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class IntSize {
+    ctor public IntSize();
+    method @androidx.compose.runtime.Stable public static inline operator int component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator int component2-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long div-YbymL2g(long $this, int other);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static int getHeight-impl(long $this);
+    method public static int getWidth-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long times-YbymL2g(long $this, int other);
+    method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.unit.IntSize.Companion Companion;
+  }
+
+  public static final class IntSize.Companion {
+    method public long getZero-YbymL2g();
+    property public final long Zero;
+  }
+
+  public final class IntSizeKt {
+    method @androidx.compose.runtime.Stable public static long IntSize(int width, int height);
+    method public static long getCenter-ozmzZPI(long);
+    method @androidx.compose.runtime.Stable public static operator long times-U1E2UwY(int, long size);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect toIntRect-ozmzZPI(long);
+    method @androidx.compose.runtime.Stable public static long toSize-ozmzZPI(long);
+  }
+
+  public enum LayoutDirection {
+    enum_constant public static final androidx.compose.ui.unit.LayoutDirection Ltr;
+    enum_constant public static final androidx.compose.ui.unit.LayoutDirection Rtl;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class TextUnit {
+    ctor public TextUnit();
+    method public static inline operator int compareTo--R2X_6o(long $this, long other);
+    method public static inline operator long div-XSAIIZE(long $this, float other);
+    method public static inline operator long div-XSAIIZE(long $this, double other);
+    method public static inline operator long div-XSAIIZE(long $this, int other);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static androidx.compose.ui.unit.TextUnitType getType-impl(long $this);
+    method public static float getValue-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method public static boolean isEm-impl(long $this);
+    method public static boolean isSp-impl(long $this);
+    method public static inline operator long times-XSAIIZE(long $this, float other);
+    method public static inline operator long times-XSAIIZE(long $this, double other);
+    method public static inline operator long times-XSAIIZE(long $this, int other);
+    method public static String toString-impl(long $this);
+    method public static inline operator long unaryMinus-XSAIIZE(long $this);
+    field public static final androidx.compose.ui.unit.TextUnit.Companion Companion;
+  }
+
+  public static final class TextUnit.Companion {
+    method public long getUnspecified-XSAIIZE();
+    property public final long Unspecified;
+  }
+
+  public final class TextUnitKt {
+    method @kotlin.PublishedApi internal static void checkArithmetic--R2X_6o(long a);
+    method @kotlin.PublishedApi internal static void checkArithmetic-8E83U4Q(long a, long b);
+    method @kotlin.PublishedApi internal static void checkArithmetic-HxQ2Pkc(long a, long b, long c);
+    method public static long getEm(float);
+    method public static long getEm(double);
+    method public static long getEm(int);
+    method public static long getSp(float);
+    method public static long getSp(double);
+    method public static long getSp(int);
+    method public static inline boolean isSpecified--R2X_6o(long);
+    method public static boolean isUnspecified--R2X_6o(long);
+    method @androidx.compose.runtime.Stable public static long lerp-KeuwX78(long start, long stop, float fraction);
+    method @kotlin.PublishedApi internal static long pack(long unitType, float v);
+    method public static inline long takeOrElse-bAewZlA(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.TextUnit> block);
+    method @androidx.compose.runtime.Stable public static inline operator long times-0PRCd3Q(double, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long times-Ew26DjI(float, long other);
+    method @androidx.compose.runtime.Stable public static inline operator long times-VJWtCv4(int, long other);
+  }
+
+  public enum TextUnitType {
+    enum_constant public static final androidx.compose.ui.unit.TextUnitType Em;
+    enum_constant public static final androidx.compose.ui.unit.TextUnitType Sp;
+    enum_constant public static final androidx.compose.ui.unit.TextUnitType Unspecified;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class Velocity {
+    ctor public Velocity();
+    method @androidx.compose.runtime.Stable public static operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator float component2-impl(long $this);
+    method public static long copy-9UxMQ8M(long $this, optional float x, optional float y);
+    method @androidx.compose.runtime.Stable public static operator long div-9UxMQ8M(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getX-impl(long $this);
+    method public static float getY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long minus-TH1AsA0(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long plus-TH1AsA0(long $this, long other);
+    method @androidx.compose.runtime.Stable public static operator long rem-9UxMQ8M(long $this, float operand);
+    method @androidx.compose.runtime.Stable public static operator long times-9UxMQ8M(long $this, float operand);
+    method public static String toString-impl(long $this);
+    method @androidx.compose.runtime.Stable public static operator long unaryMinus-9UxMQ8M(long $this);
+    field public static final androidx.compose.ui.unit.Velocity.Companion Companion;
+  }
+
+  public static final class Velocity.Companion {
+    method public long getZero-9UxMQ8M();
+    property public final long Zero;
+  }
+
+  public final class VelocityKt {
+    method @androidx.compose.runtime.Stable public static long Velocity(float x, float y);
+  }
+
+}
+

compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Constraints.kt

diff --git a/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Constraints.kt b/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Constraints.kt
index f89d206..98e3857c 100644
--- a/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Constraints.kt
+++ b/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Constraints.kt
@@ -186,7 +186,7 @@
     companion object {
         /**
          * A value that [maxWidth] or [maxHeight] will be set to when the constraint should
-         * be considered infinite. [hasBoundedHeight] or [hasBoundedWidth] will be
+         * be considered infinite. [hasBoundedWidth] or [hasBoundedHeight] will be
          * `false` when [maxWidth] or [maxHeight] is [Infinity], respectively.
          */
         const val Infinity = Int.MAX_VALUE

compose/ui/ui-util/OWNERS

diff --git a/compose/ui/ui-util/OWNERS b/compose/ui/ui-util/OWNERS
index 26955e2..8d434cf 100644
--- a/compose/ui/ui-util/OWNERS
+++ b/compose/ui/ui-util/OWNERS
@@ -1,5 +1,4 @@
 mount@google.com
-shepshapard@google.com
 ryanmentley@google.com
 njawad@google.com
 popam@google.com

compose/ui/ui-util/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-util/api/1.0.0-beta04.txt b/compose/ui/ui-util/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..b71072e
--- /dev/null
+++ b/compose/ui/ui-util/api/1.0.0-beta04.txt
@@ -0,0 +1,36 @@
+// Signature format: 4.0
+package androidx.compose.ui.util {
+
+  public final class AndroidTrace_androidKt {
+    method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class InlineClassHelperKt {
+    method public static inline long packFloats(float val1, float val2);
+    method public static inline long packInts(int val1, int val2);
+    method public static inline float unpackFloat1(long value);
+    method public static inline float unpackFloat2(long value);
+    method public static inline int unpackInt1(long value);
+    method public static inline int unpackInt2(long value);
+  }
+
+  public final class ListUtilsKt {
+    method public static inline <T> boolean fastAll(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public static inline <T> boolean fastAny(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public static inline <T> T? fastFirstOrNull(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public static inline <T> void fastForEach(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> action);
+    method public static inline <T> void fastForEachIndexed(java.util.List<? extends T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
+    method public static inline <T, R> java.util.List<R> fastMap(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public static inline <T, R, C extends java.util.Collection<? super R>> C fastMapTo(java.util.List<? extends T>, C destination, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public static inline <T, R extends java.lang.Comparable<? super R>> T? fastMaxBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> selector);
+    method public static inline <T> int fastSumBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+  }
+
+  public final class MathHelpersKt {
+    method public static float lerp(float start, float stop, float fraction);
+    method public static int lerp(int start, int stop, float fraction);
+    method public static long lerp(long start, long stop, float fraction);
+  }
+
+}
+

compose/ui/ui-util/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-util/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-util/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..b71072e
--- /dev/null
+++ b/compose/ui/ui-util/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,36 @@
+// Signature format: 4.0
+package androidx.compose.ui.util {
+
+  public final class AndroidTrace_androidKt {
+    method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class InlineClassHelperKt {
+    method public static inline long packFloats(float val1, float val2);
+    method public static inline long packInts(int val1, int val2);
+    method public static inline float unpackFloat1(long value);
+    method public static inline float unpackFloat2(long value);
+    method public static inline int unpackInt1(long value);
+    method public static inline int unpackInt2(long value);
+  }
+
+  public final class ListUtilsKt {
+    method public static inline <T> boolean fastAll(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public static inline <T> boolean fastAny(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public static inline <T> T? fastFirstOrNull(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public static inline <T> void fastForEach(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> action);
+    method public static inline <T> void fastForEachIndexed(java.util.List<? extends T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
+    method public static inline <T, R> java.util.List<R> fastMap(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public static inline <T, R, C extends java.util.Collection<? super R>> C fastMapTo(java.util.List<? extends T>, C destination, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public static inline <T, R extends java.lang.Comparable<? super R>> T? fastMaxBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> selector);
+    method public static inline <T> int fastSumBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+  }
+
+  public final class MathHelpersKt {
+    method public static float lerp(float start, float stop, float fraction);
+    method public static int lerp(int start, int stop, float fraction);
+    method public static long lerp(long start, long stop, float fraction);
+  }
+
+}
+

compose/ui/ui-util/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-util/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-util/api/res-1.0.0-beta04.txt

compose/ui/ui-util/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-util/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-util/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..b71072e
--- /dev/null
+++ b/compose/ui/ui-util/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,36 @@
+// Signature format: 4.0
+package androidx.compose.ui.util {
+
+  public final class AndroidTrace_androidKt {
+    method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class InlineClassHelperKt {
+    method public static inline long packFloats(float val1, float val2);
+    method public static inline long packInts(int val1, int val2);
+    method public static inline float unpackFloat1(long value);
+    method public static inline float unpackFloat2(long value);
+    method public static inline int unpackInt1(long value);
+    method public static inline int unpackInt2(long value);
+  }
+
+  public final class ListUtilsKt {
+    method public static inline <T> boolean fastAll(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public static inline <T> boolean fastAny(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public static inline <T> T? fastFirstOrNull(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+    method public static inline <T> void fastForEach(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> action);
+    method public static inline <T> void fastForEachIndexed(java.util.List<? extends T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
+    method public static inline <T, R> java.util.List<R> fastMap(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public static inline <T, R, C extends java.util.Collection<? super R>> C fastMapTo(java.util.List<? extends T>, C destination, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+    method public static inline <T, R extends java.lang.Comparable<? super R>> T? fastMaxBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> selector);
+    method public static inline <T> int fastSumBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+  }
+
+  public final class MathHelpersKt {
+    method public static float lerp(float start, float stop, float fraction);
+    method public static int lerp(int start, int stop, float fraction);
+    method public static long lerp(long start, long stop, float fraction);
+  }
+
+}
+

compose/ui/ui-viewbinding/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui-viewbinding/api/1.0.0-beta04.txt b/compose/ui/ui-viewbinding/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..07ba909
--- /dev/null
+++ b/compose/ui/ui-viewbinding/api/1.0.0-beta04.txt
@@ -0,0 +1,9 @@
+// Signature format: 4.0
+package androidx.compose.ui.viewinterop {
+
+  public final class AndroidViewBindingKt {
+    method @androidx.compose.runtime.Composable public static <T extends androidx.viewbinding.ViewBinding> void AndroidViewBinding(kotlin.jvm.functions.Function3<? super android.view.LayoutInflater,? super android.view.ViewGroup,? super java.lang.Boolean,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+  }
+
+}
+

compose/ui/ui-viewbinding/api/current.ignore

diff --git a/compose/ui/ui-viewbinding/api/current.ignore b/compose/ui/ui-viewbinding/api/current.ignore
new file mode 100644
index 0000000..0b8fcf4
--- /dev/null
+++ b/compose/ui/ui-viewbinding/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedPackage: androidx.compose.ui.viewinterop.databinding:
+    Removed package androidx.compose.ui.viewinterop.databinding

compose/ui/ui-viewbinding/api/current.txt

diff --git a/compose/ui/ui-viewbinding/api/current.txt b/compose/ui/ui-viewbinding/api/current.txt
index 742107f..07ba909 100644
--- a/compose/ui/ui-viewbinding/api/current.txt
+++ b/compose/ui/ui-viewbinding/api/current.txt
@@ -7,15 +7,3 @@
 
 }
 
-package androidx.compose.ui.viewinterop.databinding {
-
-  public final class TestLayoutBinding implements androidx.viewbinding.ViewBinding {
-    method public static androidx.compose.ui.viewinterop.databinding.TestLayoutBinding bind(android.view.View);
-    method public android.widget.LinearLayout getRoot();
-    method public static androidx.compose.ui.viewinterop.databinding.TestLayoutBinding inflate(android.view.LayoutInflater);
-    method public static androidx.compose.ui.viewinterop.databinding.TestLayoutBinding inflate(android.view.LayoutInflater, android.view.ViewGroup?, boolean);
-    field public final android.widget.FrameLayout second;
-  }
-
-}
-

compose/ui/ui-viewbinding/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui-viewbinding/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui-viewbinding/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..07ba909
--- /dev/null
+++ b/compose/ui/ui-viewbinding/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,9 @@
+// Signature format: 4.0
+package androidx.compose.ui.viewinterop {
+
+  public final class AndroidViewBindingKt {
+    method @androidx.compose.runtime.Composable public static <T extends androidx.viewbinding.ViewBinding> void AndroidViewBinding(kotlin.jvm.functions.Function3<? super android.view.LayoutInflater,? super android.view.ViewGroup,? super java.lang.Boolean,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+  }
+
+}
+

compose/ui/ui-viewbinding/api/public_plus_experimental_current.txt

diff --git a/compose/ui/ui-viewbinding/api/public_plus_experimental_current.txt b/compose/ui/ui-viewbinding/api/public_plus_experimental_current.txt
index 742107f..07ba909 100644
--- a/compose/ui/ui-viewbinding/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-viewbinding/api/public_plus_experimental_current.txt
@@ -7,15 +7,3 @@
 
 }
 
-package androidx.compose.ui.viewinterop.databinding {
-
-  public final class TestLayoutBinding implements androidx.viewbinding.ViewBinding {
-    method public static androidx.compose.ui.viewinterop.databinding.TestLayoutBinding bind(android.view.View);
-    method public android.widget.LinearLayout getRoot();
-    method public static androidx.compose.ui.viewinterop.databinding.TestLayoutBinding inflate(android.view.LayoutInflater);
-    method public static androidx.compose.ui.viewinterop.databinding.TestLayoutBinding inflate(android.view.LayoutInflater, android.view.ViewGroup?, boolean);
-    field public final android.widget.FrameLayout second;
-  }
-
-}
-

compose/ui/ui-viewbinding/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui-viewbinding/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui-viewbinding/api/res-1.0.0-beta04.txt

compose/ui/ui-viewbinding/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui-viewbinding/api/restricted_1.0.0-beta04.txt b/compose/ui/ui-viewbinding/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..07ba909
--- /dev/null
+++ b/compose/ui/ui-viewbinding/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,9 @@
+// Signature format: 4.0
+package androidx.compose.ui.viewinterop {
+
+  public final class AndroidViewBindingKt {
+    method @androidx.compose.runtime.Composable public static <T extends androidx.viewbinding.ViewBinding> void AndroidViewBinding(kotlin.jvm.functions.Function3<? super android.view.LayoutInflater,? super android.view.ViewGroup,? super java.lang.Boolean,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+  }
+
+}
+

compose/ui/ui-viewbinding/api/restricted_current.ignore

diff --git a/compose/ui/ui-viewbinding/api/restricted_current.ignore b/compose/ui/ui-viewbinding/api/restricted_current.ignore
new file mode 100644
index 0000000..0b8fcf4
--- /dev/null
+++ b/compose/ui/ui-viewbinding/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedPackage: androidx.compose.ui.viewinterop.databinding:
+    Removed package androidx.compose.ui.viewinterop.databinding

compose/ui/ui-viewbinding/api/restricted_current.txt

diff --git a/compose/ui/ui-viewbinding/api/restricted_current.txt b/compose/ui/ui-viewbinding/api/restricted_current.txt
index 742107f..07ba909 100644
--- a/compose/ui/ui-viewbinding/api/restricted_current.txt
+++ b/compose/ui/ui-viewbinding/api/restricted_current.txt
@@ -7,15 +7,3 @@
 
 }
 
-package androidx.compose.ui.viewinterop.databinding {
-
-  public final class TestLayoutBinding implements androidx.viewbinding.ViewBinding {
-    method public static androidx.compose.ui.viewinterop.databinding.TestLayoutBinding bind(android.view.View);
-    method public android.widget.LinearLayout getRoot();
-    method public static androidx.compose.ui.viewinterop.databinding.TestLayoutBinding inflate(android.view.LayoutInflater);
-    method public static androidx.compose.ui.viewinterop.databinding.TestLayoutBinding inflate(android.view.LayoutInflater, android.view.ViewGroup?, boolean);
-    field public final android.widget.FrameLayout second;
-  }
-
-}
-

compose/ui/ui-viewbinding/build.gradle

diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle
index 9a0d080..a364142 100644
--- a/compose/ui/ui-viewbinding/build.gradle
+++ b/compose/ui/ui-viewbinding/build.gradle
@@ -31,6 +31,7 @@
 
     implementation(KOTLIN_STDLIB)
     implementation(project(":compose:ui:ui"))
+    implementation(VIEW_BINDING)
 
     androidTestImplementation(project(":compose:foundation:foundation"))
     androidTestImplementation(project(":compose:test-utils"))
@@ -47,9 +48,3 @@
     description = "Compose integration with ViewBinding"
     legacyDisableKotlinStrictApiMode = true
 }
-
-android {
-    buildFeatures {
-        viewBinding true
-    }
-}

compose/ui/ui-viewbinding/samples/build.gradle

diff --git a/compose/ui/ui-viewbinding/samples/build.gradle b/compose/ui/ui-viewbinding/samples/build.gradle
index 93545c3..7c56671e 100644
--- a/compose/ui/ui-viewbinding/samples/build.gradle
+++ b/compose/ui/ui-viewbinding/samples/build.gradle
@@ -34,6 +34,12 @@
     implementation(project(":compose:runtime:runtime"))
     implementation(project(":compose:ui:ui"))
     implementation(project(":compose:ui:ui-viewbinding"))
+
+    androidTestImplementation(project(":compose:foundation:foundation"))
+    androidTestImplementation(project(":compose:test-utils"))
+    androidTestImplementation(ANDROIDX_TEST_RUNNER)
+    androidTestImplementation(JUNIT)
+    androidTestImplementation(TRUTH)
 }
 
 androidx {

compose/ui/ui-viewbinding/samples/src/androidTest/AndroidManifest.xml

diff --git a/compose/ui/ui-viewbinding/src/androidTest/AndroidManifest.xml b/compose/ui/ui-viewbinding/samples/src/androidTest/AndroidManifest.xml
similarity index 90%
rename from compose/ui/ui-viewbinding/src/androidTest/AndroidManifest.xml
rename to compose/ui/ui-viewbinding/samples/src/androidTest/AndroidManifest.xml
index 6e4f4af..f1cd514a 100644
--- a/compose/ui/ui-viewbinding/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-viewbinding/samples/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<manifest package="androidx.compose.ui.viewinterop" />
+<manifest package="androidx.compose.ui.viewbinding.samples" />

compose/ui/ui-viewbinding/samples/src/androidTest/java/androidx/compose/ui/samples/AndroidViewBindingTest.kt

diff --git a/compose/ui/ui-viewbinding/src/androidTest/java/androidx/compose/ui/viewinterop/AndroidViewBindingTest.kt b/compose/ui/ui-viewbinding/samples/src/androidTest/java/androidx/compose/ui/samples/AndroidViewBindingTest.kt
similarity index 89%
rename from compose/ui/ui-viewbinding/src/androidTest/java/androidx/compose/ui/viewinterop/AndroidViewBindingTest.kt
rename to compose/ui/ui-viewbinding/samples/src/androidTest/java/androidx/compose/ui/samples/AndroidViewBindingTest.kt
index 327a41f..f1b25c9 100644
--- a/compose/ui/ui-viewbinding/src/androidTest/java/androidx/compose/ui/viewinterop/AndroidViewBindingTest.kt
+++ b/compose/ui/ui-viewbinding/samples/src/androidTest/java/androidx/compose/ui/samples/AndroidViewBindingTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.compose.ui.viewinterop
+package androidx.compose.ui.samples
 
 import android.os.Build
 import androidx.compose.foundation.layout.requiredSize
@@ -33,7 +33,8 @@
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.databinding.TestLayoutBinding
+import androidx.compose.ui.viewinterop.AndroidViewBinding
+import androidx.compose.ui.viewbinding.samples.databinding.SampleLayoutBinding
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.filters.MediumTest
@@ -54,7 +55,7 @@
     @Test
     fun drawing() {
         rule.setContent {
-            AndroidViewBinding(TestLayoutBinding::inflate, Modifier.testTag("layout"))
+            AndroidViewBinding(SampleLayoutBinding::inflate, Modifier.testTag("layout"))
         }
 
         val size = 50.dp
@@ -69,7 +70,7 @@
     fun update() {
         val color = mutableStateOf(Color.Gray)
         rule.setContent {
-            AndroidViewBinding(TestLayoutBinding::inflate, Modifier.testTag("layout")) {
+            AndroidViewBinding(SampleLayoutBinding::inflate, Modifier.testTag("layout")) {
                 second.setBackgroundColor(color.value.toArgb())
             }
         }
@@ -96,7 +97,7 @@
             val sizeIpx = with(density) { size.roundToPx() }
             CompositionLocalProvider(LocalDensity provides density) {
                 AndroidViewBinding(
-                    TestLayoutBinding::inflate,
+                    SampleLayoutBinding::inflate,
                     Modifier.requiredSize(size).onGloballyPositioned {
                         Truth.assertThat(it.size).isEqualTo(IntSize(sizeIpx, sizeIpx))
                     }

compose/ui/ui-viewbinding/samples/src/main/AndroidManifest.xml

diff --git a/compose/ui/ui-viewbinding/samples/src/main/AndroidManifest.xml b/compose/ui/ui-viewbinding/samples/src/main/AndroidManifest.xml
index 2709cbb..f27fc71 100644
--- a/compose/ui/ui-viewbinding/samples/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-viewbinding/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
   limitations under the License.
   -->
 
-<manifest package="androidx.compose.ui.viewinterop.samples" />
+<manifest package="androidx.compose.ui.viewbinding.samples" />

compose/ui/ui-viewbinding/samples/src/main/java/androidx/compose/ui/samples/AndroidViewBindingSample.kt

diff --git a/compose/ui/ui-viewbinding/samples/src/main/java/androidx/compose/ui/samples/AndroidViewBindingSample.kt b/compose/ui/ui-viewbinding/samples/src/main/java/androidx/compose/ui/samples/AndroidViewBindingSample.kt
index 0449083..1555523 100644
--- a/compose/ui/ui-viewbinding/samples/src/main/java/androidx/compose/ui/samples/AndroidViewBindingSample.kt
+++ b/compose/ui/ui-viewbinding/samples/src/main/java/androidx/compose/ui/samples/AndroidViewBindingSample.kt
@@ -19,8 +19,8 @@
 import android.graphics.Color
 import androidx.annotation.Sampled
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.viewbinding.samples.databinding.SampleLayoutBinding
 import androidx.compose.ui.viewinterop.AndroidViewBinding
-import androidx.compose.ui.viewinterop.samples.databinding.SampleLayoutBinding
 
 @Sampled
 @Composable

compose/ui/ui-viewbinding/src/main/AndroidManifest.xml

diff --git a/compose/ui/ui-viewbinding/src/main/AndroidManifest.xml b/compose/ui/ui-viewbinding/src/main/AndroidManifest.xml
index 6e4f4af..4cfbcc0 100644
--- a/compose/ui/ui-viewbinding/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-viewbinding/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<manifest package="androidx.compose.ui.viewinterop" />
+<manifest package="androidx.compose.ui.viewbinding" />

compose/ui/ui-viewbinding/src/main/res/layout/test_layout.xml

diff --git a/compose/ui/ui-viewbinding/src/main/res/layout/test_layout.xml b/compose/ui/ui-viewbinding/src/main/res/layout/test_layout.xml
deleted file mode 100644
index 85ba5ee..0000000
--- a/compose/ui/ui-viewbinding/src/main/res/layout/test_layout.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2020 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    <FrameLayout
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:background="#0000FF" />
-    <FrameLayout
-        android:id="@+id/second"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:background="#000000" />
-</LinearLayout>
\ No newline at end of file

compose/ui/ui/OWNERS

diff --git a/compose/ui/ui/OWNERS b/compose/ui/ui/OWNERS
index b86acbe..b5ee4d5 100644
--- a/compose/ui/ui/OWNERS
+++ b/compose/ui/ui/OWNERS
@@ -5,7 +5,6 @@
 popam@google.com
 ralu@google.com
 ryanmentley@google.com
-shepshapard@google.com
 tianliu@google.com
 
 # For Material related files

compose/ui/ui/api/1.0.0-beta04.txt

diff --git a/compose/ui/ui/api/1.0.0-beta04.txt b/compose/ui/ui/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..27cc180
--- /dev/null
+++ b/compose/ui/ui/api/1.0.0-beta04.txt
@@ -0,0 +1,2487 @@
+// Signature format: 4.0
+package androidx.compose.ui {
+
+  public final class AbsoluteAlignment {
+    method public androidx.compose.ui.Alignment getBottomLeft();
+    method public androidx.compose.ui.Alignment getBottomRight();
+    method public androidx.compose.ui.Alignment getCenterLeft();
+    method public androidx.compose.ui.Alignment getCenterRight();
+    method public androidx.compose.ui.Alignment.Horizontal getLeft();
+    method public androidx.compose.ui.Alignment.Horizontal getRight();
+    method public androidx.compose.ui.Alignment getTopLeft();
+    method public androidx.compose.ui.Alignment getTopRight();
+    property public final androidx.compose.ui.Alignment BottomLeft;
+    property public final androidx.compose.ui.Alignment BottomRight;
+    property public final androidx.compose.ui.Alignment CenterLeft;
+    property public final androidx.compose.ui.Alignment CenterRight;
+    property public final androidx.compose.ui.Alignment.Horizontal Left;
+    property public final androidx.compose.ui.Alignment.Horizontal Right;
+    property public final androidx.compose.ui.Alignment TopLeft;
+    property public final androidx.compose.ui.Alignment TopRight;
+    field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public fun interface Alignment {
+    method public long align-oYSo38o(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    field public static final androidx.compose.ui.Alignment.Companion Companion;
+  }
+
+  public static final class Alignment.Companion {
+    method public androidx.compose.ui.Alignment.Vertical getBottom();
+    method public androidx.compose.ui.Alignment getBottomCenter();
+    method public androidx.compose.ui.Alignment getBottomEnd();
+    method public androidx.compose.ui.Alignment getBottomStart();
+    method public androidx.compose.ui.Alignment getCenter();
+    method public androidx.compose.ui.Alignment getCenterEnd();
+    method public androidx.compose.ui.Alignment.Horizontal getCenterHorizontally();
+    method public androidx.compose.ui.Alignment getCenterStart();
+    method public androidx.compose.ui.Alignment.Vertical getCenterVertically();
+    method public androidx.compose.ui.Alignment.Horizontal getEnd();
+    method public androidx.compose.ui.Alignment.Horizontal getStart();
+    method public androidx.compose.ui.Alignment.Vertical getTop();
+    method public androidx.compose.ui.Alignment getTopCenter();
+    method public androidx.compose.ui.Alignment getTopEnd();
+    method public androidx.compose.ui.Alignment getTopStart();
+    property public final androidx.compose.ui.Alignment.Vertical Bottom;
+    property public final androidx.compose.ui.Alignment BottomCenter;
+    property public final androidx.compose.ui.Alignment BottomEnd;
+    property public final androidx.compose.ui.Alignment BottomStart;
+    property public final androidx.compose.ui.Alignment Center;
+    property public final androidx.compose.ui.Alignment CenterEnd;
+    property public final androidx.compose.ui.Alignment.Horizontal CenterHorizontally;
+    property public final androidx.compose.ui.Alignment CenterStart;
+    property public final androidx.compose.ui.Alignment.Vertical CenterVertically;
+    property public final androidx.compose.ui.Alignment.Horizontal End;
+    property public final androidx.compose.ui.Alignment.Horizontal Start;
+    property public final androidx.compose.ui.Alignment.Vertical Top;
+    property public final androidx.compose.ui.Alignment TopCenter;
+    property public final androidx.compose.ui.Alignment TopEnd;
+    property public final androidx.compose.ui.Alignment TopStart;
+  }
+
+  @androidx.compose.runtime.Immutable public static fun interface Alignment.Horizontal {
+    method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  @androidx.compose.runtime.Immutable public static fun interface Alignment.Vertical {
+    method public int align(int size, int space);
+  }
+
+  @androidx.compose.runtime.Immutable public final class BiasAbsoluteAlignment implements androidx.compose.ui.Alignment {
+    ctor public BiasAbsoluteAlignment(float horizontalBias, float verticalBias);
+    method public long align-oYSo38o(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAbsoluteAlignment copy(float horizontalBias, float verticalBias);
+  }
+
+  @androidx.compose.runtime.Immutable public static final class BiasAbsoluteAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+    ctor public BiasAbsoluteAlignment.Horizontal(float bias);
+    method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAbsoluteAlignment.Horizontal copy(float bias);
+  }
+
+  @androidx.compose.runtime.Immutable public final class BiasAlignment implements androidx.compose.ui.Alignment {
+    ctor public BiasAlignment(float horizontalBias, float verticalBias);
+    method public long align-oYSo38o(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAlignment copy(float horizontalBias, float verticalBias);
+    method public float getHorizontalBias();
+    method public float getVerticalBias();
+    property public final float horizontalBias;
+    property public final float verticalBias;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class BiasAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+    ctor public BiasAlignment.Horizontal(float bias);
+    method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAlignment.Horizontal copy(float bias);
+  }
+
+  @androidx.compose.runtime.Immutable public static final class BiasAlignment.Vertical implements androidx.compose.ui.Alignment.Vertical {
+    ctor public BiasAlignment.Vertical(float bias);
+    method public int align(int size, int space);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAlignment.Vertical copy(float bias);
+  }
+
+  public final class CombinedModifier implements androidx.compose.ui.Modifier {
+    ctor public CombinedModifier(androidx.compose.ui.Modifier outer, androidx.compose.ui.Modifier inner);
+    method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public final class ComposedModifierKt {
+    method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+    method public static androidx.compose.ui.Modifier materialize(androidx.compose.runtime.Composer, androidx.compose.ui.Modifier modifier);
+  }
+
+  @androidx.compose.runtime.Stable public interface Modifier {
+    method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+    method public default infix androidx.compose.ui.Modifier then(androidx.compose.ui.Modifier other);
+    field public static final androidx.compose.ui.Modifier.Companion Companion;
+  }
+
+  public static final class Modifier.Companion implements androidx.compose.ui.Modifier {
+    method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public static interface Modifier.Element extends androidx.compose.ui.Modifier {
+    method public default boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public default boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public default <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public default <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+  public final class ZIndexModifierKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier zIndex(androidx.compose.ui.Modifier, float zIndex);
+  }
+
+}
+
+package androidx.compose.ui.autofill {
+
+  public final class AndroidAutofillDebugUtils_androidKt {
+  }
+
+  public final class AndroidAutofillType_androidKt {
+  }
+
+  public final class AndroidAutofill_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.draw {
+
+  public final class AlphaKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier alpha(androidx.compose.ui.Modifier, float alpha);
+  }
+
+  public interface BuildDrawCacheParams {
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public long getSize-NH-jbRc();
+    property public abstract androidx.compose.ui.unit.Density density;
+    property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public abstract long size;
+  }
+
+  public final class CacheDrawScope implements androidx.compose.ui.unit.Density {
+    method public float getDensity();
+    method public float getFontScale();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public long getSize-NH-jbRc();
+    method public androidx.compose.ui.draw.DrawResult onDrawBehind(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public androidx.compose.ui.draw.DrawResult onDrawWithContent(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> block);
+    property public float density;
+    property public float fontScale;
+    property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public final long size;
+  }
+
+  public final class ClipKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clip(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Shape shape);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clipToBounds(androidx.compose.ui.Modifier);
+  }
+
+  public interface DrawCacheModifier extends androidx.compose.ui.draw.DrawModifier {
+    method public void onBuildCache(androidx.compose.ui.draw.BuildDrawCacheParams params);
+  }
+
+  public interface DrawModifier extends androidx.compose.ui.Modifier.Element {
+    method public void draw(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+  }
+
+  public final class DrawModifierKt {
+    method public static androidx.compose.ui.Modifier drawBehind(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+    method public static androidx.compose.ui.Modifier drawWithCache(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.draw.CacheDrawScope,androidx.compose.ui.draw.DrawResult> onBuildDrawCache);
+    method public static androidx.compose.ui.Modifier drawWithContent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> onDraw);
+  }
+
+  public final class DrawResult {
+  }
+
+  public final class PainterModifierKt {
+    method public static androidx.compose.ui.Modifier paint(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.painter.Painter painter, optional boolean sizeToIntrinsics, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+  }
+
+  public final class RotateKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier rotate(androidx.compose.ui.Modifier, float degrees);
+  }
+
+  public final class ScaleKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scaleX, float scaleY);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scale);
+  }
+
+  public final class ShadowKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier shadow-HfQes2E(androidx.compose.ui.Modifier, float elevation, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+  }
+
+}
+
+package androidx.compose.ui.focus {
+
+  public final class FocusChangedModifierKt {
+    method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
+  }
+
+  public enum FocusDirection {
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Down;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Left;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Next;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Previous;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Right;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Up;
+  }
+
+  public interface FocusEventModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onFocusEvent(androidx.compose.ui.focus.FocusState focusState);
+  }
+
+  public final class FocusEventModifierKt {
+    method public static androidx.compose.ui.Modifier onFocusEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusEvent);
+  }
+
+  public interface FocusManager {
+    method public void clearFocus(optional boolean forcedClear);
+    method public boolean moveFocus(androidx.compose.ui.focus.FocusDirection focusDirection);
+  }
+
+  public final class FocusModifierKt {
+    method public static androidx.compose.ui.Modifier focusModifier(androidx.compose.ui.Modifier);
+  }
+
+  public final class FocusNodeUtilsKt {
+  }
+
+  public final class FocusOrder {
+    ctor public FocusOrder();
+    method public androidx.compose.ui.focus.FocusRequester getDown();
+    method public androidx.compose.ui.focus.FocusRequester getEnd();
+    method public androidx.compose.ui.focus.FocusRequester getLeft();
+    method public androidx.compose.ui.focus.FocusRequester getNext();
+    method public androidx.compose.ui.focus.FocusRequester getPrevious();
+    method public androidx.compose.ui.focus.FocusRequester getRight();
+    method public androidx.compose.ui.focus.FocusRequester getStart();
+    method public androidx.compose.ui.focus.FocusRequester getUp();
+    method public void setDown(androidx.compose.ui.focus.FocusRequester p);
+    method public void setEnd(androidx.compose.ui.focus.FocusRequester p);
+    method public void setLeft(androidx.compose.ui.focus.FocusRequester p);
+    method public void setNext(androidx.compose.ui.focus.FocusRequester p);
+    method public void setPrevious(androidx.compose.ui.focus.FocusRequester p);
+    method public void setRight(androidx.compose.ui.focus.FocusRequester p);
+    method public void setStart(androidx.compose.ui.focus.FocusRequester p);
+    method public void setUp(androidx.compose.ui.focus.FocusRequester p);
+    property public final androidx.compose.ui.focus.FocusRequester down;
+    property public final androidx.compose.ui.focus.FocusRequester end;
+    property public final androidx.compose.ui.focus.FocusRequester left;
+    property public final androidx.compose.ui.focus.FocusRequester next;
+    property public final androidx.compose.ui.focus.FocusRequester previous;
+    property public final androidx.compose.ui.focus.FocusRequester right;
+    property public final androidx.compose.ui.focus.FocusRequester start;
+    property public final androidx.compose.ui.focus.FocusRequester up;
+  }
+
+  public interface FocusOrderModifier extends androidx.compose.ui.Modifier.Element {
+    method public void populateFocusOrder(androidx.compose.ui.focus.FocusOrder focusOrder);
+  }
+
+  public final class FocusOrderModifierKt {
+    method public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+    method public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+    method public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+  }
+
+  public final class FocusRequester {
+    ctor public FocusRequester();
+    method public boolean captureFocus();
+    method public boolean freeFocus();
+    method public void requestFocus();
+    field public static final androidx.compose.ui.focus.FocusRequester.Companion Companion;
+  }
+
+  public static final class FocusRequester.Companion {
+    method public androidx.compose.ui.focus.FocusRequester getDefault();
+    property public final androidx.compose.ui.focus.FocusRequester Default;
+  }
+
+  public final class FocusRequesterKt {
+  }
+
+  public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
+    method public androidx.compose.ui.focus.FocusRequester getFocusRequester();
+    property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
+  }
+
+  public final class FocusRequesterModifierKt {
+    method public static androidx.compose.ui.Modifier focusRequester(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+  }
+
+  public enum FocusState {
+    enum_constant public static final androidx.compose.ui.focus.FocusState Active;
+    enum_constant public static final androidx.compose.ui.focus.FocusState ActiveParent;
+    enum_constant public static final androidx.compose.ui.focus.FocusState Captured;
+    enum_constant public static final androidx.compose.ui.focus.FocusState Disabled;
+    enum_constant public static final androidx.compose.ui.focus.FocusState Inactive;
+  }
+
+  public final class FocusStateKt {
+    method public static boolean isFocused(androidx.compose.ui.focus.FocusState);
+  }
+
+  public final class FocusTransactionsKt {
+  }
+
+  public final class FocusTraversalKt {
+  }
+
+}
+
+package androidx.compose.ui.graphics {
+
+  public final class GraphicsLayerModifierKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> block);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer-i_P0lGk(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier toolingGraphicsLayer(androidx.compose.ui.Modifier);
+  }
+
+  public interface GraphicsLayerScope extends androidx.compose.ui.unit.Density {
+    method public float getAlpha();
+    method public float getCameraDistance();
+    method public boolean getClip();
+    method public float getRotationX();
+    method public float getRotationY();
+    method public float getRotationZ();
+    method public float getScaleX();
+    method public float getScaleY();
+    method public float getShadowElevation();
+    method public androidx.compose.ui.graphics.Shape getShape();
+    method public long getTransformOrigin-SzJe1aQ();
+    method public float getTranslationX();
+    method public float getTranslationY();
+    method public void setAlpha(float p);
+    method public void setCameraDistance(float p);
+    method public void setClip(boolean p);
+    method public void setRotationX(float p);
+    method public void setRotationY(float p);
+    method public void setRotationZ(float p);
+    method public void setScaleX(float p);
+    method public void setScaleY(float p);
+    method public void setShadowElevation(float p);
+    method public void setShape(androidx.compose.ui.graphics.Shape p);
+    method public void setTransformOrigin-__ExYCQ(long p);
+    method public void setTranslationX(float p);
+    method public void setTranslationY(float p);
+    property public abstract float alpha;
+    property public abstract float cameraDistance;
+    property public abstract boolean clip;
+    property public abstract float rotationX;
+    property public abstract float rotationY;
+    property public abstract float rotationZ;
+    property public abstract float scaleX;
+    property public abstract float scaleY;
+    property public abstract float shadowElevation;
+    property public abstract androidx.compose.ui.graphics.Shape shape;
+    property public abstract long transformOrigin;
+    property public abstract float translationX;
+    property public abstract float translationY;
+  }
+
+  public final class GraphicsLayerScopeKt {
+    method public static androidx.compose.ui.graphics.GraphicsLayerScope GraphicsLayerScope();
+    field public static final float DefaultCameraDistance = 8.0f;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class TransformOrigin {
+    ctor public TransformOrigin();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-SzJe1aQ(long $this, optional float pivotFractionX, optional float pivotFractionY);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getPivotFractionX-impl(long $this);
+    method public static float getPivotFractionY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Immutable public static inline String! toString-impl(long p);
+    field public static final androidx.compose.ui.graphics.TransformOrigin.Companion Companion;
+  }
+
+  public static final class TransformOrigin.Companion {
+    method public long getCenter-SzJe1aQ();
+    property public final long Center;
+  }
+
+  public final class TransformOriginKt {
+    method public static long TransformOrigin(float pivotFractionX, float pivotFractionY);
+  }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+  public final class AnimatorKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class ImageVector {
+    method public float getDefaultHeight-D9Ej5fM();
+    method public float getDefaultWidth-D9Ej5fM();
+    method public String getName();
+    method public androidx.compose.ui.graphics.vector.VectorGroup getRoot();
+    method public androidx.compose.ui.graphics.BlendMode getTintBlendMode();
+    method public long getTintColor-0d7_KjU();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+    property public final float defaultHeight;
+    property public final float defaultWidth;
+    property public final String name;
+    property public final androidx.compose.ui.graphics.vector.VectorGroup root;
+    property public final androidx.compose.ui.graphics.BlendMode tintBlendMode;
+    property public final long tintColor;
+    property public final float viewportHeight;
+    property public final float viewportWidth;
+    field public static final androidx.compose.ui.graphics.vector.ImageVector.Companion Companion;
+  }
+
+  public static final class ImageVector.Builder {
+    method public androidx.compose.ui.graphics.vector.ImageVector.Builder addGroup(optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData);
+    method public androidx.compose.ui.graphics.vector.ImageVector.Builder addPath(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional androidx.compose.ui.graphics.PathFillType pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional androidx.compose.ui.graphics.StrokeCap strokeLineCap, optional androidx.compose.ui.graphics.StrokeJoin strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+    method public androidx.compose.ui.graphics.vector.ImageVector build();
+    method public androidx.compose.ui.graphics.vector.ImageVector.Builder clearGroup();
+  }
+
+  public static final class ImageVector.Companion {
+  }
+
+  public final class ImageVectorKt {
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder group(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,kotlin.Unit> block);
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder path(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional androidx.compose.ui.graphics.StrokeCap strokeLineCap, optional androidx.compose.ui.graphics.StrokeJoin strokeLineJoin, optional float strokeLineMiter, optional androidx.compose.ui.graphics.PathFillType pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+  public abstract sealed class VNode {
+    method public abstract void draw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    method public final void invalidate();
+  }
+
+  public final class VectorApplier extends androidx.compose.runtime.AbstractApplier<androidx.compose.ui.graphics.vector.VNode> {
+    ctor public VectorApplier(androidx.compose.ui.graphics.vector.VNode root);
+    method public void insertBottomUp(int index, androidx.compose.ui.graphics.vector.VNode instance);
+    method public void insertTopDown(int index, androidx.compose.ui.graphics.vector.VNode instance);
+    method public void move(int from, int to, int count);
+    method protected void onClear();
+    method public void remove(int index, int count);
+  }
+
+  public final class VectorComposeKt {
+    method @androidx.compose.runtime.Composable public static void Group(optional String name, optional float rotation, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Path(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional androidx.compose.ui.graphics.PathFillType pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional androidx.compose.ui.graphics.StrokeCap strokeLineCap, optional androidx.compose.ui.graphics.StrokeJoin strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+  }
+
+  @androidx.compose.runtime.Immutable public final class VectorGroup extends androidx.compose.ui.graphics.vector.VectorNode implements java.lang.Iterable<androidx.compose.ui.graphics.vector.VectorNode> kotlin.jvm.internal.markers.KMappedMarker {
+    method public operator androidx.compose.ui.graphics.vector.VectorNode get(int index);
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getClipPathData();
+    method public String getName();
+    method public float getPivotX();
+    method public float getPivotY();
+    method public float getRotation();
+    method public float getScaleX();
+    method public float getScaleY();
+    method public int getSize();
+    method public float getTranslationX();
+    method public float getTranslationY();
+    method public java.util.Iterator<androidx.compose.ui.graphics.vector.VectorNode> iterator();
+    property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> clipPathData;
+    property public final String name;
+    property public final float pivotX;
+    property public final float pivotY;
+    property public final float rotation;
+    property public final float scaleX;
+    property public final float scaleY;
+    property public final int size;
+    property public final float translationX;
+    property public final float translationY;
+  }
+
+  public final class VectorKt {
+    method public static inline java.util.List<androidx.compose.ui.graphics.vector.PathNode> PathData(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> block);
+    method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> addPathNodes(String? pathStr);
+    method public static androidx.compose.ui.graphics.PathFillType getDefaultFillType();
+    method public static androidx.compose.ui.graphics.StrokeCap getDefaultStrokeLineCap();
+    method public static androidx.compose.ui.graphics.StrokeJoin getDefaultStrokeLineJoin();
+    method public static androidx.compose.ui.graphics.BlendMode getDefaultTintBlendMode();
+    method public static long getDefaultTintColor();
+    method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> getEmptyPath();
+    field public static final String DefaultGroupName = "";
+    field public static final String DefaultPathName = "";
+    field public static final float DefaultPivotX = 0.0f;
+    field public static final float DefaultPivotY = 0.0f;
+    field public static final float DefaultRotation = 0.0f;
+    field public static final float DefaultScaleX = 1.0f;
+    field public static final float DefaultScaleY = 1.0f;
+    field public static final float DefaultStrokeLineMiter = 4.0f;
+    field public static final float DefaultStrokeLineWidth = 0.0f;
+    field public static final float DefaultTranslationX = 0.0f;
+    field public static final float DefaultTranslationY = 0.0f;
+    field public static final float DefaultTrimPathEnd = 1.0f;
+    field public static final float DefaultTrimPathOffset = 0.0f;
+    field public static final float DefaultTrimPathStart = 0.0f;
+  }
+
+  public abstract sealed class VectorNode {
+  }
+
+  public final class VectorPainter extends androidx.compose.ui.graphics.painter.Painter {
+    method public long getIntrinsicSize-NH-jbRc();
+    method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public long intrinsicSize;
+  }
+
+  public final class VectorPainterKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(androidx.compose.ui.graphics.vector.ImageVector image);
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter-u_AqRoo(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional androidx.compose.ui.graphics.BlendMode tintBlendMode, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+    field public static final String RootGroupName = "VectorRootGroup";
+  }
+
+  @androidx.compose.runtime.Immutable public final class VectorPath extends androidx.compose.ui.graphics.vector.VectorNode {
+    method public androidx.compose.ui.graphics.Brush? getFill();
+    method public float getFillAlpha();
+    method public String getName();
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getPathData();
+    method public androidx.compose.ui.graphics.PathFillType getPathFillType();
+    method public androidx.compose.ui.graphics.Brush? getStroke();
+    method public float getStrokeAlpha();
+    method public androidx.compose.ui.graphics.StrokeCap getStrokeLineCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getStrokeLineJoin();
+    method public float getStrokeLineMiter();
+    method public float getStrokeLineWidth();
+    method public float getTrimPathEnd();
+    method public float getTrimPathOffset();
+    method public float getTrimPathStart();
+    property public final androidx.compose.ui.graphics.Brush? fill;
+    property public final float fillAlpha;
+    property public final String name;
+    property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> pathData;
+    property public final androidx.compose.ui.graphics.PathFillType pathFillType;
+    property public final androidx.compose.ui.graphics.Brush? stroke;
+    property public final float strokeAlpha;
+    property public final androidx.compose.ui.graphics.StrokeCap strokeLineCap;
+    property public final androidx.compose.ui.graphics.StrokeJoin strokeLineJoin;
+    property public final float strokeLineMiter;
+    property public final float strokeLineWidth;
+    property public final float trimPathEnd;
+    property public final float trimPathOffset;
+    property public final float trimPathStart;
+  }
+
+}
+
+package androidx.compose.ui.graphics.vector.compat {
+
+  public final class XmlAnimatedVectorParser_androidKt {
+  }
+
+  public final class XmlAnimatorParser_androidKt {
+  }
+
+  public final class XmlPullParserUtils_androidKt {
+  }
+
+  public final class XmlVectorParser_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.hapticfeedback {
+
+  public interface HapticFeedback {
+    method public void performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType hapticFeedbackType);
+  }
+
+  public enum HapticFeedbackType {
+    enum_constant public static final androidx.compose.ui.hapticfeedback.HapticFeedbackType LongPress;
+    enum_constant public static final androidx.compose.ui.hapticfeedback.HapticFeedbackType TextHandleMove;
+  }
+
+}
+
+package androidx.compose.ui.input.key {
+
+  public final inline class Key {
+    ctor public Key();
+    method public static long constructor-impl(long keyCode);
+    method public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getKeyCode();
+    method public static inline int hashCode-impl(long p);
+    method public static String toString-impl(long $this);
+    property public final long keyCode;
+    field public static final androidx.compose.ui.input.key.Key.Companion Companion;
+  }
+
+  public static final class Key.Companion {
+    method public long getA-EK5gGoQ();
+    method public long getAllApps-EK5gGoQ();
+    method public long getAltLeft-EK5gGoQ();
+    method public long getAltRight-EK5gGoQ();
+    method public long getApostrophe-EK5gGoQ();
+    method public long getAppSwitch-EK5gGoQ();
+    method public long getAssist-EK5gGoQ();
+    method public long getAt-EK5gGoQ();
+    method public long getAvReceiverInput-EK5gGoQ();
+    method public long getAvReceiverPower-EK5gGoQ();
+    method public long getB-EK5gGoQ();
+    method public long getBack-EK5gGoQ();
+    method public long getBackslash-EK5gGoQ();
+    method public long getBackspace-EK5gGoQ();
+    method public long getBookmark-EK5gGoQ();
+    method public long getBreak-EK5gGoQ();
+    method public long getBrightnessDown-EK5gGoQ();
+    method public long getBrightnessUp-EK5gGoQ();
+    method public long getBrowser-EK5gGoQ();
+    method public long getButton1-EK5gGoQ();
+    method public long getButton10-EK5gGoQ();
+    method public long getButton11-EK5gGoQ();
+    method public long getButton12-EK5gGoQ();
+    method public long getButton13-EK5gGoQ();
+    method public long getButton14-EK5gGoQ();
+    method public long getButton15-EK5gGoQ();
+    method public long getButton16-EK5gGoQ();
+    method public long getButton2-EK5gGoQ();
+    method public long getButton3-EK5gGoQ();
+    method public long getButton4-EK5gGoQ();
+    method public long getButton5-EK5gGoQ();
+    method public long getButton6-EK5gGoQ();
+    method public long getButton7-EK5gGoQ();
+    method public long getButton8-EK5gGoQ();
+    method public long getButton9-EK5gGoQ();
+    method public long getButtonA-EK5gGoQ();
+    method public long getButtonB-EK5gGoQ();
+    method public long getButtonC-EK5gGoQ();
+    method public long getButtonL1-EK5gGoQ();
+    method public long getButtonL2-EK5gGoQ();
+    method public long getButtonMode-EK5gGoQ();
+    method public long getButtonR1-EK5gGoQ();
+    method public long getButtonR2-EK5gGoQ();
+    method public long getButtonSelect-EK5gGoQ();
+    method public long getButtonStart-EK5gGoQ();
+    method public long getButtonThumbLeft-EK5gGoQ();
+    method public long getButtonThumbRight-EK5gGoQ();
+    method public long getButtonX-EK5gGoQ();
+    method public long getButtonY-EK5gGoQ();
+    method public long getButtonZ-EK5gGoQ();
+    method public long getC-EK5gGoQ();
+    method public long getCalculator-EK5gGoQ();
+    method public long getCalendar-EK5gGoQ();
+    method public long getCall-EK5gGoQ();
+    method public long getCamera-EK5gGoQ();
+    method public long getCapsLock-EK5gGoQ();
+    method public long getCaptions-EK5gGoQ();
+    method public long getChannelDown-EK5gGoQ();
+    method public long getChannelUp-EK5gGoQ();
+    method public long getClear-EK5gGoQ();
+    method public long getComma-EK5gGoQ();
+    method public long getContacts-EK5gGoQ();
+    method public long getCopy-EK5gGoQ();
+    method public long getCtrlLeft-EK5gGoQ();
+    method public long getCtrlRight-EK5gGoQ();
+    method public long getCut-EK5gGoQ();
+    method public long getD-EK5gGoQ();
+    method public long getDelete-EK5gGoQ();
+    method public long getDirectionCenter-EK5gGoQ();
+    method public long getDirectionDown-EK5gGoQ();
+    method public long getDirectionDownLeft-EK5gGoQ();
+    method public long getDirectionDownRight-EK5gGoQ();
+    method public long getDirectionLeft-EK5gGoQ();
+    method public long getDirectionRight-EK5gGoQ();
+    method public long getDirectionUp-EK5gGoQ();
+    method public long getDirectionUpLeft-EK5gGoQ();
+    method public long getDirectionUpRight-EK5gGoQ();
+    method public long getDvr-EK5gGoQ();
+    method public long getE-EK5gGoQ();
+    method public long getEight-EK5gGoQ();
+    method public long getEisu-EK5gGoQ();
+    method public long getEndCall-EK5gGoQ();
+    method public long getEnter-EK5gGoQ();
+    method public long getEnvelope-EK5gGoQ();
+    method public long getEquals-EK5gGoQ();
+    method public long getEscape-EK5gGoQ();
+    method public long getF-EK5gGoQ();
+    method public long getF1-EK5gGoQ();
+    method public long getF10-EK5gGoQ();
+    method public long getF11-EK5gGoQ();
+    method public long getF12-EK5gGoQ();
+    method public long getF2-EK5gGoQ();
+    method public long getF3-EK5gGoQ();
+    method public long getF4-EK5gGoQ();
+    method public long getF5-EK5gGoQ();
+    method public long getF6-EK5gGoQ();
+    method public long getF7-EK5gGoQ();
+    method public long getF8-EK5gGoQ();
+    method public long getF9-EK5gGoQ();
+    method public long getFive-EK5gGoQ();
+    method public long getFocus-EK5gGoQ();
+    method public long getForward-EK5gGoQ();
+    method public long getFour-EK5gGoQ();
+    method public long getFunction-EK5gGoQ();
+    method public long getG-EK5gGoQ();
+    method public long getGrave-EK5gGoQ();
+    method public long getGuide-EK5gGoQ();
+    method public long getH-EK5gGoQ();
+    method public long getHeadsetHook-EK5gGoQ();
+    method public long getHelp-EK5gGoQ();
+    method public long getHenkan-EK5gGoQ();
+    method public long getHome-EK5gGoQ();
+    method public long getI-EK5gGoQ();
+    method public long getInfo-EK5gGoQ();
+    method public long getInsert-EK5gGoQ();
+    method public long getJ-EK5gGoQ();
+    method public long getK-EK5gGoQ();
+    method public long getKana-EK5gGoQ();
+    method public long getKatakanaHiragana-EK5gGoQ();
+    method public long getL-EK5gGoQ();
+    method public long getLanguageSwitch-EK5gGoQ();
+    method public long getLastChannel-EK5gGoQ();
+    method public long getLeftBracket-EK5gGoQ();
+    method public long getM-EK5gGoQ();
+    method public long getMannerMode-EK5gGoQ();
+    method public long getMediaAudioTrack-EK5gGoQ();
+    method public long getMediaClose-EK5gGoQ();
+    method public long getMediaEject-EK5gGoQ();
+    method public long getMediaFastForward-EK5gGoQ();
+    method public long getMediaNext-EK5gGoQ();
+    method public long getMediaPause-EK5gGoQ();
+    method public long getMediaPlay-EK5gGoQ();
+    method public long getMediaPlayPause-EK5gGoQ();
+    method public long getMediaPrevious-EK5gGoQ();
+    method public long getMediaRecord-EK5gGoQ();
+    method public long getMediaRewind-EK5gGoQ();
+    method public long getMediaSkipBackward-EK5gGoQ();
+    method public long getMediaSkipForward-EK5gGoQ();
+    method public long getMediaStepBackward-EK5gGoQ();
+    method public long getMediaStepForward-EK5gGoQ();
+    method public long getMediaStop-EK5gGoQ();
+    method public long getMediaTopMenu-EK5gGoQ();
+    method public long getMenu-EK5gGoQ();
+    method public long getMetaLeft-EK5gGoQ();
+    method public long getMetaRight-EK5gGoQ();
+    method public long getMicrophoneMute-EK5gGoQ();
+    method public long getMinus-EK5gGoQ();
+    method public long getMoveEnd-EK5gGoQ();
+    method public long getMoveHome-EK5gGoQ();
+    method public long getMuhenkan-EK5gGoQ();
+    method public long getMultiply-EK5gGoQ();
+    method public long getMusic-EK5gGoQ();
+    method public long getN-EK5gGoQ();
+    method public long getNavigateIn-EK5gGoQ();
+    method public long getNavigateNext-EK5gGoQ();
+    method public long getNavigateOut-EK5gGoQ();
+    method public long getNavigatePrevious-EK5gGoQ();
+    method public long getNine-EK5gGoQ();
+    method public long getNotification-EK5gGoQ();
+    method public long getNumLock-EK5gGoQ();
+    method public long getNumPad0-EK5gGoQ();
+    method public long getNumPad1-EK5gGoQ();
+    method public long getNumPad2-EK5gGoQ();
+    method public long getNumPad3-EK5gGoQ();
+    method public long getNumPad4-EK5gGoQ();
+    method public long getNumPad5-EK5gGoQ();
+    method public long getNumPad6-EK5gGoQ();
+    method public long getNumPad7-EK5gGoQ();
+    method public long getNumPad8-EK5gGoQ();
+    method public long getNumPad9-EK5gGoQ();
+    method public long getNumPadAdd-EK5gGoQ();
+    method public long getNumPadComma-EK5gGoQ();
+    method public long getNumPadDivide-EK5gGoQ();
+    method public long getNumPadDot-EK5gGoQ();
+    method public long getNumPadEnter-EK5gGoQ();
+    method public long getNumPadEquals-EK5gGoQ();
+    method public long getNumPadLeftParenthesis-EK5gGoQ();
+    method public long getNumPadMultiply-EK5gGoQ();
+    method public long getNumPadRightParenthesis-EK5gGoQ();
+    method public long getNumPadSubtract-EK5gGoQ();
+    method public long getNumber-EK5gGoQ();
+    method public long getO-EK5gGoQ();
+    method public long getOne-EK5gGoQ();
+    method public long getP-EK5gGoQ();
+    method public long getPageDown-EK5gGoQ();
+    method public long getPageUp-EK5gGoQ();
+    method public long getPairing-EK5gGoQ();
+    method public long getPaste-EK5gGoQ();
+    method public long getPeriod-EK5gGoQ();
+    method public long getPictureSymbols-EK5gGoQ();
+    method public long getPlus-EK5gGoQ();
+    method public long getPound-EK5gGoQ();
+    method public long getPower-EK5gGoQ();
+    method public long getPrintScreen-EK5gGoQ();
+    method public long getProfileSwitch-EK5gGoQ();
+    method public long getProgramBlue-EK5gGoQ();
+    method public long getProgramGreen-EK5gGoQ();
+    method public long getProgramRed-EK5gGoQ();
+    method public long getProgramYellow-EK5gGoQ();
+    method public long getQ-EK5gGoQ();
+    method public long getR-EK5gGoQ();
+    method public long getRefresh-EK5gGoQ();
+    method public long getRightBracket-EK5gGoQ();
+    method public long getRo-EK5gGoQ();
+    method public long getS-EK5gGoQ();
+    method public long getScrollLock-EK5gGoQ();
+    method public long getSearch-EK5gGoQ();
+    method public long getSemicolon-EK5gGoQ();
+    method public long getSetTopBoxInput-EK5gGoQ();
+    method public long getSetTopBoxPower-EK5gGoQ();
+    method public long getSettings-EK5gGoQ();
+    method public long getSeven-EK5gGoQ();
+    method public long getShiftLeft-EK5gGoQ();
+    method public long getShiftRight-EK5gGoQ();
+    method public long getSix-EK5gGoQ();
+    method public long getSlash-EK5gGoQ();
+    method public long getSleep-EK5gGoQ();
+    method public long getSoftLeft-EK5gGoQ();
+    method public long getSoftRight-EK5gGoQ();
+    method public long getSoftSleep-EK5gGoQ();
+    method public long getSpacebar-EK5gGoQ();
+    method public long getStem1-EK5gGoQ();
+    method public long getStem2-EK5gGoQ();
+    method public long getStem3-EK5gGoQ();
+    method public long getStemPrimary-EK5gGoQ();
+    method public long getSwitchCharset-EK5gGoQ();
+    method public long getSymbol-EK5gGoQ();
+    method public long getSystemNavigationDown-EK5gGoQ();
+    method public long getSystemNavigationLeft-EK5gGoQ();
+    method public long getSystemNavigationRight-EK5gGoQ();
+    method public long getSystemNavigationUp-EK5gGoQ();
+    method public long getT-EK5gGoQ();
+    method public long getTab-EK5gGoQ();
+    method public long getThree-EK5gGoQ();
+    method public long getThumbsDown-EK5gGoQ();
+    method public long getThumbsUp-EK5gGoQ();
+    method public long getToggle2D3D-EK5gGoQ();
+    method public long getTv-EK5gGoQ();
+    method public long getTvAntennaCable-EK5gGoQ();
+    method public long getTvAudioDescription-EK5gGoQ();
+    method public long getTvAudioDescriptionMixingVolumeDown-EK5gGoQ();
+    method public long getTvAudioDescriptionMixingVolumeUp-EK5gGoQ();
+    method public long getTvContentsMenu-EK5gGoQ();
+    method public long getTvDataService-EK5gGoQ();
+    method public long getTvInput-EK5gGoQ();
+    method public long getTvInputComponent1-EK5gGoQ();
+    method public long getTvInputComponent2-EK5gGoQ();
+    method public long getTvInputComposite1-EK5gGoQ();
+    method public long getTvInputComposite2-EK5gGoQ();
+    method public long getTvInputHdmi1-EK5gGoQ();
+    method public long getTvInputHdmi2-EK5gGoQ();
+    method public long getTvInputHdmi3-EK5gGoQ();
+    method public long getTvInputHdmi4-EK5gGoQ();
+    method public long getTvInputVga1-EK5gGoQ();
+    method public long getTvMediaContextMenu-EK5gGoQ();
+    method public long getTvNetwork-EK5gGoQ();
+    method public long getTvNumberEntry-EK5gGoQ();
+    method public long getTvPower-EK5gGoQ();
+    method public long getTvRadioService-EK5gGoQ();
+    method public long getTvSatellite-EK5gGoQ();
+    method public long getTvSatelliteBs-EK5gGoQ();
+    method public long getTvSatelliteCs-EK5gGoQ();
+    method public long getTvSatelliteService-EK5gGoQ();
+    method public long getTvTeletext-EK5gGoQ();
+    method public long getTvTerrestrialAnalog-EK5gGoQ();
+    method public long getTvTerrestrialDigital-EK5gGoQ();
+    method public long getTvTimerProgramming-EK5gGoQ();
+    method public long getTvZoomMode-EK5gGoQ();
+    method public long getTwo-EK5gGoQ();
+    method public long getU-EK5gGoQ();
+    method public long getUnknown-EK5gGoQ();
+    method public long getV-EK5gGoQ();
+    method public long getVoiceAssist-EK5gGoQ();
+    method public long getVolumeDown-EK5gGoQ();
+    method public long getVolumeMute-EK5gGoQ();
+    method public long getVolumeUp-EK5gGoQ();
+    method public long getW-EK5gGoQ();
+    method public long getWakeUp-EK5gGoQ();
+    method public long getWindow-EK5gGoQ();
+    method public long getX-EK5gGoQ();
+    method public long getY-EK5gGoQ();
+    method public long getYen-EK5gGoQ();
+    method public long getZ-EK5gGoQ();
+    method public long getZenkakuHankaru-EK5gGoQ();
+    method public long getZero-EK5gGoQ();
+    method public long getZoomIn-EK5gGoQ();
+    method public long getZoomOut-EK5gGoQ();
+    property public final long A;
+    property public final long AllApps;
+    property public final long AltLeft;
+    property public final long AltRight;
+    property public final long Apostrophe;
+    property public final long AppSwitch;
+    property public final long Assist;
+    property public final long At;
+    property public final long AvReceiverInput;
+    property public final long AvReceiverPower;
+    property public final long B;
+    property public final long Back;
+    property public final long Backslash;
+    property public final long Backspace;
+    property public final long Bookmark;
+    property public final long Break;
+    property public final long BrightnessDown;
+    property public final long BrightnessUp;
+    property public final long Browser;
+    property public final long Button1;
+    property public final long Button10;
+    property public final long Button11;
+    property public final long Button12;
+    property public final long Button13;
+    property public final long Button14;
+    property public final long Button15;
+    property public final long Button16;
+    property public final long Button2;
+    property public final long Button3;
+    property public final long Button4;
+    property public final long Button5;
+    property public final long Button6;
+    property public final long Button7;
+    property public final long Button8;
+    property public final long Button9;
+    property public final long ButtonA;
+    property public final long ButtonB;
+    property public final long ButtonC;
+    property public final long ButtonL1;
+    property public final long ButtonL2;
+    property public final long ButtonMode;
+    property public final long ButtonR1;
+    property public final long ButtonR2;
+    property public final long ButtonSelect;
+    property public final long ButtonStart;
+    property public final long ButtonThumbLeft;
+    property public final long ButtonThumbRight;
+    property public final long ButtonX;
+    property public final long ButtonY;
+    property public final long ButtonZ;
+    property public final long C;
+    property public final long Calculator;
+    property public final long Calendar;
+    property public final long Call;
+    property public final long Camera;
+    property public final long CapsLock;
+    property public final long Captions;
+    property public final long ChannelDown;
+    property public final long ChannelUp;
+    property public final long Clear;
+    property public final long Comma;
+    property public final long Contacts;
+    property public final long Copy;
+    property public final long CtrlLeft;
+    property public final long CtrlRight;
+    property public final long Cut;
+    property public final long D;
+    property public final long Delete;
+    property public final long DirectionCenter;
+    property public final long DirectionDown;
+    property public final long DirectionDownLeft;
+    property public final long DirectionDownRight;
+    property public final long DirectionLeft;
+    property public final long DirectionRight;
+    property public final long DirectionUp;
+    property public final long DirectionUpLeft;
+    property public final long DirectionUpRight;
+    property public final long Dvr;
+    property public final long E;
+    property public final long Eight;
+    property public final long Eisu;
+    property public final long EndCall;
+    property public final long Enter;
+    property public final long Envelope;
+    property public final long Equals;
+    property public final long Escape;
+    property public final long F;
+    property public final long F1;
+    property public final long F10;
+    property public final long F11;
+    property public final long F12;
+    property public final long F2;
+    property public final long F3;
+    property public final long F4;
+    property public final long F5;
+    property public final long F6;
+    property public final long F7;
+    property public final long F8;
+    property public final long F9;
+    property public final long Five;
+    property public final long Focus;
+    property public final long Forward;
+    property public final long Four;
+    property public final long Function;
+    property public final long G;
+    property public final long Grave;
+    property public final long Guide;
+    property public final long H;
+    property public final long HeadsetHook;
+    property public final long Help;
+    property public final long Henkan;
+    property public final long Home;
+    property public final long I;
+    property public final long Info;
+    property public final long Insert;
+    property public final long J;
+    property public final long K;
+    property public final long Kana;
+    property public final long KatakanaHiragana;
+    property public final long L;
+    property public final long LanguageSwitch;
+    property public final long LastChannel;
+    property public final long LeftBracket;
+    property public final long M;
+    property public final long MannerMode;
+    property public final long MediaAudioTrack;
+    property public final long MediaClose;
+    property public final long MediaEject;
+    property public final long MediaFastForward;
+    property public final long MediaNext;
+    property public final long MediaPause;
+    property public final long MediaPlay;
+    property public final long MediaPlayPause;
+    property public final long MediaPrevious;
+    property public final long MediaRecord;
+    property public final long MediaRewind;
+    property public final long MediaSkipBackward;
+    property public final long MediaSkipForward;
+    property public final long MediaStepBackward;
+    property public final long MediaStepForward;
+    property public final long MediaStop;
+    property public final long MediaTopMenu;
+    property public final long Menu;
+    property public final long MetaLeft;
+    property public final long MetaRight;
+    property public final long MicrophoneMute;
+    property public final long Minus;
+    property public final long MoveEnd;
+    property public final long MoveHome;
+    property public final long Muhenkan;
+    property public final long Multiply;
+    property public final long Music;
+    property public final long N;
+    property public final long NavigateIn;
+    property public final long NavigateNext;
+    property public final long NavigateOut;
+    property public final long NavigatePrevious;
+    property public final long Nine;
+    property public final long Notification;
+    property public final long NumLock;
+    property public final long NumPad0;
+    property public final long NumPad1;
+    property public final long NumPad2;
+    property public final long NumPad3;
+    property public final long NumPad4;
+    property public final long NumPad5;
+    property public final long NumPad6;
+    property public final long NumPad7;
+    property public final long NumPad8;
+    property public final long NumPad9;
+    property public final long NumPadAdd;
+    property public final long NumPadComma;
+    property public final long NumPadDivide;
+    property public final long NumPadDot;
+    property public final long NumPadEnter;
+    property public final long NumPadEquals;
+    property public final long NumPadLeftParenthesis;
+    property public final long NumPadMultiply;
+    property public final long NumPadRightParenthesis;
+    property public final long NumPadSubtract;
+    property public final long Number;
+    property public final long O;
+    property public final long One;
+    property public final long P;
+    property public final long PageDown;
+    property public final long PageUp;
+    property public final long Pairing;
+    property public final long Paste;
+    property public final long Period;
+    property public final long PictureSymbols;
+    property public final long Plus;
+    property public final long Pound;
+    property public final long Power;
+    property public final long PrintScreen;
+    property public final long ProfileSwitch;
+    property public final long ProgramBlue;
+    property public final long ProgramGreen;
+    property public final long ProgramRed;
+    property public final long ProgramYellow;
+    property public final long Q;
+    property public final long R;
+    property public final long Refresh;
+    property public final long RightBracket;
+    property public final long Ro;
+    property public final long S;
+    property public final long ScrollLock;
+    property public final long Search;
+    property public final long Semicolon;
+    property public final long SetTopBoxInput;
+    property public final long SetTopBoxPower;
+    property public final long Settings;
+    property public final long Seven;
+    property public final long ShiftLeft;
+    property public final long ShiftRight;
+    property public final long Six;
+    property public final long Slash;
+    property public final long Sleep;
+    property public final long SoftLeft;
+    property public final long SoftRight;
+    property public final long SoftSleep;
+    property public final long Spacebar;
+    property public final long Stem1;
+    property public final long Stem2;
+    property public final long Stem3;
+    property public final long StemPrimary;
+    property public final long SwitchCharset;
+    property public final long Symbol;
+    property public final long SystemNavigationDown;
+    property public final long SystemNavigationLeft;
+    property public final long SystemNavigationRight;
+    property public final long SystemNavigationUp;
+    property public final long T;
+    property public final long Tab;
+    property public final long Three;
+    property public final long ThumbsDown;
+    property public final long ThumbsUp;
+    property public final long Toggle2D3D;
+    property public final long Tv;
+    property public final long TvAntennaCable;
+    property public final long TvAudioDescription;
+    property public final long TvAudioDescriptionMixingVolumeDown;
+    property public final long TvAudioDescriptionMixingVolumeUp;
+    property public final long TvContentsMenu;
+    property public final long TvDataService;
+    property public final long TvInput;
+    property public final long TvInputComponent1;
+    property public final long TvInputComponent2;
+    property public final long TvInputComposite1;
+    property public final long TvInputComposite2;
+    property public final long TvInputHdmi1;
+    property public final long TvInputHdmi2;
+    property public final long TvInputHdmi3;
+    property public final long TvInputHdmi4;
+    property public final long TvInputVga1;
+    property public final long TvMediaContextMenu;
+    property public final long TvNetwork;
+    property public final long TvNumberEntry;
+    property public final long TvPower;
+    property public final long TvRadioService;
+    property public final long TvSatellite;
+    property public final long TvSatelliteBs;
+    property public final long TvSatelliteCs;
+    property public final long TvSatelliteService;
+    property public final long TvTeletext;
+    property public final long TvTerrestrialAnalog;
+    property public final long TvTerrestrialDigital;
+    property public final long TvTimerProgramming;
+    property public final long TvZoomMode;
+    property public final long Two;
+    property public final long U;
+    property public final long Unknown;
+    property public final long V;
+    property public final long VoiceAssist;
+    property public final long VolumeDown;
+    property public final long VolumeMute;
+    property public final long VolumeUp;
+    property public final long W;
+    property public final long WakeUp;
+    property public final long Window;
+    property public final long X;
+    property public final long Y;
+    property public final long Yen;
+    property public final long Z;
+    property public final long ZenkakuHankaru;
+    property public final long Zero;
+    property public final long ZoomIn;
+    property public final long ZoomOut;
+  }
+
+  public final inline class KeyEvent {
+    ctor public KeyEvent();
+    method public static android.view.KeyEvent! constructor-impl(android.view.KeyEvent nativeKeyEvent);
+    method public static inline boolean equals-impl(android.view.KeyEvent! p, Object? p1);
+    method public static boolean equals-impl0(android.view.KeyEvent p1, android.view.KeyEvent p2);
+    method public android.view.KeyEvent getNativeKeyEvent();
+    method public static inline int hashCode-impl(android.view.KeyEvent! p);
+    method public static inline String! toString-impl(android.view.KeyEvent! p);
+    property public final android.view.KeyEvent nativeKeyEvent;
+  }
+
+  public enum KeyEventType {
+    enum_constant public static final androidx.compose.ui.input.key.KeyEventType KeyDown;
+    enum_constant public static final androidx.compose.ui.input.key.KeyEventType KeyUp;
+    enum_constant public static final androidx.compose.ui.input.key.KeyEventType Unknown;
+  }
+
+  public final class KeyEvent_androidKt {
+    method public static long getKey-ZmokQxo(android.view.KeyEvent);
+    method public static androidx.compose.ui.input.key.KeyEventType getType-ZmokQxo(android.view.KeyEvent);
+    method public static int getUtf16CodePoint-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isAltPressed-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isCtrlPressed-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isMetaPressed-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isShiftPressed-ZmokQxo(android.view.KeyEvent);
+  }
+
+  public final class KeyInputModifierKt {
+    method public static androidx.compose.ui.Modifier onKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onKeyEvent);
+    method public static androidx.compose.ui.Modifier onPreviewKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onPreviewKeyEvent);
+  }
+
+  public final class Key_androidKt {
+    method public static long Key(int nativeKeyCode);
+    method public static int getNativeKeyCode-YVgTNJs(long);
+  }
+
+}
+
+package androidx.compose.ui.input.nestedscroll {
+
+  public interface NestedScrollConnection {
+    method public default suspend Object? onPostFling-k5p9STU(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public default long onPostScroll-61dr0bI(long consumed, long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+    method public default suspend Object? onPreFling-bHeVL4A(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public default long onPreScroll-ScU7Jk8(long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+  }
+
+  public final class NestedScrollDelegatingWrapperKt {
+  }
+
+  public final class NestedScrollDispatcher {
+    ctor public NestedScrollDispatcher();
+    method public suspend Object? dispatchPostFling-k5p9STU(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public long dispatchPostScroll-61dr0bI(long consumed, long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+    method public suspend Object? dispatchPreFling-bHeVL4A(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public long dispatchPreScroll-ScU7Jk8(long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+    method public kotlinx.coroutines.CoroutineScope getCoroutineScope();
+    property public final kotlinx.coroutines.CoroutineScope coroutineScope;
+  }
+
+  public final class NestedScrollModifierKt {
+    method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
+  }
+
+  public enum NestedScrollSource {
+    enum_constant public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource Drag;
+    enum_constant public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource Fling;
+  }
+
+}
+
+package androidx.compose.ui.input.pointer {
+
+  @kotlin.coroutines.RestrictsSuspension public interface AwaitPointerEventScope extends androidx.compose.ui.unit.Density {
+    method public suspend Object? awaitPointerEvent(optional androidx.compose.ui.input.pointer.PointerEventPass pass, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerEvent> p);
+    method public androidx.compose.ui.input.pointer.PointerEvent getCurrentEvent();
+    method public long getSize-YbymL2g();
+    method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+    property public abstract androidx.compose.ui.input.pointer.PointerEvent currentEvent;
+    property public abstract long size;
+    property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+  }
+
+  public final class ConsumedData {
+    ctor public ConsumedData(optional boolean positionChange, optional boolean downChange);
+    method public boolean getDownChange();
+    method public boolean getPositionChange();
+    method public void setDownChange(boolean p);
+    method public void setPositionChange(boolean p);
+    property public final boolean downChange;
+    property public final boolean positionChange;
+  }
+
+  public final class HitPathTrackerKt {
+  }
+
+  public final class MotionEventAdapter_androidKt {
+  }
+
+  public final class PointerEvent {
+    ctor public PointerEvent(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes);
+    method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> component1();
+    method public androidx.compose.ui.input.pointer.PointerEvent copy(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes, android.view.MotionEvent? motionEvent);
+    method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> getChanges();
+    property public final java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes;
+  }
+
+  public final class PointerEventKt {
+    method public static boolean anyChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToDown(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToDownIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToUp(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToUpIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static void consumeAllChanges(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static void consumeDownChange(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static void consumePositionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean isOutOfBounds-MReStF0(androidx.compose.ui.input.pointer.PointerInputChange, long size);
+    method public static long positionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean positionChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static long positionChangeIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean positionChanged(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean positionChangedIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+  }
+
+  public enum PointerEventPass {
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Final;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Initial;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Main;
+  }
+
+  public final inline class PointerId {
+    ctor public PointerId();
+    method public static long constructor-impl(long value);
+    method public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getValue();
+    method public static inline int hashCode-impl(long p);
+    method public static inline String! toString-impl(long p);
+    property public final long value;
+  }
+
+  @androidx.compose.runtime.Immutable public final class PointerInputChange {
+    method public androidx.compose.ui.input.pointer.PointerInputChange copy-aJ2ieLA(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, optional androidx.compose.ui.input.pointer.ConsumedData consumed, optional androidx.compose.ui.input.pointer.PointerType type);
+    method public androidx.compose.ui.input.pointer.ConsumedData getConsumed();
+    method public long getId-J3iCeTQ();
+    method public long getPosition-F1C5BW0();
+    method public boolean getPressed();
+    method public long getPreviousPosition-F1C5BW0();
+    method public boolean getPreviousPressed();
+    method public long getPreviousUptimeMillis();
+    method public androidx.compose.ui.input.pointer.PointerType getType();
+    method public long getUptimeMillis();
+    property public final androidx.compose.ui.input.pointer.ConsumedData consumed;
+    property public final long id;
+    property public final long position;
+    property public final boolean pressed;
+    property public final long previousPosition;
+    property public final boolean previousPressed;
+    property public final long previousUptimeMillis;
+    property public final androidx.compose.ui.input.pointer.PointerType type;
+    property public final long uptimeMillis;
+  }
+
+  public final class PointerInputEventProcessorKt {
+  }
+
+  public abstract class PointerInputFilter {
+    ctor public PointerInputFilter();
+    method public final long getSize-YbymL2g();
+    method public abstract void onCancel();
+    method public abstract void onPointerEvent-d1fqKvQ(androidx.compose.ui.input.pointer.PointerEvent pointerEvent, androidx.compose.ui.input.pointer.PointerEventPass pass, long bounds);
+    property public final long size;
+  }
+
+  public interface PointerInputModifier extends androidx.compose.ui.Modifier.Element {
+    method public androidx.compose.ui.input.pointer.PointerInputFilter getPointerInputFilter();
+    property public abstract androidx.compose.ui.input.pointer.PointerInputFilter pointerInputFilter;
+  }
+
+  public interface PointerInputScope extends androidx.compose.ui.unit.Density {
+    method public suspend <R> Object? awaitPointerEventScope(kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+    method public long getSize-YbymL2g();
+    method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+    property public abstract long size;
+    property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+  }
+
+  public final class PointerInputTestUtilKt {
+  }
+
+  public final class PointerInteropFilter_androidKt {
+    method public static androidx.compose.ui.Modifier pointerInteropFilter(androidx.compose.ui.Modifier, optional androidx.compose.ui.input.pointer.RequestDisallowInterceptTouchEvent? requestDisallowInterceptTouchEvent, kotlin.jvm.functions.Function1<? super android.view.MotionEvent,java.lang.Boolean> onTouchEvent);
+  }
+
+  public final class PointerInteropUtils_androidKt {
+  }
+
+  public enum PointerType {
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Eraser;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Mouse;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Stylus;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Touch;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Unknown;
+  }
+
+  public final class RequestDisallowInterceptTouchEvent implements kotlin.jvm.functions.Function1<java.lang.Boolean,kotlin.Unit> {
+    ctor public RequestDisallowInterceptTouchEvent();
+    method public void invoke(boolean disallowIntercept);
+  }
+
+  public final class SuspendingPointerInputFilterKt {
+    method @Deprecated public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+  }
+
+}
+
+package androidx.compose.ui.input.pointer.util {
+
+  public final class VelocityTracker {
+    ctor public VelocityTracker();
+    method public void addPosition-OX7LsLU(long timeMillis, long position);
+    method public long calculateVelocity-9UxMQ8M();
+    method public void resetTracking();
+  }
+
+  public final class VelocityTrackerKt {
+  }
+
+}
+
+package androidx.compose.ui.layout {
+
+  @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
+    field public static final androidx.compose.ui.layout.AlignmentLine.Companion Companion;
+    field public static final int Unspecified = -2147483648; // 0x80000000
+  }
+
+  public static final class AlignmentLine.Companion {
+  }
+
+  public final class AlignmentLineKt {
+    method public static androidx.compose.ui.layout.HorizontalAlignmentLine getFirstBaseline();
+    method public static androidx.compose.ui.layout.HorizontalAlignmentLine getLastBaseline();
+  }
+
+  @androidx.compose.runtime.Stable public interface ContentScale {
+    method public long computeScaleFactor-AhF4CD4(long srcSize, long dstSize);
+    field public static final androidx.compose.ui.layout.ContentScale.Companion Companion;
+  }
+
+  public static final class ContentScale.Companion {
+    method public androidx.compose.ui.layout.ContentScale getCrop();
+    method public androidx.compose.ui.layout.ContentScale getFillBounds();
+    method public androidx.compose.ui.layout.ContentScale getFillHeight();
+    method public androidx.compose.ui.layout.ContentScale getFillWidth();
+    method public androidx.compose.ui.layout.ContentScale getFit();
+    method public androidx.compose.ui.layout.ContentScale getInside();
+    method public androidx.compose.ui.layout.FixedScale getNone();
+    property public final androidx.compose.ui.layout.ContentScale Crop;
+    property public final androidx.compose.ui.layout.ContentScale FillBounds;
+    property public final androidx.compose.ui.layout.ContentScale FillHeight;
+    property public final androidx.compose.ui.layout.ContentScale FillWidth;
+    property public final androidx.compose.ui.layout.ContentScale Fit;
+    property public final androidx.compose.ui.layout.ContentScale Inside;
+    property public final androidx.compose.ui.layout.FixedScale None;
+  }
+
+  public final class ContentScaleKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
+    ctor public FixedScale(float value);
+    method public float component1();
+    method public long computeScaleFactor-AhF4CD4(long srcSize, long dstSize);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.layout.FixedScale copy(float value);
+    method public float getValue();
+    property public final float value;
+  }
+
+  public interface GraphicLayerInfo {
+    method public long getLayerId();
+    property public abstract long layerId;
+  }
+
+  public final class HorizontalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+    ctor public HorizontalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+  }
+
+  public interface IntrinsicMeasurable {
+    method public Object? getParentData();
+    method public int maxIntrinsicHeight(int width);
+    method public int maxIntrinsicWidth(int height);
+    method public int minIntrinsicHeight(int width);
+    method public int minIntrinsicWidth(int height);
+    property public abstract Object? parentData;
+  }
+
+  public final class IntrinsicMeasurableKt {
+  }
+
+  public interface IntrinsicMeasureScope extends androidx.compose.ui.unit.Density {
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+  }
+
+  public interface LayoutCoordinates {
+    method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public androidx.compose.ui.layout.LayoutCoordinates? getParentCoordinates();
+    method public androidx.compose.ui.layout.LayoutCoordinates? getParentLayoutCoordinates();
+    method public java.util.Set<androidx.compose.ui.layout.AlignmentLine> getProvidedAlignmentLines();
+    method public long getSize-YbymL2g();
+    method public boolean isAttached();
+    method public androidx.compose.ui.geometry.Rect localBoundingBoxOf(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, optional boolean clipBounds);
+    method public long localPositionOf-YJiYy8w(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, long relativeToSource);
+    method public long localToRoot-k-4lQ0M(long relativeToLocal);
+    method public long localToWindow-k-4lQ0M(long relativeToLocal);
+    method public long windowToLocal-k-4lQ0M(long relativeToWindow);
+    property public abstract boolean isAttached;
+    property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentCoordinates;
+    property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentLayoutCoordinates;
+    property public abstract java.util.Set<androidx.compose.ui.layout.AlignmentLine> providedAlignmentLines;
+    property public abstract long size;
+  }
+
+  public final class LayoutCoordinatesKt {
+    method public static androidx.compose.ui.geometry.Rect boundsInParent(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static androidx.compose.ui.geometry.Rect boundsInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static androidx.compose.ui.geometry.Rect boundsInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static long positionInParent(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static long positionInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static long positionInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+  }
+
+  public final class LayoutIdKt {
+    method public static Object? getLayoutId(androidx.compose.ui.layout.Measurable);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier layoutId(androidx.compose.ui.Modifier, Object layoutId);
+  }
+
+  public interface LayoutIdParentData {
+    method public Object getLayoutId();
+    property public abstract Object layoutId;
+  }
+
+  public interface LayoutInfo {
+    method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+    method public int getHeight();
+    method public java.util.List<androidx.compose.ui.layout.ModifierInfo> getModifierInfo();
+    method public androidx.compose.ui.layout.LayoutInfo? getParentInfo();
+    method public int getWidth();
+    method public boolean isAttached();
+    method public boolean isPlaced();
+    property public abstract androidx.compose.ui.layout.LayoutCoordinates coordinates;
+    property public abstract int height;
+    property public abstract boolean isAttached;
+    property public abstract boolean isPlaced;
+    property public abstract androidx.compose.ui.layout.LayoutInfo? parentInfo;
+    property public abstract int width;
+  }
+
+  public final class LayoutKt {
+    method @androidx.compose.runtime.Composable public static inline void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> content, optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+    method @Deprecated @androidx.compose.runtime.Composable public static void MultiMeasureLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+  }
+
+  public interface LayoutModifier extends androidx.compose.ui.Modifier.Element {
+    method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+    method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+    method public androidx.compose.ui.layout.MeasureResult measure-za8Wrwc(androidx.compose.ui.layout.MeasureScope, androidx.compose.ui.layout.Measurable measurable, long constraints);
+    method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+    method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+  }
+
+  public final class LayoutModifierKt {
+    method public static androidx.compose.ui.Modifier layout(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function3<? super androidx.compose.ui.layout.MeasureScope,? super androidx.compose.ui.layout.Measurable,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measure);
+  }
+
+  public interface Measurable extends androidx.compose.ui.layout.IntrinsicMeasurable {
+    method public androidx.compose.ui.layout.Placeable measure-BRTryo0(long constraints);
+  }
+
+  @androidx.compose.runtime.Stable public fun interface MeasurePolicy {
+    method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+    method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+    method public androidx.compose.ui.layout.MeasureResult measure-8A2P9vY(androidx.compose.ui.layout.MeasureScope, java.util.List<? extends androidx.compose.ui.layout.Measurable> measurables, long constraints);
+    method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+    method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+  }
+
+  public interface MeasureResult {
+    method public java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> getAlignmentLines();
+    method public int getHeight();
+    method public int getWidth();
+    method public void placeChildren();
+    property public abstract java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines;
+    property public abstract int height;
+    property public abstract int width;
+  }
+
+  public interface MeasureScope extends androidx.compose.ui.layout.IntrinsicMeasureScope {
+    method public default androidx.compose.ui.layout.MeasureResult layout(int width, int height, optional java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+  }
+
+  public final class MeasureScopeKt {
+  }
+
+  public interface Measured {
+    method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public int getMeasuredHeight();
+    method public int getMeasuredWidth();
+    property public abstract int measuredHeight;
+    property public abstract int measuredWidth;
+  }
+
+  public final class ModifierInfo {
+    ctor public ModifierInfo(androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.LayoutCoordinates coordinates, optional Object? extra);
+    method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+    method public Object? getExtra();
+    method public androidx.compose.ui.Modifier getModifier();
+    property public final androidx.compose.ui.layout.LayoutCoordinates coordinates;
+    property public final Object? extra;
+    property public final androidx.compose.ui.Modifier modifier;
+  }
+
+  public interface OnGloballyPositionedModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
+  }
+
+  public final class OnGloballyPositionedModifierKt {
+    method public static inline androidx.compose.ui.Modifier onGloballyPositioned(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,kotlin.Unit> onGloballyPositioned);
+  }
+
+  public interface OnRemeasuredModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onRemeasured-ozmzZPI(long size);
+  }
+
+  public final class OnRemeasuredModifierKt {
+    method public static inline androidx.compose.ui.Modifier onSizeChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit> onSizeChanged);
+  }
+
+  public interface ParentDataModifier extends androidx.compose.ui.Modifier.Element {
+    method public Object? modifyParentData(androidx.compose.ui.unit.Density, Object? parentData);
+  }
+
+  public abstract class Placeable implements androidx.compose.ui.layout.Measured {
+    ctor public Placeable();
+    method protected final long getApparentToRealOffset-nOcc-ac();
+    method public final int getHeight();
+    method public int getMeasuredHeight();
+    method protected final long getMeasuredSize-YbymL2g();
+    method public int getMeasuredWidth();
+    method protected final long getMeasurementConstraints-msEJaDk();
+    method public final int getWidth();
+    method protected abstract void placeAt-rMeLuDI(long position, float zIndex, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit>? layerBlock);
+    method protected final void setMeasuredSize-ozmzZPI(long value);
+    method protected final void setMeasurementConstraints-BRTryo0(long p);
+    property protected final long apparentToRealOffset;
+    property public final int height;
+    property public int measuredHeight;
+    property protected final long measuredSize;
+    property public int measuredWidth;
+    property protected final long measurementConstraints;
+    property public final int width;
+  }
+
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method protected abstract androidx.compose.ui.unit.LayoutDirection getParentLayoutDirection();
+    method protected abstract int getParentWidth();
+    method public final void place(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+    method public final void place-z2mxYZE(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+    method public final void placeRelative(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+    method public final void placeRelative-z2mxYZE(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+    method public final void placeRelativeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    method public final void placeRelativeWithLayer-muyPCdA(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    method public final void placeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    method public final void placeWithLayer-muyPCdA(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    property protected abstract androidx.compose.ui.unit.LayoutDirection parentLayoutDirection;
+    property protected abstract int parentWidth;
+  }
+
+  public final class PlaceableKt {
+  }
+
+  public interface Remeasurement {
+    method public void forceRemeasure();
+  }
+
+  public interface RemeasurementModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onRemeasurementAvailable(androidx.compose.ui.layout.Remeasurement remeasurement);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class ScaleFactor {
+    ctor public ScaleFactor();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-_hLwfpc(long $this, optional float scaleX, optional float scaleY);
+    method @androidx.compose.runtime.Stable public static operator long div-_hLwfpc(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getScaleX-impl(long $this);
+    method public static float getScaleY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long times-_hLwfpc(long $this, float operand);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.layout.ScaleFactor.Companion Companion;
+  }
+
+  public static final class ScaleFactor.Companion {
+    method public long getUnspecified-_hLwfpc();
+    property public final long Unspecified;
+  }
+
+  public final class ScaleFactorKt {
+    method @androidx.compose.runtime.Stable public static long ScaleFactor(float scaleX, float scaleY);
+    method @androidx.compose.runtime.Stable public static operator long div-ngKnWWw(long, long scaleFactor);
+    method public static inline boolean isSpecified-FK8aYYs(long);
+    method public static inline boolean isUnspecified-FK8aYYs(long);
+    method @androidx.compose.runtime.Stable public static long lerp-bKVCie4(long start, long stop, float fraction);
+    method public static inline long takeOrElse-L-byAFk(long, kotlin.jvm.functions.Function0<androidx.compose.ui.layout.ScaleFactor> block);
+    method @androidx.compose.runtime.Stable public static operator long times-Sp6zcS4(long, long size);
+    method @androidx.compose.runtime.Stable public static operator long times-ngKnWWw(long, long scaleFactor);
+  }
+
+  public final class SubcomposeLayoutKt {
+    method @androidx.compose.runtime.Composable public static void SubcomposeLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.layout.SubcomposeMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
+  }
+
+  public interface SubcomposeMeasureScope extends androidx.compose.ui.layout.MeasureScope {
+    method public java.util.List<androidx.compose.ui.layout.Measurable> subcompose(Object? slotId, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class TestModifierUpdaterKt {
+  }
+
+  public final class VerticalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+    ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+  }
+
+}
+
+package androidx.compose.ui.node {
+
+  public final class LayoutNodeKt {
+  }
+
+  public final class Ref<T> {
+    ctor public Ref();
+    method public T? getValue();
+    method public void setValue(T? p);
+    property public final T? value;
+  }
+
+  public interface RootForTest {
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.semantics.SemanticsOwner getSemanticsOwner();
+    method public androidx.compose.ui.text.input.TextInputService getTextInputService();
+    method public boolean sendKeyEvent-ZmokQxo(android.view.KeyEvent keyEvent);
+    property public abstract androidx.compose.ui.unit.Density density;
+    property public abstract androidx.compose.ui.semantics.SemanticsOwner semanticsOwner;
+    property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
+  }
+
+  public final class ViewInterop_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.platform {
+
+  public abstract class AbstractComposeView extends android.view.ViewGroup {
+    ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+    ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+    ctor public AbstractComposeView(android.content.Context context);
+    method @androidx.compose.runtime.Composable public abstract void Content();
+    method public final void createComposition();
+    method public final void disposeComposition();
+    method public final boolean getHasComposition();
+    method protected boolean getShouldCreateCompositionOnAttachedToWindow();
+    method public final boolean getShowLayoutBounds();
+    method protected final void onLayout(boolean changed, int left, int top, int right, int bottom);
+    method protected final void onMeasure(int widthMeasureSpec, int heightMeasureSpec);
+    method public final void setParentCompositionContext(androidx.compose.runtime.CompositionContext? parent);
+    method public final void setShowLayoutBounds(boolean value);
+    method public final void setViewCompositionStrategy(androidx.compose.ui.platform.ViewCompositionStrategy strategy);
+    property public final boolean hasComposition;
+    property protected boolean shouldCreateCompositionOnAttachedToWindow;
+    property public final boolean showLayoutBounds;
+  }
+
+  public interface AccessibilityManager {
+    method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
+  }
+
+  public final class AndroidClipboardManager_androidKt {
+  }
+
+  public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
+  }
+
+  public final class AndroidComposeView_androidKt {
+  }
+
+  public final class AndroidCompositionLocals_androidKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.res.Configuration> getLocalConfiguration();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.Context> getLocalContext();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.lifecycle.LifecycleOwner> getLocalLifecycleOwner();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.savedstate.SavedStateRegistryOwner> getLocalSavedStateRegistryOwner();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<android.view.View> getLocalView();
+  }
+
+  public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
+    method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
+    method public android.view.Choreographer getChoreographer();
+    method public androidx.compose.runtime.MonotonicFrameClock getFrameClock();
+    property public final android.view.Choreographer choreographer;
+    property public final androidx.compose.runtime.MonotonicFrameClock frameClock;
+    field public static final androidx.compose.ui.platform.AndroidUiDispatcher.Companion Companion;
+  }
+
+  public static final class AndroidUiDispatcher.Companion {
+    method public kotlin.coroutines.CoroutineContext getCurrentThread();
+    method public kotlin.coroutines.CoroutineContext getMain();
+    property public final kotlin.coroutines.CoroutineContext CurrentThread;
+    property public final kotlin.coroutines.CoroutineContext Main;
+  }
+
+  public final class AndroidUiDispatcher_androidKt {
+  }
+
+  public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
+    method public android.view.Choreographer getChoreographer();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final android.view.Choreographer choreographer;
+  }
+
+  public final class AndroidUriHandler implements androidx.compose.ui.platform.UriHandler {
+    ctor public AndroidUriHandler(android.content.Context context);
+    method public void openUri(String uri);
+  }
+
+  public final class AndroidViewConfiguration implements androidx.compose.ui.platform.ViewConfiguration {
+    ctor public AndroidViewConfiguration(android.view.ViewConfiguration viewConfiguration);
+    method public long getDoubleTapMinTimeMillis();
+    method public long getDoubleTapTimeoutMillis();
+    method public long getLongPressTimeoutMillis();
+    method public float getTouchSlop();
+    property public long doubleTapMinTimeMillis;
+    property public long doubleTapTimeoutMillis;
+    property public long longPressTimeoutMillis;
+    property public float touchSlop;
+  }
+
+  public interface ClipboardManager {
+    method public androidx.compose.ui.text.AnnotatedString? getText();
+    method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
+  }
+
+  public final class ComposeView extends androidx.compose.ui.platform.AbstractComposeView {
+    ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+    ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+    ctor public ComposeView(android.content.Context context);
+    method @androidx.compose.runtime.Composable public void Content();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    property protected boolean shouldCreateCompositionOnAttachedToWindow;
+  }
+
+  public final class ComposeView_androidKt {
+  }
+
+  public final class CompositionLocalsKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager> getLocalAccessibilityManager();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> getLocalClipboardManager();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Density> getLocalDensity();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.focus.FocusManager> getLocalFocusManager();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.hapticfeedback.HapticFeedback> getLocalHapticFeedback();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.LayoutDirection> getLocalLayoutDirection();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.input.TextInputService> getLocalTextInputService();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.TextToolbar> getLocalTextToolbar();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.UriHandler> getLocalUriHandler();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> getLocalViewConfiguration();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> getLocalWindowInfo();
+  }
+
+  public final class DebugUtilsKt {
+  }
+
+  public final class DisposableSaveableStateRegistry_androidKt {
+  }
+
+  public interface InspectableValue {
+    method public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> getInspectableElements();
+    method public default String? getNameFallback();
+    method public default Object? getValueOverride();
+    property public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+    property public default String? nameFallback;
+    property public default Object? valueOverride;
+  }
+
+  public final class InspectableValueKt {
+    method public static inline kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> debugInspectorInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> definitions);
+    method public static kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> getNoInspectorInfo();
+    method public static boolean isDebugInspectorInfoEnabled();
+    method public static void setDebugInspectorInfoEnabled(boolean p);
+  }
+
+  public final class InspectionModeKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> getLocalInspectionMode();
+  }
+
+  public final class InspectorInfo {
+    ctor public InspectorInfo();
+    method public String? getName();
+    method public androidx.compose.ui.platform.ValueElementSequence getProperties();
+    method public Object? getValue();
+    method public void setName(String? p);
+    method public void setValue(Object? p);
+    property public final String? name;
+    property public final androidx.compose.ui.platform.ValueElementSequence properties;
+    property public final Object? value;
+  }
+
+  public abstract class InspectorValueInfo implements androidx.compose.ui.platform.InspectableValue {
+    ctor public InspectorValueInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> info);
+    property public kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+    property public String? nameFallback;
+    property public Object? valueOverride;
+  }
+
+  public final class JvmActuals_jvmKt {
+  }
+
+  public final class TestTagKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier testTag(androidx.compose.ui.Modifier, String tag);
+  }
+
+  public interface TextToolbar {
+    method public androidx.compose.ui.platform.TextToolbarStatus getStatus();
+    method public void hide();
+    method public void showMenu(androidx.compose.ui.geometry.Rect rect, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCopyRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onPasteRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCutRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onSelectAllRequested);
+    property public abstract androidx.compose.ui.platform.TextToolbarStatus status;
+  }
+
+  public final class TextToolbarKt {
+  }
+
+  public enum TextToolbarStatus {
+    enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Hidden;
+    enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Shown;
+  }
+
+  public interface UriHandler {
+    method public void openUri(String uri);
+  }
+
+  public final class ValueElement {
+    ctor public ValueElement(String name, Object? value);
+    method public String component1();
+    method public Object? component2();
+    method public androidx.compose.ui.platform.ValueElement copy(String name, Object? value);
+    method public String getName();
+    method public Object? getValue();
+    property public final String name;
+    property public final Object? value;
+  }
+
+  public final class ValueElementSequence implements kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> {
+    ctor public ValueElementSequence();
+    method public java.util.Iterator<androidx.compose.ui.platform.ValueElement> iterator();
+    method public operator void set(String name, Object? value);
+  }
+
+  public interface ViewCompositionStrategy {
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+    field public static final androidx.compose.ui.platform.ViewCompositionStrategy.Companion Companion;
+  }
+
+  public static final class ViewCompositionStrategy.Companion {
+  }
+
+  public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindow implements androidx.compose.ui.platform.ViewCompositionStrategy {
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+    field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
+  }
+
+  public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+    ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.Lifecycle lifecycle);
+    ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.LifecycleOwner lifecycleOwner);
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+  }
+
+  public static final class ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+    field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
+  }
+
+  public final class ViewCompositionStrategy_androidKt {
+  }
+
+  public interface ViewConfiguration {
+    method public long getDoubleTapMinTimeMillis();
+    method public long getDoubleTapTimeoutMillis();
+    method public long getLongPressTimeoutMillis();
+    method public float getTouchSlop();
+    property public abstract long doubleTapMinTimeMillis;
+    property public abstract long doubleTapTimeoutMillis;
+    property public abstract long longPressTimeoutMillis;
+    property public abstract float touchSlop;
+  }
+
+  @VisibleForTesting public interface ViewRootForTest extends androidx.compose.ui.node.RootForTest {
+    method public boolean getHasPendingMeasureOrLayout();
+    method public android.view.View getView();
+    method public void invalidateDescendants();
+    method public boolean isLifecycleInResumedState();
+    property public abstract boolean hasPendingMeasureOrLayout;
+    property public abstract boolean isLifecycleInResumedState;
+    property public abstract android.view.View view;
+    field public static final androidx.compose.ui.platform.ViewRootForTest.Companion Companion;
+  }
+
+  public static final class ViewRootForTest.Companion {
+    method public kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? getOnViewCreatedCallback();
+    method public void setOnViewCreatedCallback(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? p);
+    property public final kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? onViewCreatedCallback;
+  }
+
+  @androidx.compose.runtime.Stable public interface WindowInfo {
+    method public boolean isWindowFocused();
+    property public abstract boolean isWindowFocused;
+  }
+
+  public final class WindowInfoKt {
+  }
+
+  public final class WindowRecomposer_androidKt {
+    method public static androidx.compose.runtime.CompositionContext? findViewTreeCompositionContext(android.view.View);
+    method public static androidx.compose.runtime.CompositionContext? getCompositionContext(android.view.View);
+    method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext? value);
+  }
+
+  public final class Wrapper_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.platform.actionmodecallback {
+
+  public final class TextActionModeCallback_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.res {
+
+  public final class AnimatedVectorResources_androidKt {
+  }
+
+  public final class AnimatorResources_androidKt {
+  }
+
+  public final class ColorResources_androidKt {
+    method @androidx.compose.runtime.Composable public static long colorResource(@ColorRes int id);
+  }
+
+  public final class FontResources_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.text.font.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+  }
+
+  public final class ImageResources_androidKt {
+    method public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, android.content.res.Resources res, @DrawableRes int id);
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, @DrawableRes int id);
+  }
+
+  public final class PainterResources_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter painterResource(@DrawableRes int id);
+  }
+
+  public final class PrimitiveResources_androidKt {
+    method @androidx.compose.runtime.Composable public static boolean booleanResource(@BoolRes int id);
+    method @androidx.compose.runtime.Composable public static float dimensionResource(@DimenRes int id);
+    method @androidx.compose.runtime.Composable public static int[] integerArrayResource(@ArrayRes int id);
+    method @androidx.compose.runtime.Composable public static int integerResource(@IntegerRes int id);
+  }
+
+  public final class StringResources_androidKt {
+    method @androidx.compose.runtime.Composable public static String![] stringArrayResource(@ArrayRes int id);
+    method @androidx.compose.runtime.Composable public static String stringResource(@StringRes int id);
+    method @androidx.compose.runtime.Composable public static String stringResource(@StringRes int id, java.lang.Object... formatArgs);
+  }
+
+  public final class VectorResources_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, @DrawableRes int id);
+    method @kotlin.jvm.Throws(exceptionClasses=XmlPullParserException::class) public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, optional android.content.res.Resources.Theme? theme, android.content.res.Resources res, int resId) throws org.xmlpull.v1.XmlPullParserException;
+  }
+
+}
+
+package androidx.compose.ui.semantics {
+
+  public final class AccessibilityAction<T extends kotlin.Function<? extends java.lang.Boolean>> {
+    ctor public AccessibilityAction(String? label, T? action);
+    method public T? getAction();
+    method public String? getLabel();
+    property public final T? action;
+    property public final String? label;
+  }
+
+  public final class CustomAccessibilityAction {
+    ctor public CustomAccessibilityAction(String label, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
+    method public kotlin.jvm.functions.Function0<java.lang.Boolean> getAction();
+    method public String getLabel();
+    property public final kotlin.jvm.functions.Function0<java.lang.Boolean> action;
+    property public final String label;
+  }
+
+  public enum LiveRegionMode {
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Assertive;
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Polite;
+  }
+
+  public final class ProgressBarRangeInfo {
+    ctor public ProgressBarRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional int steps);
+    method public float getCurrent();
+    method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> getRange();
+    method public int getSteps();
+    property public final float current;
+    property public final kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range;
+    property public final int steps;
+    field public static final androidx.compose.ui.semantics.ProgressBarRangeInfo.Companion Companion;
+  }
+
+  public static final class ProgressBarRangeInfo.Companion {
+    method public androidx.compose.ui.semantics.ProgressBarRangeInfo getIndeterminate();
+    property public final androidx.compose.ui.semantics.ProgressBarRangeInfo Indeterminate;
+  }
+
+  public enum Role {
+    enum_constant public static final androidx.compose.ui.semantics.Role Button;
+    enum_constant public static final androidx.compose.ui.semantics.Role Checkbox;
+    enum_constant public static final androidx.compose.ui.semantics.Role Image;
+    enum_constant public static final androidx.compose.ui.semantics.Role RadioButton;
+    enum_constant public static final androidx.compose.ui.semantics.Role Switch;
+    enum_constant public static final androidx.compose.ui.semantics.Role Tab;
+  }
+
+  public final class ScrollAxisRange {
+    ctor public ScrollAxisRange(kotlin.jvm.functions.Function0<java.lang.Float> value, kotlin.jvm.functions.Function0<java.lang.Float> maxValue, optional boolean reverseScrolling);
+    method public kotlin.jvm.functions.Function0<java.lang.Float> getMaxValue();
+    method public boolean getReverseScrolling();
+    method public kotlin.jvm.functions.Function0<java.lang.Float> getValue();
+    property public final kotlin.jvm.functions.Function0<java.lang.Float> maxValue;
+    property public final boolean reverseScrolling;
+    property public final kotlin.jvm.functions.Function0<java.lang.Float> value;
+  }
+
+  public final class SemanticsActions {
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCollapse();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCopyText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> getCustomActions();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCutText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getDismiss();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getExpand();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnLongClick();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getPasteText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Collapse;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CopyText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> CustomActions;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CutText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Dismiss;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Expand;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnLongClick;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> PasteText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+    field public static final androidx.compose.ui.semantics.SemanticsActions INSTANCE;
+  }
+
+  public final class SemanticsConfiguration implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.compose.ui.semantics.SemanticsPropertyKey<?>,?>> kotlin.jvm.internal.markers.KMappedMarker androidx.compose.ui.semantics.SemanticsPropertyReceiver {
+    ctor public SemanticsConfiguration();
+    method public operator <T> boolean contains(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+    method public androidx.compose.ui.semantics.SemanticsConfiguration copy();
+    method public operator <T> T! get(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> T! getOrElse(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public <T> T? getOrElseNullable(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public boolean isClearingSemantics();
+    method public boolean isMergingSemanticsOfDescendants();
+    method public java.util.Iterator<java.util.Map.Entry<androidx.compose.ui.semantics.SemanticsPropertyKey<?>,java.lang.Object>> iterator();
+    method public <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+    method public void setClearingSemantics(boolean p);
+    method public void setMergingSemanticsOfDescendants(boolean p);
+    property public final boolean isClearingSemantics;
+    property public final boolean isMergingSemanticsOfDescendants;
+  }
+
+  public final class SemanticsConfigurationKt {
+    method public static <T> T? getOrNull(androidx.compose.ui.semantics.SemanticsConfiguration, androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+  }
+
+  public interface SemanticsModifier extends androidx.compose.ui.Modifier.Element {
+    method public int getId();
+    method public androidx.compose.ui.semantics.SemanticsConfiguration getSemanticsConfiguration();
+    property public abstract int id;
+    property public abstract androidx.compose.ui.semantics.SemanticsConfiguration semanticsConfiguration;
+  }
+
+  public final class SemanticsModifierKt {
+    method public static androidx.compose.ui.Modifier clearAndSetSemantics(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+    method public static androidx.compose.ui.Modifier semantics(androidx.compose.ui.Modifier, optional boolean mergeDescendants, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+  }
+
+  public final class SemanticsNode {
+    method public int getAlignmentLinePosition(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public androidx.compose.ui.geometry.Rect getBoundsInRoot();
+    method public androidx.compose.ui.geometry.Rect getBoundsInWindow();
+    method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getChildren();
+    method public androidx.compose.ui.semantics.SemanticsConfiguration getConfig();
+    method public int getId();
+    method public androidx.compose.ui.layout.LayoutInfo getLayoutInfo();
+    method public boolean getMergingEnabled();
+    method public androidx.compose.ui.semantics.SemanticsNode? getParent();
+    method public long getPositionInRoot-F1C5BW0();
+    method public long getPositionInWindow-F1C5BW0();
+    method public androidx.compose.ui.node.RootForTest? getRoot();
+    method public long getSize-YbymL2g();
+    method public boolean isRoot();
+    property public final androidx.compose.ui.geometry.Rect boundsInRoot;
+    property public final androidx.compose.ui.geometry.Rect boundsInWindow;
+    property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> children;
+    property public final androidx.compose.ui.semantics.SemanticsConfiguration config;
+    property public final int id;
+    property public final boolean isRoot;
+    property public final androidx.compose.ui.layout.LayoutInfo layoutInfo;
+    property public final boolean mergingEnabled;
+    property public final androidx.compose.ui.semantics.SemanticsNode? parent;
+    property public final long positionInRoot;
+    property public final long positionInWindow;
+    property public final androidx.compose.ui.node.RootForTest? root;
+    property public final long size;
+  }
+
+  public final class SemanticsNodeKt {
+  }
+
+  public final class SemanticsOwner {
+    method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
+    method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
+    property public final androidx.compose.ui.semantics.SemanticsNode rootSemanticsNode;
+    property public final androidx.compose.ui.semantics.SemanticsNode unmergedRootSemanticsNode;
+  }
+
+  public final class SemanticsOwnerKt {
+    method public static java.util.List<androidx.compose.ui.semantics.SemanticsNode> getAllSemanticsNodes(androidx.compose.ui.semantics.SemanticsOwner, boolean mergingEnabled);
+  }
+
+  public final class SemanticsProperties {
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getContentDescription();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getDisabled();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getEditableText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getFocused();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHeading();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getHorizontalScrollAxisRange();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getInvisibleToUser();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsDialog();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> getLiveRegion();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getPaneTitle();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getPassword();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> getProgressBarRangeInfo();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> getRole();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSelectableGroup();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSelected();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getStateDescription();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> getToggleableState();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getVerticalScrollAxisRange();
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> ContentDescription;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Disabled;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> EditableText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Focused;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Heading;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> HorizontalScrollAxisRange;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> InvisibleToUser;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsDialog;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> LiveRegion;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> PaneTitle;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Password;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> ProgressBarRangeInfo;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> Role;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SelectableGroup;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> StateDescription;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> ToggleableState;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> VerticalScrollAxisRange;
+    field public static final androidx.compose.ui.semantics.SemanticsProperties INSTANCE;
+  }
+
+  public final class SemanticsPropertiesKt {
+    method public static void collapse(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void copyText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void cutText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void dialog(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void disabled(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void dismiss(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void expand(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static String getContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.text.AnnotatedString getEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.ScrollAxisRange getHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.LiveRegionMode getLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.ProgressBarRangeInfo getProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.Role getRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.text.AnnotatedString getText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void getTextLayoutResult(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>? action);
+    method public static long getTextSelectionRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.state.ToggleableState getToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.ScrollAxisRange getVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void heading(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void onClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void onLongClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void password(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void pasteText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void popup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void scrollBy(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,java.lang.Boolean>? action);
+    method public static void selectableGroup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void setContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver, java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction> p);
+    method public static void setEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+    method public static void setFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange p);
+    method public static void setImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
+    method public static void setLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.LiveRegionMode p);
+    method public static void setPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setProgress(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean>? action);
+    method public static void setProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ProgressBarRangeInfo p);
+    method public static void setRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.Role p);
+    method public static void setSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setSelection(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean>? action);
+    method public static void setStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+    method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>? action);
+    method public static void setTextSelectionRange-Hy0MoUY(androidx.compose.ui.semantics.SemanticsPropertyReceiver, long p);
+    method public static void setToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.state.ToggleableState p);
+    method public static void setVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange p);
+  }
+
+  public final class SemanticsPropertyKey<T> {
+    ctor public SemanticsPropertyKey(String name, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends T> mergePolicy);
+    method public String getName();
+    method public operator T! getValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property);
+    method public T? merge(T? parentValue, T? childValue);
+    method public operator void setValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property, T? value);
+    property public final String name;
+  }
+
+  public interface SemanticsPropertyReceiver {
+    method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+  }
+
+}
+
+package androidx.compose.ui.state {
+
+  public enum ToggleableState {
+    enum_constant public static final androidx.compose.ui.state.ToggleableState Indeterminate;
+    enum_constant public static final androidx.compose.ui.state.ToggleableState Off;
+    enum_constant public static final androidx.compose.ui.state.ToggleableState On;
+  }
+
+  public final class ToggleableStateKt {
+    method public static androidx.compose.ui.state.ToggleableState ToggleableState(boolean value);
+  }
+
+}
+
+package androidx.compose.ui.text.input {
+
+  public final class InputState_androidKt {
+  }
+
+  public final class RecordingInputConnection_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.viewinterop {
+
+  public final class AndroidViewHolder_androidKt {
+  }
+
+  public final class AndroidView_androidKt {
+    method @androidx.compose.runtime.Composable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+    method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
+  }
+
+}
+
+package androidx.compose.ui.window {
+
+  public final class AndroidDialog_androidKt {
+    method @androidx.compose.runtime.Composable public static void Dialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class AndroidPopup_androidKt {
+    method @androidx.compose.runtime.Composable public static void Popup(androidx.compose.ui.window.PopupPositionProvider popupPositionProvider, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Popup-wO4EaeM(optional androidx.compose.ui.Alignment alignment, optional long offset, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @org.jetbrains.annotations.TestOnly public static boolean isPopupLayout(android.view.View view, optional String? testTag);
+  }
+
+  @androidx.compose.runtime.Immutable public final class DialogProperties {
+    ctor public DialogProperties(optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy);
+    method public boolean getDismissOnBackPress();
+    method public boolean getDismissOnClickOutside();
+    method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+    property public final boolean dismissOnBackPress;
+    property public final boolean dismissOnClickOutside;
+    property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+  }
+
+  public interface DialogWindowProvider {
+    method public android.view.Window getWindow();
+    property public abstract android.view.Window window;
+  }
+
+  @androidx.compose.runtime.Immutable public interface PopupPositionProvider {
+    method public long calculatePosition-aa5Bd6I(androidx.compose.ui.unit.IntRect anchorBounds, long windowSize, androidx.compose.ui.unit.LayoutDirection layoutDirection, long popupContentSize);
+  }
+
+  @androidx.compose.runtime.Immutable public final class PopupProperties {
+    ctor public PopupProperties(optional boolean focusable, optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy);
+    method public boolean getDismissOnBackPress();
+    method public boolean getDismissOnClickOutside();
+    method public boolean getFocusable();
+    method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+    property public final boolean dismissOnBackPress;
+    property public final boolean dismissOnClickOutside;
+    property public final boolean focusable;
+    property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+  }
+
+  public enum SecureFlagPolicy {
+    enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy Inherit;
+    enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOff;
+    enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
+  }
+
+  public final class SecureFlagPolicy_androidKt {
+  }
+
+}
+

compose/ui/ui/api/current.txt

diff --git a/compose/ui/ui/api/current.txt b/compose/ui/ui/api/current.txt
index 27ee819..27cc180 100644
--- a/compose/ui/ui/api/current.txt
+++ b/compose/ui/ui/api/current.txt
@@ -2125,6 +2125,11 @@
     property public final String label;
   }
 
+  public enum LiveRegionMode {
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Assertive;
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Polite;
+  }
+
   public final class ProgressBarRangeInfo {
     ctor public ProgressBarRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional int steps);
     method public float getCurrent();
@@ -2280,6 +2285,7 @@
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getInvisibleToUser();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsDialog();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> getLiveRegion();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getPaneTitle();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getPassword();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> getProgressBarRangeInfo();
@@ -2302,6 +2308,7 @@
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> InvisibleToUser;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsDialog;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> LiveRegion;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> PaneTitle;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Password;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> ProgressBarRangeInfo;
@@ -2331,6 +2338,7 @@
     method public static boolean getFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.semantics.ScrollAxisRange getHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.LiveRegionMode getLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static String getPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.semantics.ProgressBarRangeInfo getProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.semantics.Role getRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
@@ -2356,6 +2364,7 @@
     method public static void setFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean p);
     method public static void setHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange p);
     method public static void setImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
+    method public static void setLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.LiveRegionMode p);
     method public static void setPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
     method public static void setProgress(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean>? action);
     method public static void setProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ProgressBarRangeInfo p);

compose/ui/ui/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/compose/ui/ui/api/public_plus_experimental_1.0.0-beta04.txt b/compose/ui/ui/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..dc85fb3
--- /dev/null
+++ b/compose/ui/ui/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,2624 @@
+// Signature format: 4.0
+package androidx.compose.ui {
+
+  public final class AbsoluteAlignment {
+    method public androidx.compose.ui.Alignment getBottomLeft();
+    method public androidx.compose.ui.Alignment getBottomRight();
+    method public androidx.compose.ui.Alignment getCenterLeft();
+    method public androidx.compose.ui.Alignment getCenterRight();
+    method public androidx.compose.ui.Alignment.Horizontal getLeft();
+    method public androidx.compose.ui.Alignment.Horizontal getRight();
+    method public androidx.compose.ui.Alignment getTopLeft();
+    method public androidx.compose.ui.Alignment getTopRight();
+    property public final androidx.compose.ui.Alignment BottomLeft;
+    property public final androidx.compose.ui.Alignment BottomRight;
+    property public final androidx.compose.ui.Alignment CenterLeft;
+    property public final androidx.compose.ui.Alignment CenterRight;
+    property public final androidx.compose.ui.Alignment.Horizontal Left;
+    property public final androidx.compose.ui.Alignment.Horizontal Right;
+    property public final androidx.compose.ui.Alignment TopLeft;
+    property public final androidx.compose.ui.Alignment TopRight;
+    field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public fun interface Alignment {
+    method public long align-oYSo38o(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    field public static final androidx.compose.ui.Alignment.Companion Companion;
+  }
+
+  public static final class Alignment.Companion {
+    method public androidx.compose.ui.Alignment.Vertical getBottom();
+    method public androidx.compose.ui.Alignment getBottomCenter();
+    method public androidx.compose.ui.Alignment getBottomEnd();
+    method public androidx.compose.ui.Alignment getBottomStart();
+    method public androidx.compose.ui.Alignment getCenter();
+    method public androidx.compose.ui.Alignment getCenterEnd();
+    method public androidx.compose.ui.Alignment.Horizontal getCenterHorizontally();
+    method public androidx.compose.ui.Alignment getCenterStart();
+    method public androidx.compose.ui.Alignment.Vertical getCenterVertically();
+    method public androidx.compose.ui.Alignment.Horizontal getEnd();
+    method public androidx.compose.ui.Alignment.Horizontal getStart();
+    method public androidx.compose.ui.Alignment.Vertical getTop();
+    method public androidx.compose.ui.Alignment getTopCenter();
+    method public androidx.compose.ui.Alignment getTopEnd();
+    method public androidx.compose.ui.Alignment getTopStart();
+    property public final androidx.compose.ui.Alignment.Vertical Bottom;
+    property public final androidx.compose.ui.Alignment BottomCenter;
+    property public final androidx.compose.ui.Alignment BottomEnd;
+    property public final androidx.compose.ui.Alignment BottomStart;
+    property public final androidx.compose.ui.Alignment Center;
+    property public final androidx.compose.ui.Alignment CenterEnd;
+    property public final androidx.compose.ui.Alignment.Horizontal CenterHorizontally;
+    property public final androidx.compose.ui.Alignment CenterStart;
+    property public final androidx.compose.ui.Alignment.Vertical CenterVertically;
+    property public final androidx.compose.ui.Alignment.Horizontal End;
+    property public final androidx.compose.ui.Alignment.Horizontal Start;
+    property public final androidx.compose.ui.Alignment.Vertical Top;
+    property public final androidx.compose.ui.Alignment TopCenter;
+    property public final androidx.compose.ui.Alignment TopEnd;
+    property public final androidx.compose.ui.Alignment TopStart;
+  }
+
+  @androidx.compose.runtime.Immutable public static fun interface Alignment.Horizontal {
+    method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  @androidx.compose.runtime.Immutable public static fun interface Alignment.Vertical {
+    method public int align(int size, int space);
+  }
+
+  @androidx.compose.runtime.Immutable public final class BiasAbsoluteAlignment implements androidx.compose.ui.Alignment {
+    ctor public BiasAbsoluteAlignment(float horizontalBias, float verticalBias);
+    method public long align-oYSo38o(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAbsoluteAlignment copy(float horizontalBias, float verticalBias);
+  }
+
+  @androidx.compose.runtime.Immutable public static final class BiasAbsoluteAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+    ctor public BiasAbsoluteAlignment.Horizontal(float bias);
+    method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAbsoluteAlignment.Horizontal copy(float bias);
+  }
+
+  @androidx.compose.runtime.Immutable public final class BiasAlignment implements androidx.compose.ui.Alignment {
+    ctor public BiasAlignment(float horizontalBias, float verticalBias);
+    method public long align-oYSo38o(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAlignment copy(float horizontalBias, float verticalBias);
+    method public float getHorizontalBias();
+    method public float getVerticalBias();
+    property public final float horizontalBias;
+    property public final float verticalBias;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class BiasAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+    ctor public BiasAlignment.Horizontal(float bias);
+    method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAlignment.Horizontal copy(float bias);
+  }
+
+  @androidx.compose.runtime.Immutable public static final class BiasAlignment.Vertical implements androidx.compose.ui.Alignment.Vertical {
+    ctor public BiasAlignment.Vertical(float bias);
+    method public int align(int size, int space);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAlignment.Vertical copy(float bias);
+  }
+
+  public final class CombinedModifier implements androidx.compose.ui.Modifier {
+    ctor public CombinedModifier(androidx.compose.ui.Modifier outer, androidx.compose.ui.Modifier inner);
+    method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public final class ComposedModifierKt {
+    method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+    method public static androidx.compose.ui.Modifier materialize(androidx.compose.runtime.Composer, androidx.compose.ui.Modifier modifier);
+  }
+
+  @kotlin.RequiresOptIn(message="This API is experimental and is likely to change in the future.") public @interface ExperimentalComposeUiApi {
+  }
+
+  @kotlin.RequiresOptIn(message="Unstable API for use only between compose-ui modules sharing the same exact version, " + "subject to change without notice in major, minor, or patch releases.") public @interface InternalComposeUiApi {
+  }
+
+  @androidx.compose.runtime.Stable public interface Modifier {
+    method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+    method public default infix androidx.compose.ui.Modifier then(androidx.compose.ui.Modifier other);
+    field public static final androidx.compose.ui.Modifier.Companion Companion;
+  }
+
+  public static final class Modifier.Companion implements androidx.compose.ui.Modifier {
+    method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public static interface Modifier.Element extends androidx.compose.ui.Modifier {
+    method public default boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public default boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public default <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public default <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+  public final class ZIndexModifierKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier zIndex(androidx.compose.ui.Modifier, float zIndex);
+  }
+
+}
+
+package androidx.compose.ui.autofill {
+
+  public final class AndroidAutofillDebugUtils_androidKt {
+  }
+
+  public final class AndroidAutofillType_androidKt {
+  }
+
+  public final class AndroidAutofill_androidKt {
+  }
+
+  @androidx.compose.ui.ExperimentalComposeUiApi public interface Autofill {
+    method public void cancelAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
+    method public void requestAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
+  }
+
+  @androidx.compose.ui.ExperimentalComposeUiApi public final class AutofillNode {
+    ctor public AutofillNode(optional java.util.List<? extends androidx.compose.ui.autofill.AutofillType> autofillTypes, optional androidx.compose.ui.geometry.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
+    method public java.util.List<androidx.compose.ui.autofill.AutofillType> getAutofillTypes();
+    method public androidx.compose.ui.geometry.Rect? getBoundingBox();
+    method public int getId();
+    method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? getOnFill();
+    method public void setBoundingBox(androidx.compose.ui.geometry.Rect? p);
+    property public final java.util.List<androidx.compose.ui.autofill.AutofillType> autofillTypes;
+    property public final androidx.compose.ui.geometry.Rect? boundingBox;
+    property public final int id;
+    property public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? onFill;
+  }
+
+  @androidx.compose.ui.ExperimentalComposeUiApi public final class AutofillTree {
+    ctor public AutofillTree();
+    method public java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> getChildren();
+    method public kotlin.Unit? performAutofill(int id, String value);
+    method public operator void plusAssign(androidx.compose.ui.autofill.AutofillNode autofillNode);
+    property public final java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> children;
+  }
+
+  @androidx.compose.ui.ExperimentalComposeUiApi public enum AutofillType {
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressAuxiliaryDetails;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressCountry;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressLocality;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressRegion;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressStreet;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateDay;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateFull;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateMonth;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateYear;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDate;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDay;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationMonth;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationYear;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardNumber;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardSecurityCode;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType EmailAddress;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType Gender;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType NewPassword;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType NewUsername;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType Password;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonFirstName;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonFullName;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonLastName;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonMiddleInitial;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonMiddleName;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonNamePrefix;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonNameSuffix;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneCountryCode;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumber;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumberDevice;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumberNational;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalAddress;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalCode;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalCodeExtended;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType SmsOtpCode;
+    enum_constant public static final androidx.compose.ui.autofill.AutofillType Username;
+  }
+
+}
+
+package androidx.compose.ui.draw {
+
+  public final class AlphaKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier alpha(androidx.compose.ui.Modifier, float alpha);
+  }
+
+  public interface BuildDrawCacheParams {
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public long getSize-NH-jbRc();
+    property public abstract androidx.compose.ui.unit.Density density;
+    property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public abstract long size;
+  }
+
+  public final class CacheDrawScope implements androidx.compose.ui.unit.Density {
+    method public float getDensity();
+    method public float getFontScale();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public long getSize-NH-jbRc();
+    method public androidx.compose.ui.draw.DrawResult onDrawBehind(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public androidx.compose.ui.draw.DrawResult onDrawWithContent(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> block);
+    property public float density;
+    property public float fontScale;
+    property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public final long size;
+  }
+
+  public final class ClipKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clip(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Shape shape);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clipToBounds(androidx.compose.ui.Modifier);
+  }
+
+  public interface DrawCacheModifier extends androidx.compose.ui.draw.DrawModifier {
+    method public void onBuildCache(androidx.compose.ui.draw.BuildDrawCacheParams params);
+  }
+
+  public interface DrawModifier extends androidx.compose.ui.Modifier.Element {
+    method public void draw(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+  }
+
+  public final class DrawModifierKt {
+    method public static androidx.compose.ui.Modifier drawBehind(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+    method public static androidx.compose.ui.Modifier drawWithCache(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.draw.CacheDrawScope,androidx.compose.ui.draw.DrawResult> onBuildDrawCache);
+    method public static androidx.compose.ui.Modifier drawWithContent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> onDraw);
+  }
+
+  public final class DrawResult {
+  }
+
+  public final class PainterModifierKt {
+    method public static androidx.compose.ui.Modifier paint(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.painter.Painter painter, optional boolean sizeToIntrinsics, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+  }
+
+  public final class RotateKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier rotate(androidx.compose.ui.Modifier, float degrees);
+  }
+
+  public final class ScaleKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scaleX, float scaleY);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scale);
+  }
+
+  public final class ShadowKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier shadow-HfQes2E(androidx.compose.ui.Modifier, float elevation, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+  }
+
+}
+
+package androidx.compose.ui.focus {
+
+  public final class FocusChangedModifierKt {
+    method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
+  }
+
+  public enum FocusDirection {
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Down;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Left;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Next;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Previous;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Right;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Up;
+  }
+
+  public interface FocusEventModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onFocusEvent(androidx.compose.ui.focus.FocusState focusState);
+  }
+
+  public final class FocusEventModifierKt {
+    method public static androidx.compose.ui.Modifier onFocusEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusEvent);
+  }
+
+  public interface FocusManager {
+    method public void clearFocus(optional boolean forcedClear);
+    method public boolean moveFocus(androidx.compose.ui.focus.FocusDirection focusDirection);
+  }
+
+  public final class FocusModifierKt {
+    method public static androidx.compose.ui.Modifier focusModifier(androidx.compose.ui.Modifier);
+  }
+
+  public final class FocusNodeUtilsKt {
+  }
+
+  public final class FocusOrder {
+    ctor public FocusOrder();
+    method public androidx.compose.ui.focus.FocusRequester getDown();
+    method public androidx.compose.ui.focus.FocusRequester getEnd();
+    method public androidx.compose.ui.focus.FocusRequester getLeft();
+    method public androidx.compose.ui.focus.FocusRequester getNext();
+    method public androidx.compose.ui.focus.FocusRequester getPrevious();
+    method public androidx.compose.ui.focus.FocusRequester getRight();
+    method public androidx.compose.ui.focus.FocusRequester getStart();
+    method public androidx.compose.ui.focus.FocusRequester getUp();
+    method public void setDown(androidx.compose.ui.focus.FocusRequester p);
+    method public void setEnd(androidx.compose.ui.focus.FocusRequester p);
+    method public void setLeft(androidx.compose.ui.focus.FocusRequester p);
+    method public void setNext(androidx.compose.ui.focus.FocusRequester p);
+    method public void setPrevious(androidx.compose.ui.focus.FocusRequester p);
+    method public void setRight(androidx.compose.ui.focus.FocusRequester p);
+    method public void setStart(androidx.compose.ui.focus.FocusRequester p);
+    method public void setUp(androidx.compose.ui.focus.FocusRequester p);
+    property public final androidx.compose.ui.focus.FocusRequester down;
+    property public final androidx.compose.ui.focus.FocusRequester end;
+    property public final androidx.compose.ui.focus.FocusRequester left;
+    property public final androidx.compose.ui.focus.FocusRequester next;
+    property public final androidx.compose.ui.focus.FocusRequester previous;
+    property public final androidx.compose.ui.focus.FocusRequester right;
+    property public final androidx.compose.ui.focus.FocusRequester start;
+    property public final androidx.compose.ui.focus.FocusRequester up;
+  }
+
+  public interface FocusOrderModifier extends androidx.compose.ui.Modifier.Element {
+    method public void populateFocusOrder(androidx.compose.ui.focus.FocusOrder focusOrder);
+  }
+
+  public final class FocusOrderModifierKt {
+    method public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+    method public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+    method public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+  }
+
+  public final class FocusRequester {
+    ctor public FocusRequester();
+    method public boolean captureFocus();
+    method public boolean freeFocus();
+    method public void requestFocus();
+    field public static final androidx.compose.ui.focus.FocusRequester.Companion Companion;
+  }
+
+  public static final class FocusRequester.Companion {
+    method @androidx.compose.ui.ExperimentalComposeUiApi public androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory createRefs();
+    method public androidx.compose.ui.focus.FocusRequester getDefault();
+    property public final androidx.compose.ui.focus.FocusRequester Default;
+  }
+
+  @androidx.compose.ui.ExperimentalComposeUiApi public static final class FocusRequester.Companion.FocusRequesterFactory {
+    method public operator androidx.compose.ui.focus.FocusRequester component1();
+    method public operator androidx.compose.ui.focus.FocusRequester component10();
+    method public operator androidx.compose.ui.focus.FocusRequester component11();
+    method public operator androidx.compose.ui.focus.FocusRequester component12();
+    method public operator androidx.compose.ui.focus.FocusRequester component13();
+    method public operator androidx.compose.ui.focus.FocusRequester component14();
+    method public operator androidx.compose.ui.focus.FocusRequester component15();
+    method public operator androidx.compose.ui.focus.FocusRequester component16();
+    method public operator androidx.compose.ui.focus.FocusRequester component2();
+    method public operator androidx.compose.ui.focus.FocusRequester component3();
+    method public operator androidx.compose.ui.focus.FocusRequester component4();
+    method public operator androidx.compose.ui.focus.FocusRequester component5();
+    method public operator androidx.compose.ui.focus.FocusRequester component6();
+    method public operator androidx.compose.ui.focus.FocusRequester component7();
+    method public operator androidx.compose.ui.focus.FocusRequester component8();
+    method public operator androidx.compose.ui.focus.FocusRequester component9();
+    field public static final androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory INSTANCE;
+  }
+
+  public final class FocusRequesterKt {
+  }
+
+  public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
+    method public androidx.compose.ui.focus.FocusRequester getFocusRequester();
+    property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
+  }
+
+  public final class FocusRequesterModifierKt {
+    method public static androidx.compose.ui.Modifier focusRequester(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+  }
+
+  public enum FocusState {
+    enum_constant public static final androidx.compose.ui.focus.FocusState Active;
+    enum_constant public static final androidx.compose.ui.focus.FocusState ActiveParent;
+    enum_constant public static final androidx.compose.ui.focus.FocusState Captured;
+    enum_constant public static final androidx.compose.ui.focus.FocusState Disabled;
+    enum_constant public static final androidx.compose.ui.focus.FocusState Inactive;
+  }
+
+  public final class FocusStateKt {
+    method public static boolean isFocused(androidx.compose.ui.focus.FocusState);
+  }
+
+  public final class FocusTransactionsKt {
+  }
+
+  public final class FocusTraversalKt {
+  }
+
+}
+
+package androidx.compose.ui.graphics {
+
+  public final class GraphicsLayerModifierKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> block);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer-i_P0lGk(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier toolingGraphicsLayer(androidx.compose.ui.Modifier);
+  }
+
+  public interface GraphicsLayerScope extends androidx.compose.ui.unit.Density {
+    method public float getAlpha();
+    method public float getCameraDistance();
+    method public boolean getClip();
+    method public float getRotationX();
+    method public float getRotationY();
+    method public float getRotationZ();
+    method public float getScaleX();
+    method public float getScaleY();
+    method public float getShadowElevation();
+    method public androidx.compose.ui.graphics.Shape getShape();
+    method public long getTransformOrigin-SzJe1aQ();
+    method public float getTranslationX();
+    method public float getTranslationY();
+    method public void setAlpha(float p);
+    method public void setCameraDistance(float p);
+    method public void setClip(boolean p);
+    method public void setRotationX(float p);
+    method public void setRotationY(float p);
+    method public void setRotationZ(float p);
+    method public void setScaleX(float p);
+    method public void setScaleY(float p);
+    method public void setShadowElevation(float p);
+    method public void setShape(androidx.compose.ui.graphics.Shape p);
+    method public void setTransformOrigin-__ExYCQ(long p);
+    method public void setTranslationX(float p);
+    method public void setTranslationY(float p);
+    property public abstract float alpha;
+    property public abstract float cameraDistance;
+    property public abstract boolean clip;
+    property public abstract float rotationX;
+    property public abstract float rotationY;
+    property public abstract float rotationZ;
+    property public abstract float scaleX;
+    property public abstract float scaleY;
+    property public abstract float shadowElevation;
+    property public abstract androidx.compose.ui.graphics.Shape shape;
+    property public abstract long transformOrigin;
+    property public abstract float translationX;
+    property public abstract float translationY;
+  }
+
+  public final class GraphicsLayerScopeKt {
+    method public static androidx.compose.ui.graphics.GraphicsLayerScope GraphicsLayerScope();
+    field public static final float DefaultCameraDistance = 8.0f;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class TransformOrigin {
+    ctor public TransformOrigin();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-SzJe1aQ(long $this, optional float pivotFractionX, optional float pivotFractionY);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getPivotFractionX-impl(long $this);
+    method public static float getPivotFractionY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Immutable public static inline String! toString-impl(long p);
+    field public static final androidx.compose.ui.graphics.TransformOrigin.Companion Companion;
+  }
+
+  public static final class TransformOrigin.Companion {
+    method public long getCenter-SzJe1aQ();
+    property public final long Center;
+  }
+
+  public final class TransformOriginKt {
+    method public static long TransformOrigin(float pivotFractionX, float pivotFractionY);
+  }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+  @androidx.compose.runtime.Immutable @androidx.compose.ui.ExperimentalComposeUiApi public final class AnimatedImageVector {
+    method public androidx.compose.ui.graphics.vector.ImageVector getImageVector();
+    method public int getTotalDuration();
+    method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.painter.Painter painterFor(boolean atEnd);
+    property public final androidx.compose.ui.graphics.vector.ImageVector imageVector;
+    property public final int totalDuration;
+  }
+
+  public final class AnimatorKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class ImageVector {
+    method public float getDefaultHeight-D9Ej5fM();
+    method public float getDefaultWidth-D9Ej5fM();
+    method public String getName();
+    method public androidx.compose.ui.graphics.vector.VectorGroup getRoot();
+    method public androidx.compose.ui.graphics.BlendMode getTintBlendMode();
+    method public long getTintColor-0d7_KjU();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+    property public final float defaultHeight;
+    property public final float defaultWidth;
+    property public final String name;
+    property public final androidx.compose.ui.graphics.vector.VectorGroup root;
+    property public final androidx.compose.ui.graphics.BlendMode tintBlendMode;
+    property public final long tintColor;
+    property public final float viewportHeight;
+    property public final float viewportWidth;
+    field public static final androidx.compose.ui.graphics.vector.ImageVector.Companion Companion;
+  }
+
+  public static final class ImageVector.Builder {
+    method public androidx.compose.ui.graphics.vector.ImageVector.Builder addGroup(optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData);
+    method public androidx.compose.ui.graphics.vector.ImageVector.Builder addPath(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional androidx.compose.ui.graphics.PathFillType pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional androidx.compose.ui.graphics.StrokeCap strokeLineCap, optional androidx.compose.ui.graphics.StrokeJoin strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+    method public androidx.compose.ui.graphics.vector.ImageVector build();
+    method public androidx.compose.ui.graphics.vector.ImageVector.Builder clearGroup();
+  }
+
+  public static final class ImageVector.Companion {
+  }
+
+  public final class ImageVectorKt {
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder group(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,kotlin.Unit> block);
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder path(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional androidx.compose.ui.graphics.StrokeCap strokeLineCap, optional androidx.compose.ui.graphics.StrokeJoin strokeLineJoin, optional float strokeLineMiter, optional androidx.compose.ui.graphics.PathFillType pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+  public abstract sealed class VNode {
+    method public abstract void draw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    method public final void invalidate();
+  }
+
+  public final class VectorApplier extends androidx.compose.runtime.AbstractApplier<androidx.compose.ui.graphics.vector.VNode> {
+    ctor public VectorApplier(androidx.compose.ui.graphics.vector.VNode root);
+    method public void insertBottomUp(int index, androidx.compose.ui.graphics.vector.VNode instance);
+    method public void insertTopDown(int index, androidx.compose.ui.graphics.vector.VNode instance);
+    method public void move(int from, int to, int count);
+    method protected void onClear();
+    method public void remove(int index, int count);
+  }
+
+  public final class VectorComposeKt {
+    method @androidx.compose.runtime.Composable public static void Group(optional String name, optional float rotation, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Path(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional androidx.compose.ui.graphics.PathFillType pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional androidx.compose.ui.graphics.StrokeCap strokeLineCap, optional androidx.compose.ui.graphics.StrokeJoin strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+  }
+
+  @androidx.compose.runtime.Immutable public final class VectorGroup extends androidx.compose.ui.graphics.vector.VectorNode implements java.lang.Iterable<androidx.compose.ui.graphics.vector.VectorNode> kotlin.jvm.internal.markers.KMappedMarker {
+    method public operator androidx.compose.ui.graphics.vector.VectorNode get(int index);
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getClipPathData();
+    method public String getName();
+    method public float getPivotX();
+    method public float getPivotY();
+    method public float getRotation();
+    method public float getScaleX();
+    method public float getScaleY();
+    method public int getSize();
+    method public float getTranslationX();
+    method public float getTranslationY();
+    method public java.util.Iterator<androidx.compose.ui.graphics.vector.VectorNode> iterator();
+    property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> clipPathData;
+    property public final String name;
+    property public final float pivotX;
+    property public final float pivotY;
+    property public final float rotation;
+    property public final float scaleX;
+    property public final float scaleY;
+    property public final int size;
+    property public final float translationX;
+    property public final float translationY;
+  }
+
+  public final class VectorKt {
+    method public static inline java.util.List<androidx.compose.ui.graphics.vector.PathNode> PathData(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> block);
+    method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> addPathNodes(String? pathStr);
+    method public static androidx.compose.ui.graphics.PathFillType getDefaultFillType();
+    method public static androidx.compose.ui.graphics.StrokeCap getDefaultStrokeLineCap();
+    method public static androidx.compose.ui.graphics.StrokeJoin getDefaultStrokeLineJoin();
+    method public static androidx.compose.ui.graphics.BlendMode getDefaultTintBlendMode();
+    method public static long getDefaultTintColor();
+    method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> getEmptyPath();
+    field public static final String DefaultGroupName = "";
+    field public static final String DefaultPathName = "";
+    field public static final float DefaultPivotX = 0.0f;
+    field public static final float DefaultPivotY = 0.0f;
+    field public static final float DefaultRotation = 0.0f;
+    field public static final float DefaultScaleX = 1.0f;
+    field public static final float DefaultScaleY = 1.0f;
+    field public static final float DefaultStrokeLineMiter = 4.0f;
+    field public static final float DefaultStrokeLineWidth = 0.0f;
+    field public static final float DefaultTranslationX = 0.0f;
+    field public static final float DefaultTranslationY = 0.0f;
+    field public static final float DefaultTrimPathEnd = 1.0f;
+    field public static final float DefaultTrimPathOffset = 0.0f;
+    field public static final float DefaultTrimPathStart = 0.0f;
+  }
+
+  public abstract sealed class VectorNode {
+  }
+
+  public final class VectorPainter extends androidx.compose.ui.graphics.painter.Painter {
+    method public long getIntrinsicSize-NH-jbRc();
+    method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public long intrinsicSize;
+  }
+
+  public final class VectorPainterKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(androidx.compose.ui.graphics.vector.ImageVector image);
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter-u_AqRoo(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional androidx.compose.ui.graphics.BlendMode tintBlendMode, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+    field public static final String RootGroupName = "VectorRootGroup";
+  }
+
+  @androidx.compose.runtime.Immutable public final class VectorPath extends androidx.compose.ui.graphics.vector.VectorNode {
+    method public androidx.compose.ui.graphics.Brush? getFill();
+    method public float getFillAlpha();
+    method public String getName();
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getPathData();
+    method public androidx.compose.ui.graphics.PathFillType getPathFillType();
+    method public androidx.compose.ui.graphics.Brush? getStroke();
+    method public float getStrokeAlpha();
+    method public androidx.compose.ui.graphics.StrokeCap getStrokeLineCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getStrokeLineJoin();
+    method public float getStrokeLineMiter();
+    method public float getStrokeLineWidth();
+    method public float getTrimPathEnd();
+    method public float getTrimPathOffset();
+    method public float getTrimPathStart();
+    property public final androidx.compose.ui.graphics.Brush? fill;
+    property public final float fillAlpha;
+    property public final String name;
+    property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> pathData;
+    property public final androidx.compose.ui.graphics.PathFillType pathFillType;
+    property public final androidx.compose.ui.graphics.Brush? stroke;
+    property public final float strokeAlpha;
+    property public final androidx.compose.ui.graphics.StrokeCap strokeLineCap;
+    property public final androidx.compose.ui.graphics.StrokeJoin strokeLineJoin;
+    property public final float strokeLineMiter;
+    property public final float strokeLineWidth;
+    property public final float trimPathEnd;
+    property public final float trimPathOffset;
+    property public final float trimPathStart;
+  }
+
+}
+
+package androidx.compose.ui.graphics.vector.compat {
+
+  public final class XmlAnimatedVectorParser_androidKt {
+  }
+
+  public final class XmlAnimatorParser_androidKt {
+  }
+
+  public final class XmlPullParserUtils_androidKt {
+  }
+
+  public final class XmlVectorParser_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.hapticfeedback {
+
+  public interface HapticFeedback {
+    method public void performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType hapticFeedbackType);
+  }
+
+  public enum HapticFeedbackType {
+    enum_constant public static final androidx.compose.ui.hapticfeedback.HapticFeedbackType LongPress;
+    enum_constant public static final androidx.compose.ui.hapticfeedback.HapticFeedbackType TextHandleMove;
+  }
+
+}
+
+package androidx.compose.ui.input.key {
+
+  public final inline class Key {
+    ctor public Key();
+    method public static long constructor-impl(long keyCode);
+    method public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getKeyCode();
+    method public static inline int hashCode-impl(long p);
+    method public static String toString-impl(long $this);
+    property public final long keyCode;
+    field public static final androidx.compose.ui.input.key.Key.Companion Companion;
+  }
+
+  public static final class Key.Companion {
+    method public long getA-EK5gGoQ();
+    method public long getAllApps-EK5gGoQ();
+    method public long getAltLeft-EK5gGoQ();
+    method public long getAltRight-EK5gGoQ();
+    method public long getApostrophe-EK5gGoQ();
+    method public long getAppSwitch-EK5gGoQ();
+    method public long getAssist-EK5gGoQ();
+    method public long getAt-EK5gGoQ();
+    method public long getAvReceiverInput-EK5gGoQ();
+    method public long getAvReceiverPower-EK5gGoQ();
+    method public long getB-EK5gGoQ();
+    method public long getBack-EK5gGoQ();
+    method public long getBackslash-EK5gGoQ();
+    method public long getBackspace-EK5gGoQ();
+    method public long getBookmark-EK5gGoQ();
+    method public long getBreak-EK5gGoQ();
+    method public long getBrightnessDown-EK5gGoQ();
+    method public long getBrightnessUp-EK5gGoQ();
+    method public long getBrowser-EK5gGoQ();
+    method public long getButton1-EK5gGoQ();
+    method public long getButton10-EK5gGoQ();
+    method public long getButton11-EK5gGoQ();
+    method public long getButton12-EK5gGoQ();
+    method public long getButton13-EK5gGoQ();
+    method public long getButton14-EK5gGoQ();
+    method public long getButton15-EK5gGoQ();
+    method public long getButton16-EK5gGoQ();
+    method public long getButton2-EK5gGoQ();
+    method public long getButton3-EK5gGoQ();
+    method public long getButton4-EK5gGoQ();
+    method public long getButton5-EK5gGoQ();
+    method public long getButton6-EK5gGoQ();
+    method public long getButton7-EK5gGoQ();
+    method public long getButton8-EK5gGoQ();
+    method public long getButton9-EK5gGoQ();
+    method public long getButtonA-EK5gGoQ();
+    method public long getButtonB-EK5gGoQ();
+    method public long getButtonC-EK5gGoQ();
+    method public long getButtonL1-EK5gGoQ();
+    method public long getButtonL2-EK5gGoQ();
+    method public long getButtonMode-EK5gGoQ();
+    method public long getButtonR1-EK5gGoQ();
+    method public long getButtonR2-EK5gGoQ();
+    method public long getButtonSelect-EK5gGoQ();
+    method public long getButtonStart-EK5gGoQ();
+    method public long getButtonThumbLeft-EK5gGoQ();
+    method public long getButtonThumbRight-EK5gGoQ();
+    method public long getButtonX-EK5gGoQ();
+    method public long getButtonY-EK5gGoQ();
+    method public long getButtonZ-EK5gGoQ();
+    method public long getC-EK5gGoQ();
+    method public long getCalculator-EK5gGoQ();
+    method public long getCalendar-EK5gGoQ();
+    method public long getCall-EK5gGoQ();
+    method public long getCamera-EK5gGoQ();
+    method public long getCapsLock-EK5gGoQ();
+    method public long getCaptions-EK5gGoQ();
+    method public long getChannelDown-EK5gGoQ();
+    method public long getChannelUp-EK5gGoQ();
+    method public long getClear-EK5gGoQ();
+    method public long getComma-EK5gGoQ();
+    method public long getContacts-EK5gGoQ();
+    method public long getCopy-EK5gGoQ();
+    method public long getCtrlLeft-EK5gGoQ();
+    method public long getCtrlRight-EK5gGoQ();
+    method public long getCut-EK5gGoQ();
+    method public long getD-EK5gGoQ();
+    method public long getDelete-EK5gGoQ();
+    method public long getDirectionCenter-EK5gGoQ();
+    method public long getDirectionDown-EK5gGoQ();
+    method public long getDirectionDownLeft-EK5gGoQ();
+    method public long getDirectionDownRight-EK5gGoQ();
+    method public long getDirectionLeft-EK5gGoQ();
+    method public long getDirectionRight-EK5gGoQ();
+    method public long getDirectionUp-EK5gGoQ();
+    method public long getDirectionUpLeft-EK5gGoQ();
+    method public long getDirectionUpRight-EK5gGoQ();
+    method public long getDvr-EK5gGoQ();
+    method public long getE-EK5gGoQ();
+    method public long getEight-EK5gGoQ();
+    method public long getEisu-EK5gGoQ();
+    method public long getEndCall-EK5gGoQ();
+    method public long getEnter-EK5gGoQ();
+    method public long getEnvelope-EK5gGoQ();
+    method public long getEquals-EK5gGoQ();
+    method public long getEscape-EK5gGoQ();
+    method public long getF-EK5gGoQ();
+    method public long getF1-EK5gGoQ();
+    method public long getF10-EK5gGoQ();
+    method public long getF11-EK5gGoQ();
+    method public long getF12-EK5gGoQ();
+    method public long getF2-EK5gGoQ();
+    method public long getF3-EK5gGoQ();
+    method public long getF4-EK5gGoQ();
+    method public long getF5-EK5gGoQ();
+    method public long getF6-EK5gGoQ();
+    method public long getF7-EK5gGoQ();
+    method public long getF8-EK5gGoQ();
+    method public long getF9-EK5gGoQ();
+    method public long getFive-EK5gGoQ();
+    method public long getFocus-EK5gGoQ();
+    method public long getForward-EK5gGoQ();
+    method public long getFour-EK5gGoQ();
+    method public long getFunction-EK5gGoQ();
+    method public long getG-EK5gGoQ();
+    method public long getGrave-EK5gGoQ();
+    method public long getGuide-EK5gGoQ();
+    method public long getH-EK5gGoQ();
+    method public long getHeadsetHook-EK5gGoQ();
+    method public long getHelp-EK5gGoQ();
+    method public long getHenkan-EK5gGoQ();
+    method public long getHome-EK5gGoQ();
+    method public long getI-EK5gGoQ();
+    method public long getInfo-EK5gGoQ();
+    method public long getInsert-EK5gGoQ();
+    method public long getJ-EK5gGoQ();
+    method public long getK-EK5gGoQ();
+    method public long getKana-EK5gGoQ();
+    method public long getKatakanaHiragana-EK5gGoQ();
+    method public long getL-EK5gGoQ();
+    method public long getLanguageSwitch-EK5gGoQ();
+    method public long getLastChannel-EK5gGoQ();
+    method public long getLeftBracket-EK5gGoQ();
+    method public long getM-EK5gGoQ();
+    method public long getMannerMode-EK5gGoQ();
+    method public long getMediaAudioTrack-EK5gGoQ();
+    method public long getMediaClose-EK5gGoQ();
+    method public long getMediaEject-EK5gGoQ();
+    method public long getMediaFastForward-EK5gGoQ();
+    method public long getMediaNext-EK5gGoQ();
+    method public long getMediaPause-EK5gGoQ();
+    method public long getMediaPlay-EK5gGoQ();
+    method public long getMediaPlayPause-EK5gGoQ();
+    method public long getMediaPrevious-EK5gGoQ();
+    method public long getMediaRecord-EK5gGoQ();
+    method public long getMediaRewind-EK5gGoQ();
+    method public long getMediaSkipBackward-EK5gGoQ();
+    method public long getMediaSkipForward-EK5gGoQ();
+    method public long getMediaStepBackward-EK5gGoQ();
+    method public long getMediaStepForward-EK5gGoQ();
+    method public long getMediaStop-EK5gGoQ();
+    method public long getMediaTopMenu-EK5gGoQ();
+    method public long getMenu-EK5gGoQ();
+    method public long getMetaLeft-EK5gGoQ();
+    method public long getMetaRight-EK5gGoQ();
+    method public long getMicrophoneMute-EK5gGoQ();
+    method public long getMinus-EK5gGoQ();
+    method public long getMoveEnd-EK5gGoQ();
+    method public long getMoveHome-EK5gGoQ();
+    method public long getMuhenkan-EK5gGoQ();
+    method public long getMultiply-EK5gGoQ();
+    method public long getMusic-EK5gGoQ();
+    method public long getN-EK5gGoQ();
+    method public long getNavigateIn-EK5gGoQ();
+    method public long getNavigateNext-EK5gGoQ();
+    method public long getNavigateOut-EK5gGoQ();
+    method public long getNavigatePrevious-EK5gGoQ();
+    method public long getNine-EK5gGoQ();
+    method public long getNotification-EK5gGoQ();
+    method public long getNumLock-EK5gGoQ();
+    method public long getNumPad0-EK5gGoQ();
+    method public long getNumPad1-EK5gGoQ();
+    method public long getNumPad2-EK5gGoQ();
+    method public long getNumPad3-EK5gGoQ();
+    method public long getNumPad4-EK5gGoQ();
+    method public long getNumPad5-EK5gGoQ();
+    method public long getNumPad6-EK5gGoQ();
+    method public long getNumPad7-EK5gGoQ();
+    method public long getNumPad8-EK5gGoQ();
+    method public long getNumPad9-EK5gGoQ();
+    method public long getNumPadAdd-EK5gGoQ();
+    method public long getNumPadComma-EK5gGoQ();
+    method public long getNumPadDivide-EK5gGoQ();
+    method public long getNumPadDot-EK5gGoQ();
+    method public long getNumPadEnter-EK5gGoQ();
+    method public long getNumPadEquals-EK5gGoQ();
+    method public long getNumPadLeftParenthesis-EK5gGoQ();
+    method public long getNumPadMultiply-EK5gGoQ();
+    method public long getNumPadRightParenthesis-EK5gGoQ();
+    method public long getNumPadSubtract-EK5gGoQ();
+    method public long getNumber-EK5gGoQ();
+    method public long getO-EK5gGoQ();
+    method public long getOne-EK5gGoQ();
+    method public long getP-EK5gGoQ();
+    method public long getPageDown-EK5gGoQ();
+    method public long getPageUp-EK5gGoQ();
+    method public long getPairing-EK5gGoQ();
+    method public long getPaste-EK5gGoQ();
+    method public long getPeriod-EK5gGoQ();
+    method public long getPictureSymbols-EK5gGoQ();
+    method public long getPlus-EK5gGoQ();
+    method public long getPound-EK5gGoQ();
+    method public long getPower-EK5gGoQ();
+    method public long getPrintScreen-EK5gGoQ();
+    method public long getProfileSwitch-EK5gGoQ();
+    method public long getProgramBlue-EK5gGoQ();
+    method public long getProgramGreen-EK5gGoQ();
+    method public long getProgramRed-EK5gGoQ();
+    method public long getProgramYellow-EK5gGoQ();
+    method public long getQ-EK5gGoQ();
+    method public long getR-EK5gGoQ();
+    method public long getRefresh-EK5gGoQ();
+    method public long getRightBracket-EK5gGoQ();
+    method public long getRo-EK5gGoQ();
+    method public long getS-EK5gGoQ();
+    method public long getScrollLock-EK5gGoQ();
+    method public long getSearch-EK5gGoQ();
+    method public long getSemicolon-EK5gGoQ();
+    method public long getSetTopBoxInput-EK5gGoQ();
+    method public long getSetTopBoxPower-EK5gGoQ();
+    method public long getSettings-EK5gGoQ();
+    method public long getSeven-EK5gGoQ();
+    method public long getShiftLeft-EK5gGoQ();
+    method public long getShiftRight-EK5gGoQ();
+    method public long getSix-EK5gGoQ();
+    method public long getSlash-EK5gGoQ();
+    method public long getSleep-EK5gGoQ();
+    method public long getSoftLeft-EK5gGoQ();
+    method public long getSoftRight-EK5gGoQ();
+    method public long getSoftSleep-EK5gGoQ();
+    method public long getSpacebar-EK5gGoQ();
+    method public long getStem1-EK5gGoQ();
+    method public long getStem2-EK5gGoQ();
+    method public long getStem3-EK5gGoQ();
+    method public long getStemPrimary-EK5gGoQ();
+    method public long getSwitchCharset-EK5gGoQ();
+    method public long getSymbol-EK5gGoQ();
+    method public long getSystemNavigationDown-EK5gGoQ();
+    method public long getSystemNavigationLeft-EK5gGoQ();
+    method public long getSystemNavigationRight-EK5gGoQ();
+    method public long getSystemNavigationUp-EK5gGoQ();
+    method public long getT-EK5gGoQ();
+    method public long getTab-EK5gGoQ();
+    method public long getThree-EK5gGoQ();
+    method public long getThumbsDown-EK5gGoQ();
+    method public long getThumbsUp-EK5gGoQ();
+    method public long getToggle2D3D-EK5gGoQ();
+    method public long getTv-EK5gGoQ();
+    method public long getTvAntennaCable-EK5gGoQ();
+    method public long getTvAudioDescription-EK5gGoQ();
+    method public long getTvAudioDescriptionMixingVolumeDown-EK5gGoQ();
+    method public long getTvAudioDescriptionMixingVolumeUp-EK5gGoQ();
+    method public long getTvContentsMenu-EK5gGoQ();
+    method public long getTvDataService-EK5gGoQ();
+    method public long getTvInput-EK5gGoQ();
+    method public long getTvInputComponent1-EK5gGoQ();
+    method public long getTvInputComponent2-EK5gGoQ();
+    method public long getTvInputComposite1-EK5gGoQ();
+    method public long getTvInputComposite2-EK5gGoQ();
+    method public long getTvInputHdmi1-EK5gGoQ();
+    method public long getTvInputHdmi2-EK5gGoQ();
+    method public long getTvInputHdmi3-EK5gGoQ();
+    method public long getTvInputHdmi4-EK5gGoQ();
+    method public long getTvInputVga1-EK5gGoQ();
+    method public long getTvMediaContextMenu-EK5gGoQ();
+    method public long getTvNetwork-EK5gGoQ();
+    method public long getTvNumberEntry-EK5gGoQ();
+    method public long getTvPower-EK5gGoQ();
+    method public long getTvRadioService-EK5gGoQ();
+    method public long getTvSatellite-EK5gGoQ();
+    method public long getTvSatelliteBs-EK5gGoQ();
+    method public long getTvSatelliteCs-EK5gGoQ();
+    method public long getTvSatelliteService-EK5gGoQ();
+    method public long getTvTeletext-EK5gGoQ();
+    method public long getTvTerrestrialAnalog-EK5gGoQ();
+    method public long getTvTerrestrialDigital-EK5gGoQ();
+    method public long getTvTimerProgramming-EK5gGoQ();
+    method public long getTvZoomMode-EK5gGoQ();
+    method public long getTwo-EK5gGoQ();
+    method public long getU-EK5gGoQ();
+    method public long getUnknown-EK5gGoQ();
+    method public long getV-EK5gGoQ();
+    method public long getVoiceAssist-EK5gGoQ();
+    method public long getVolumeDown-EK5gGoQ();
+    method public long getVolumeMute-EK5gGoQ();
+    method public long getVolumeUp-EK5gGoQ();
+    method public long getW-EK5gGoQ();
+    method public long getWakeUp-EK5gGoQ();
+    method public long getWindow-EK5gGoQ();
+    method public long getX-EK5gGoQ();
+    method public long getY-EK5gGoQ();
+    method public long getYen-EK5gGoQ();
+    method public long getZ-EK5gGoQ();
+    method public long getZenkakuHankaru-EK5gGoQ();
+    method public long getZero-EK5gGoQ();
+    method public long getZoomIn-EK5gGoQ();
+    method public long getZoomOut-EK5gGoQ();
+    property public final long A;
+    property public final long AllApps;
+    property public final long AltLeft;
+    property public final long AltRight;
+    property public final long Apostrophe;
+    property public final long AppSwitch;
+    property public final long Assist;
+    property public final long At;
+    property public final long AvReceiverInput;
+    property public final long AvReceiverPower;
+    property public final long B;
+    property public final long Back;
+    property public final long Backslash;
+    property public final long Backspace;
+    property public final long Bookmark;
+    property public final long Break;
+    property public final long BrightnessDown;
+    property public final long BrightnessUp;
+    property public final long Browser;
+    property public final long Button1;
+    property public final long Button10;
+    property public final long Button11;
+    property public final long Button12;
+    property public final long Button13;
+    property public final long Button14;
+    property public final long Button15;
+    property public final long Button16;
+    property public final long Button2;
+    property public final long Button3;
+    property public final long Button4;
+    property public final long Button5;
+    property public final long Button6;
+    property public final long Button7;
+    property public final long Button8;
+    property public final long Button9;
+    property public final long ButtonA;
+    property public final long ButtonB;
+    property public final long ButtonC;
+    property public final long ButtonL1;
+    property public final long ButtonL2;
+    property public final long ButtonMode;
+    property public final long ButtonR1;
+    property public final long ButtonR2;
+    property public final long ButtonSelect;
+    property public final long ButtonStart;
+    property public final long ButtonThumbLeft;
+    property public final long ButtonThumbRight;
+    property public final long ButtonX;
+    property public final long ButtonY;
+    property public final long ButtonZ;
+    property public final long C;
+    property public final long Calculator;
+    property public final long Calendar;
+    property public final long Call;
+    property public final long Camera;
+    property public final long CapsLock;
+    property public final long Captions;
+    property public final long ChannelDown;
+    property public final long ChannelUp;
+    property public final long Clear;
+    property public final long Comma;
+    property public final long Contacts;
+    property public final long Copy;
+    property public final long CtrlLeft;
+    property public final long CtrlRight;
+    property public final long Cut;
+    property public final long D;
+    property public final long Delete;
+    property public final long DirectionCenter;
+    property public final long DirectionDown;
+    property public final long DirectionDownLeft;
+    property public final long DirectionDownRight;
+    property public final long DirectionLeft;
+    property public final long DirectionRight;
+    property public final long DirectionUp;
+    property public final long DirectionUpLeft;
+    property public final long DirectionUpRight;
+    property public final long Dvr;
+    property public final long E;
+    property public final long Eight;
+    property public final long Eisu;
+    property public final long EndCall;
+    property public final long Enter;
+    property public final long Envelope;
+    property public final long Equals;
+    property public final long Escape;
+    property public final long F;
+    property public final long F1;
+    property public final long F10;
+    property public final long F11;
+    property public final long F12;
+    property public final long F2;
+    property public final long F3;
+    property public final long F4;
+    property public final long F5;
+    property public final long F6;
+    property public final long F7;
+    property public final long F8;
+    property public final long F9;
+    property public final long Five;
+    property public final long Focus;
+    property public final long Forward;
+    property public final long Four;
+    property public final long Function;
+    property public final long G;
+    property public final long Grave;
+    property public final long Guide;
+    property public final long H;
+    property public final long HeadsetHook;
+    property public final long Help;
+    property public final long Henkan;
+    property public final long Home;
+    property public final long I;
+    property public final long Info;
+    property public final long Insert;
+    property public final long J;
+    property public final long K;
+    property public final long Kana;
+    property public final long KatakanaHiragana;
+    property public final long L;
+    property public final long LanguageSwitch;
+    property public final long LastChannel;
+    property public final long LeftBracket;
+    property public final long M;
+    property public final long MannerMode;
+    property public final long MediaAudioTrack;
+    property public final long MediaClose;
+    property public final long MediaEject;
+    property public final long MediaFastForward;
+    property public final long MediaNext;
+    property public final long MediaPause;
+    property public final long MediaPlay;
+    property public final long MediaPlayPause;
+    property public final long MediaPrevious;
+    property public final long MediaRecord;
+    property public final long MediaRewind;
+    property public final long MediaSkipBackward;
+    property public final long MediaSkipForward;
+    property public final long MediaStepBackward;
+    property public final long MediaStepForward;
+    property public final long MediaStop;
+    property public final long MediaTopMenu;
+    property public final long Menu;
+    property public final long MetaLeft;
+    property public final long MetaRight;
+    property public final long MicrophoneMute;
+    property public final long Minus;
+    property public final long MoveEnd;
+    property public final long MoveHome;
+    property public final long Muhenkan;
+    property public final long Multiply;
+    property public final long Music;
+    property public final long N;
+    property public final long NavigateIn;
+    property public final long NavigateNext;
+    property public final long NavigateOut;
+    property public final long NavigatePrevious;
+    property public final long Nine;
+    property public final long Notification;
+    property public final long NumLock;
+    property public final long NumPad0;
+    property public final long NumPad1;
+    property public final long NumPad2;
+    property public final long NumPad3;
+    property public final long NumPad4;
+    property public final long NumPad5;
+    property public final long NumPad6;
+    property public final long NumPad7;
+    property public final long NumPad8;
+    property public final long NumPad9;
+    property public final long NumPadAdd;
+    property public final long NumPadComma;
+    property public final long NumPadDivide;
+    property public final long NumPadDot;
+    property public final long NumPadEnter;
+    property public final long NumPadEquals;
+    property public final long NumPadLeftParenthesis;
+    property public final long NumPadMultiply;
+    property public final long NumPadRightParenthesis;
+    property public final long NumPadSubtract;
+    property public final long Number;
+    property public final long O;
+    property public final long One;
+    property public final long P;
+    property public final long PageDown;
+    property public final long PageUp;
+    property public final long Pairing;
+    property public final long Paste;
+    property public final long Period;
+    property public final long PictureSymbols;
+    property public final long Plus;
+    property public final long Pound;
+    property public final long Power;
+    property public final long PrintScreen;
+    property public final long ProfileSwitch;
+    property public final long ProgramBlue;
+    property public final long ProgramGreen;
+    property public final long ProgramRed;
+    property public final long ProgramYellow;
+    property public final long Q;
+    property public final long R;
+    property public final long Refresh;
+    property public final long RightBracket;
+    property public final long Ro;
+    property public final long S;
+    property public final long ScrollLock;
+    property public final long Search;
+    property public final long Semicolon;
+    property public final long SetTopBoxInput;
+    property public final long SetTopBoxPower;
+    property public final long Settings;
+    property public final long Seven;
+    property public final long ShiftLeft;
+    property public final long ShiftRight;
+    property public final long Six;
+    property public final long Slash;
+    property public final long Sleep;
+    property public final long SoftLeft;
+    property public final long SoftRight;
+    property public final long SoftSleep;
+    property public final long Spacebar;
+    property public final long Stem1;
+    property public final long Stem2;
+    property public final long Stem3;
+    property public final long StemPrimary;
+    property public final long SwitchCharset;
+    property public final long Symbol;
+    property public final long SystemNavigationDown;
+    property public final long SystemNavigationLeft;
+    property public final long SystemNavigationRight;
+    property public final long SystemNavigationUp;
+    property public final long T;
+    property public final long Tab;
+    property public final long Three;
+    property public final long ThumbsDown;
+    property public final long ThumbsUp;
+    property public final long Toggle2D3D;
+    property public final long Tv;
+    property public final long TvAntennaCable;
+    property public final long TvAudioDescription;
+    property public final long TvAudioDescriptionMixingVolumeDown;
+    property public final long TvAudioDescriptionMixingVolumeUp;
+    property public final long TvContentsMenu;
+    property public final long TvDataService;
+    property public final long TvInput;
+    property public final long TvInputComponent1;
+    property public final long TvInputComponent2;
+    property public final long TvInputComposite1;
+    property public final long TvInputComposite2;
+    property public final long TvInputHdmi1;
+    property public final long TvInputHdmi2;
+    property public final long TvInputHdmi3;
+    property public final long TvInputHdmi4;
+    property public final long TvInputVga1;
+    property public final long TvMediaContextMenu;
+    property public final long TvNetwork;
+    property public final long TvNumberEntry;
+    property public final long TvPower;
+    property public final long TvRadioService;
+    property public final long TvSatellite;
+    property public final long TvSatelliteBs;
+    property public final long TvSatelliteCs;
+    property public final long TvSatelliteService;
+    property public final long TvTeletext;
+    property public final long TvTerrestrialAnalog;
+    property public final long TvTerrestrialDigital;
+    property public final long TvTimerProgramming;
+    property public final long TvZoomMode;
+    property public final long Two;
+    property public final long U;
+    property public final long Unknown;
+    property public final long V;
+    property public final long VoiceAssist;
+    property public final long VolumeDown;
+    property public final long VolumeMute;
+    property public final long VolumeUp;
+    property public final long W;
+    property public final long WakeUp;
+    property public final long Window;
+    property public final long X;
+    property public final long Y;
+    property public final long Yen;
+    property public final long Z;
+    property public final long ZenkakuHankaru;
+    property public final long Zero;
+    property public final long ZoomIn;
+    property public final long ZoomOut;
+  }
+
+  public final inline class KeyEvent {
+    ctor public KeyEvent();
+    method public static android.view.KeyEvent! constructor-impl(android.view.KeyEvent nativeKeyEvent);
+    method public static inline boolean equals-impl(android.view.KeyEvent! p, Object? p1);
+    method public static boolean equals-impl0(android.view.KeyEvent p1, android.view.KeyEvent p2);
+    method public android.view.KeyEvent getNativeKeyEvent();
+    method public static inline int hashCode-impl(android.view.KeyEvent! p);
+    method public static inline String! toString-impl(android.view.KeyEvent! p);
+    property public final android.view.KeyEvent nativeKeyEvent;
+  }
+
+  public enum KeyEventType {
+    enum_constant public static final androidx.compose.ui.input.key.KeyEventType KeyDown;
+    enum_constant public static final androidx.compose.ui.input.key.KeyEventType KeyUp;
+    enum_constant public static final androidx.compose.ui.input.key.KeyEventType Unknown;
+  }
+
+  public final class KeyEvent_androidKt {
+    method public static long getKey-ZmokQxo(android.view.KeyEvent);
+    method public static androidx.compose.ui.input.key.KeyEventType getType-ZmokQxo(android.view.KeyEvent);
+    method public static int getUtf16CodePoint-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isAltPressed-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isCtrlPressed-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isMetaPressed-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isShiftPressed-ZmokQxo(android.view.KeyEvent);
+  }
+
+  public final class KeyInputModifierKt {
+    method public static androidx.compose.ui.Modifier onKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onKeyEvent);
+    method public static androidx.compose.ui.Modifier onPreviewKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onPreviewKeyEvent);
+  }
+
+  public final class Key_androidKt {
+    method public static long Key(int nativeKeyCode);
+    method public static int getNativeKeyCode-YVgTNJs(long);
+  }
+
+}
+
+package androidx.compose.ui.input.nestedscroll {
+
+  public interface NestedScrollConnection {
+    method public default suspend Object? onPostFling-k5p9STU(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public default long onPostScroll-61dr0bI(long consumed, long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+    method public default suspend Object? onPreFling-bHeVL4A(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public default long onPreScroll-ScU7Jk8(long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+  }
+
+  public final class NestedScrollDelegatingWrapperKt {
+  }
+
+  public final class NestedScrollDispatcher {
+    ctor public NestedScrollDispatcher();
+    method public suspend Object? dispatchPostFling-k5p9STU(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public long dispatchPostScroll-61dr0bI(long consumed, long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+    method public suspend Object? dispatchPreFling-bHeVL4A(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public long dispatchPreScroll-ScU7Jk8(long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+    method public kotlinx.coroutines.CoroutineScope getCoroutineScope();
+    property public final kotlinx.coroutines.CoroutineScope coroutineScope;
+  }
+
+  public final class NestedScrollModifierKt {
+    method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
+  }
+
+  public enum NestedScrollSource {
+    enum_constant public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource Drag;
+    enum_constant public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource Fling;
+  }
+
+}
+
+package androidx.compose.ui.input.pointer {
+
+  @kotlin.coroutines.RestrictsSuspension public interface AwaitPointerEventScope extends androidx.compose.ui.unit.Density {
+    method public suspend Object? awaitPointerEvent(optional androidx.compose.ui.input.pointer.PointerEventPass pass, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerEvent> p);
+    method public androidx.compose.ui.input.pointer.PointerEvent getCurrentEvent();
+    method public long getSize-YbymL2g();
+    method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+    property public abstract androidx.compose.ui.input.pointer.PointerEvent currentEvent;
+    property public abstract long size;
+    property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+  }
+
+  public final class ConsumedData {
+    ctor public ConsumedData(optional boolean positionChange, optional boolean downChange);
+    method public boolean getDownChange();
+    method public boolean getPositionChange();
+    method public void setDownChange(boolean p);
+    method public void setPositionChange(boolean p);
+    property public final boolean downChange;
+    property public final boolean positionChange;
+  }
+
+  public final class HitPathTrackerKt {
+  }
+
+  public final class MotionEventAdapter_androidKt {
+  }
+
+  public final class PointerEvent {
+    ctor public PointerEvent(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes);
+    method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> component1();
+    method public androidx.compose.ui.input.pointer.PointerEvent copy(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes, android.view.MotionEvent? motionEvent);
+    method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> getChanges();
+    property public final java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes;
+  }
+
+  public final class PointerEventKt {
+    method public static boolean anyChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToDown(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToDownIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToUp(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToUpIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static void consumeAllChanges(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static void consumeDownChange(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static void consumePositionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean isOutOfBounds-MReStF0(androidx.compose.ui.input.pointer.PointerInputChange, long size);
+    method public static long positionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean positionChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static long positionChangeIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean positionChanged(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean positionChangedIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+  }
+
+  public enum PointerEventPass {
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Final;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Initial;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Main;
+  }
+
+  public final inline class PointerId {
+    ctor public PointerId();
+    method public static long constructor-impl(long value);
+    method public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getValue();
+    method public static inline int hashCode-impl(long p);
+    method public static inline String! toString-impl(long p);
+    property public final long value;
+  }
+
+  @androidx.compose.runtime.Immutable public final class PointerInputChange {
+    method public androidx.compose.ui.input.pointer.PointerInputChange copy-aJ2ieLA(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, optional androidx.compose.ui.input.pointer.ConsumedData consumed, optional androidx.compose.ui.input.pointer.PointerType type);
+    method public androidx.compose.ui.input.pointer.ConsumedData getConsumed();
+    method public long getId-J3iCeTQ();
+    method public long getPosition-F1C5BW0();
+    method public boolean getPressed();
+    method public long getPreviousPosition-F1C5BW0();
+    method public boolean getPreviousPressed();
+    method public long getPreviousUptimeMillis();
+    method public androidx.compose.ui.input.pointer.PointerType getType();
+    method public long getUptimeMillis();
+    property public final androidx.compose.ui.input.pointer.ConsumedData consumed;
+    property public final long id;
+    property public final long position;
+    property public final boolean pressed;
+    property public final long previousPosition;
+    property public final boolean previousPressed;
+    property public final long previousUptimeMillis;
+    property public final androidx.compose.ui.input.pointer.PointerType type;
+    property public final long uptimeMillis;
+  }
+
+  public final class PointerInputEventProcessorKt {
+  }
+
+  public abstract class PointerInputFilter {
+    ctor public PointerInputFilter();
+    method public final long getSize-YbymL2g();
+    method public abstract void onCancel();
+    method public abstract void onPointerEvent-d1fqKvQ(androidx.compose.ui.input.pointer.PointerEvent pointerEvent, androidx.compose.ui.input.pointer.PointerEventPass pass, long bounds);
+    property public final long size;
+  }
+
+  public interface PointerInputModifier extends androidx.compose.ui.Modifier.Element {
+    method public androidx.compose.ui.input.pointer.PointerInputFilter getPointerInputFilter();
+    property public abstract androidx.compose.ui.input.pointer.PointerInputFilter pointerInputFilter;
+  }
+
+  public interface PointerInputScope extends androidx.compose.ui.unit.Density {
+    method public suspend <R> Object? awaitPointerEventScope(kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+    method public long getSize-YbymL2g();
+    method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+    property public abstract long size;
+    property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+  }
+
+  public final class PointerInputTestUtilKt {
+  }
+
+  public final class PointerInteropFilter_androidKt {
+    method public static androidx.compose.ui.Modifier pointerInteropFilter(androidx.compose.ui.Modifier, optional androidx.compose.ui.input.pointer.RequestDisallowInterceptTouchEvent? requestDisallowInterceptTouchEvent, kotlin.jvm.functions.Function1<? super android.view.MotionEvent,java.lang.Boolean> onTouchEvent);
+  }
+
+  public final class PointerInteropUtils_androidKt {
+  }
+
+  public enum PointerType {
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Eraser;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Mouse;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Stylus;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Touch;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Unknown;
+  }
+
+  public final class RequestDisallowInterceptTouchEvent implements kotlin.jvm.functions.Function1<java.lang.Boolean,kotlin.Unit> {
+    ctor public RequestDisallowInterceptTouchEvent();
+    method public void invoke(boolean disallowIntercept);
+  }
+
+  public final class SuspendingPointerInputFilterKt {
+    method @Deprecated public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+  }
+
+}
+
+package androidx.compose.ui.input.pointer.util {
+
+  public final class VelocityTracker {
+    ctor public VelocityTracker();
+    method public void addPosition-OX7LsLU(long timeMillis, long position);
+    method public long calculateVelocity-9UxMQ8M();
+    method public void resetTracking();
+  }
+
+  public final class VelocityTrackerKt {
+  }
+
+}
+
+package androidx.compose.ui.layout {
+
+  @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
+    field public static final androidx.compose.ui.layout.AlignmentLine.Companion Companion;
+    field public static final int Unspecified = -2147483648; // 0x80000000
+  }
+
+  public static final class AlignmentLine.Companion {
+  }
+
+  public final class AlignmentLineKt {
+    method public static androidx.compose.ui.layout.HorizontalAlignmentLine getFirstBaseline();
+    method public static androidx.compose.ui.layout.HorizontalAlignmentLine getLastBaseline();
+  }
+
+  @androidx.compose.runtime.Stable public interface ContentScale {
+    method public long computeScaleFactor-AhF4CD4(long srcSize, long dstSize);
+    field public static final androidx.compose.ui.layout.ContentScale.Companion Companion;
+  }
+
+  public static final class ContentScale.Companion {
+    method public androidx.compose.ui.layout.ContentScale getCrop();
+    method public androidx.compose.ui.layout.ContentScale getFillBounds();
+    method public androidx.compose.ui.layout.ContentScale getFillHeight();
+    method public androidx.compose.ui.layout.ContentScale getFillWidth();
+    method public androidx.compose.ui.layout.ContentScale getFit();
+    method public androidx.compose.ui.layout.ContentScale getInside();
+    method public androidx.compose.ui.layout.FixedScale getNone();
+    property public final androidx.compose.ui.layout.ContentScale Crop;
+    property public final androidx.compose.ui.layout.ContentScale FillBounds;
+    property public final androidx.compose.ui.layout.ContentScale FillHeight;
+    property public final androidx.compose.ui.layout.ContentScale FillWidth;
+    property public final androidx.compose.ui.layout.ContentScale Fit;
+    property public final androidx.compose.ui.layout.ContentScale Inside;
+    property public final androidx.compose.ui.layout.FixedScale None;
+  }
+
+  public final class ContentScaleKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
+    ctor public FixedScale(float value);
+    method public float component1();
+    method public long computeScaleFactor-AhF4CD4(long srcSize, long dstSize);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.layout.FixedScale copy(float value);
+    method public float getValue();
+    property public final float value;
+  }
+
+  public interface GraphicLayerInfo {
+    method public long getLayerId();
+    property public abstract long layerId;
+  }
+
+  public final class HorizontalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+    ctor public HorizontalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+  }
+
+  public interface IntrinsicMeasurable {
+    method public Object? getParentData();
+    method public int maxIntrinsicHeight(int width);
+    method public int maxIntrinsicWidth(int height);
+    method public int minIntrinsicHeight(int width);
+    method public int minIntrinsicWidth(int height);
+    property public abstract Object? parentData;
+  }
+
+  public final class IntrinsicMeasurableKt {
+  }
+
+  public interface IntrinsicMeasureScope extends androidx.compose.ui.unit.Density {
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+  }
+
+  public interface LayoutCoordinates {
+    method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public androidx.compose.ui.layout.LayoutCoordinates? getParentCoordinates();
+    method public androidx.compose.ui.layout.LayoutCoordinates? getParentLayoutCoordinates();
+    method public java.util.Set<androidx.compose.ui.layout.AlignmentLine> getProvidedAlignmentLines();
+    method public long getSize-YbymL2g();
+    method public boolean isAttached();
+    method public androidx.compose.ui.geometry.Rect localBoundingBoxOf(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, optional boolean clipBounds);
+    method public long localPositionOf-YJiYy8w(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, long relativeToSource);
+    method public long localToRoot-k-4lQ0M(long relativeToLocal);
+    method public long localToWindow-k-4lQ0M(long relativeToLocal);
+    method public long windowToLocal-k-4lQ0M(long relativeToWindow);
+    property public abstract boolean isAttached;
+    property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentCoordinates;
+    property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentLayoutCoordinates;
+    property public abstract java.util.Set<androidx.compose.ui.layout.AlignmentLine> providedAlignmentLines;
+    property public abstract long size;
+  }
+
+  public final class LayoutCoordinatesKt {
+    method public static androidx.compose.ui.geometry.Rect boundsInParent(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static androidx.compose.ui.geometry.Rect boundsInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static androidx.compose.ui.geometry.Rect boundsInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static long positionInParent(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static long positionInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static long positionInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+  }
+
+  public final class LayoutIdKt {
+    method public static Object? getLayoutId(androidx.compose.ui.layout.Measurable);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier layoutId(androidx.compose.ui.Modifier, Object layoutId);
+  }
+
+  public interface LayoutIdParentData {
+    method public Object getLayoutId();
+    property public abstract Object layoutId;
+  }
+
+  public interface LayoutInfo {
+    method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+    method public int getHeight();
+    method public java.util.List<androidx.compose.ui.layout.ModifierInfo> getModifierInfo();
+    method public androidx.compose.ui.layout.LayoutInfo? getParentInfo();
+    method public int getWidth();
+    method public boolean isAttached();
+    method public boolean isPlaced();
+    property public abstract androidx.compose.ui.layout.LayoutCoordinates coordinates;
+    property public abstract int height;
+    property public abstract boolean isAttached;
+    property public abstract boolean isPlaced;
+    property public abstract androidx.compose.ui.layout.LayoutInfo? parentInfo;
+    property public abstract int width;
+  }
+
+  public final class LayoutKt {
+    method @androidx.compose.runtime.Composable public static inline void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> content, optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+    method @Deprecated @androidx.compose.runtime.Composable public static void MultiMeasureLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+  }
+
+  public interface LayoutModifier extends androidx.compose.ui.Modifier.Element {
+    method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+    method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+    method public androidx.compose.ui.layout.MeasureResult measure-za8Wrwc(androidx.compose.ui.layout.MeasureScope, androidx.compose.ui.layout.Measurable measurable, long constraints);
+    method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+    method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+  }
+
+  public final class LayoutModifierKt {
+    method public static androidx.compose.ui.Modifier layout(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function3<? super androidx.compose.ui.layout.MeasureScope,? super androidx.compose.ui.layout.Measurable,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measure);
+  }
+
+  public interface Measurable extends androidx.compose.ui.layout.IntrinsicMeasurable {
+    method public androidx.compose.ui.layout.Placeable measure-BRTryo0(long constraints);
+  }
+
+  @androidx.compose.runtime.Stable public fun interface MeasurePolicy {
+    method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+    method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+    method public androidx.compose.ui.layout.MeasureResult measure-8A2P9vY(androidx.compose.ui.layout.MeasureScope, java.util.List<? extends androidx.compose.ui.layout.Measurable> measurables, long constraints);
+    method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+    method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+  }
+
+  public interface MeasureResult {
+    method public java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> getAlignmentLines();
+    method public int getHeight();
+    method public int getWidth();
+    method public void placeChildren();
+    property public abstract java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines;
+    property public abstract int height;
+    property public abstract int width;
+  }
+
+  public interface MeasureScope extends androidx.compose.ui.layout.IntrinsicMeasureScope {
+    method public default androidx.compose.ui.layout.MeasureResult layout(int width, int height, optional java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+  }
+
+  public final class MeasureScopeKt {
+  }
+
+  public interface Measured {
+    method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public int getMeasuredHeight();
+    method public int getMeasuredWidth();
+    property public abstract int measuredHeight;
+    property public abstract int measuredWidth;
+  }
+
+  public final class ModifierInfo {
+    ctor public ModifierInfo(androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.LayoutCoordinates coordinates, optional Object? extra);
+    method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+    method public Object? getExtra();
+    method public androidx.compose.ui.Modifier getModifier();
+    property public final androidx.compose.ui.layout.LayoutCoordinates coordinates;
+    property public final Object? extra;
+    property public final androidx.compose.ui.Modifier modifier;
+  }
+
+  public interface OnGloballyPositionedModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
+  }
+
+  public final class OnGloballyPositionedModifierKt {
+    method public static inline androidx.compose.ui.Modifier onGloballyPositioned(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,kotlin.Unit> onGloballyPositioned);
+  }
+
+  public interface OnRemeasuredModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onRemeasured-ozmzZPI(long size);
+  }
+
+  public final class OnRemeasuredModifierKt {
+    method public static inline androidx.compose.ui.Modifier onSizeChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit> onSizeChanged);
+  }
+
+  public interface ParentDataModifier extends androidx.compose.ui.Modifier.Element {
+    method public Object? modifyParentData(androidx.compose.ui.unit.Density, Object? parentData);
+  }
+
+  public abstract class Placeable implements androidx.compose.ui.layout.Measured {
+    ctor public Placeable();
+    method protected final long getApparentToRealOffset-nOcc-ac();
+    method public final int getHeight();
+    method public int getMeasuredHeight();
+    method protected final long getMeasuredSize-YbymL2g();
+    method public int getMeasuredWidth();
+    method protected final long getMeasurementConstraints-msEJaDk();
+    method public final int getWidth();
+    method protected abstract void placeAt-rMeLuDI(long position, float zIndex, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit>? layerBlock);
+    method protected final void setMeasuredSize-ozmzZPI(long value);
+    method protected final void setMeasurementConstraints-BRTryo0(long p);
+    property protected final long apparentToRealOffset;
+    property public final int height;
+    property public int measuredHeight;
+    property protected final long measuredSize;
+    property public int measuredWidth;
+    property protected final long measurementConstraints;
+    property public final int width;
+  }
+
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method protected abstract androidx.compose.ui.unit.LayoutDirection getParentLayoutDirection();
+    method protected abstract int getParentWidth();
+    method public final void place(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+    method public final void place-z2mxYZE(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+    method public final void placeRelative(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+    method public final void placeRelative-z2mxYZE(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+    method public final void placeRelativeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    method public final void placeRelativeWithLayer-muyPCdA(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    method public final void placeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    method public final void placeWithLayer-muyPCdA(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    property protected abstract androidx.compose.ui.unit.LayoutDirection parentLayoutDirection;
+    property protected abstract int parentWidth;
+  }
+
+  public final class PlaceableKt {
+  }
+
+  public interface Remeasurement {
+    method public void forceRemeasure();
+  }
+
+  public interface RemeasurementModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onRemeasurementAvailable(androidx.compose.ui.layout.Remeasurement remeasurement);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class ScaleFactor {
+    ctor public ScaleFactor();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-_hLwfpc(long $this, optional float scaleX, optional float scaleY);
+    method @androidx.compose.runtime.Stable public static operator long div-_hLwfpc(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getScaleX-impl(long $this);
+    method public static float getScaleY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long times-_hLwfpc(long $this, float operand);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.layout.ScaleFactor.Companion Companion;
+  }
+
+  public static final class ScaleFactor.Companion {
+    method public long getUnspecified-_hLwfpc();
+    property public final long Unspecified;
+  }
+
+  public final class ScaleFactorKt {
+    method @androidx.compose.runtime.Stable public static long ScaleFactor(float scaleX, float scaleY);
+    method @androidx.compose.runtime.Stable public static operator long div-ngKnWWw(long, long scaleFactor);
+    method public static inline boolean isSpecified-FK8aYYs(long);
+    method public static inline boolean isUnspecified-FK8aYYs(long);
+    method @androidx.compose.runtime.Stable public static long lerp-bKVCie4(long start, long stop, float fraction);
+    method public static inline long takeOrElse-L-byAFk(long, kotlin.jvm.functions.Function0<androidx.compose.ui.layout.ScaleFactor> block);
+    method @androidx.compose.runtime.Stable public static operator long times-Sp6zcS4(long, long size);
+    method @androidx.compose.runtime.Stable public static operator long times-ngKnWWw(long, long scaleFactor);
+  }
+
+  public final class SubcomposeLayoutKt {
+    method @androidx.compose.runtime.Composable public static void SubcomposeLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.layout.SubcomposeMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
+  }
+
+  public interface SubcomposeMeasureScope extends androidx.compose.ui.layout.MeasureScope {
+    method public java.util.List<androidx.compose.ui.layout.Measurable> subcompose(Object? slotId, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class TestModifierUpdaterKt {
+  }
+
+  public final class VerticalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+    ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+  }
+
+}
+
+package androidx.compose.ui.node {
+
+  @kotlin.RequiresOptIn(message="This API is internal to library.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface InternalCoreApi {
+  }
+
+  public final class LayoutNodeKt {
+  }
+
+  public final class Ref<T> {
+    ctor public Ref();
+    method public T? getValue();
+    method public void setValue(T? p);
+    property public final T? value;
+  }
+
+  public interface RootForTest {
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.semantics.SemanticsOwner getSemanticsOwner();
+    method public androidx.compose.ui.text.input.TextInputService getTextInputService();
+    method public boolean sendKeyEvent-ZmokQxo(android.view.KeyEvent keyEvent);
+    property public abstract androidx.compose.ui.unit.Density density;
+    property public abstract androidx.compose.ui.semantics.SemanticsOwner semanticsOwner;
+    property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
+  }
+
+  public final class ViewInterop_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.platform {
+
+  public abstract class AbstractComposeView extends android.view.ViewGroup {
+    ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+    ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+    ctor public AbstractComposeView(android.content.Context context);
+    method @androidx.compose.runtime.Composable public abstract void Content();
+    method public final void createComposition();
+    method public final void disposeComposition();
+    method public final boolean getHasComposition();
+    method protected boolean getShouldCreateCompositionOnAttachedToWindow();
+    method public final boolean getShowLayoutBounds();
+    method protected final void onLayout(boolean changed, int left, int top, int right, int bottom);
+    method protected final void onMeasure(int widthMeasureSpec, int heightMeasureSpec);
+    method public final void setParentCompositionContext(androidx.compose.runtime.CompositionContext? parent);
+    method public final void setShowLayoutBounds(boolean value);
+    method public final void setViewCompositionStrategy(androidx.compose.ui.platform.ViewCompositionStrategy strategy);
+    property public final boolean hasComposition;
+    property protected boolean shouldCreateCompositionOnAttachedToWindow;
+    property public final boolean showLayoutBounds;
+  }
+
+  public interface AccessibilityManager {
+    method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
+  }
+
+  public final class AndroidClipboardManager_androidKt {
+  }
+
+  public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
+  }
+
+  public final class AndroidComposeView_androidKt {
+  }
+
+  public final class AndroidCompositionLocals_androidKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.res.Configuration> getLocalConfiguration();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.Context> getLocalContext();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.lifecycle.LifecycleOwner> getLocalLifecycleOwner();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.savedstate.SavedStateRegistryOwner> getLocalSavedStateRegistryOwner();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<android.view.View> getLocalView();
+  }
+
+  public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
+    method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
+    method public android.view.Choreographer getChoreographer();
+    method public androidx.compose.runtime.MonotonicFrameClock getFrameClock();
+    property public final android.view.Choreographer choreographer;
+    property public final androidx.compose.runtime.MonotonicFrameClock frameClock;
+    field public static final androidx.compose.ui.platform.AndroidUiDispatcher.Companion Companion;
+  }
+
+  public static final class AndroidUiDispatcher.Companion {
+    method public kotlin.coroutines.CoroutineContext getCurrentThread();
+    method public kotlin.coroutines.CoroutineContext getMain();
+    property public final kotlin.coroutines.CoroutineContext CurrentThread;
+    property public final kotlin.coroutines.CoroutineContext Main;
+  }
+
+  public final class AndroidUiDispatcher_androidKt {
+  }
+
+  public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
+    method public android.view.Choreographer getChoreographer();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final android.view.Choreographer choreographer;
+  }
+
+  public final class AndroidUriHandler implements androidx.compose.ui.platform.UriHandler {
+    ctor public AndroidUriHandler(android.content.Context context);
+    method public void openUri(String uri);
+  }
+
+  public final class AndroidViewConfiguration implements androidx.compose.ui.platform.ViewConfiguration {
+    ctor public AndroidViewConfiguration(android.view.ViewConfiguration viewConfiguration);
+    method public long getDoubleTapMinTimeMillis();
+    method public long getDoubleTapTimeoutMillis();
+    method public long getLongPressTimeoutMillis();
+    method public float getTouchSlop();
+    property public long doubleTapMinTimeMillis;
+    property public long doubleTapTimeoutMillis;
+    property public long longPressTimeoutMillis;
+    property public float touchSlop;
+  }
+
+  public interface ClipboardManager {
+    method public androidx.compose.ui.text.AnnotatedString? getText();
+    method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
+  }
+
+  public final class ComposeView extends androidx.compose.ui.platform.AbstractComposeView {
+    ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+    ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+    ctor public ComposeView(android.content.Context context);
+    method @androidx.compose.runtime.Composable public void Content();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    property protected boolean shouldCreateCompositionOnAttachedToWindow;
+  }
+
+  public final class ComposeView_androidKt {
+  }
+
+  public final class CompositionLocalsKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager> getLocalAccessibilityManager();
+    method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill> getLocalAutofill();
+    method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> getLocalAutofillTree();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> getLocalClipboardManager();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Density> getLocalDensity();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.focus.FocusManager> getLocalFocusManager();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.hapticfeedback.HapticFeedback> getLocalHapticFeedback();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.LayoutDirection> getLocalLayoutDirection();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.input.TextInputService> getLocalTextInputService();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.TextToolbar> getLocalTextToolbar();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.UriHandler> getLocalUriHandler();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> getLocalViewConfiguration();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> getLocalWindowInfo();
+  }
+
+  public final class DebugUtilsKt {
+  }
+
+  public final class DisposableSaveableStateRegistry_androidKt {
+  }
+
+  public interface InspectableValue {
+    method public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> getInspectableElements();
+    method public default String? getNameFallback();
+    method public default Object? getValueOverride();
+    property public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+    property public default String? nameFallback;
+    property public default Object? valueOverride;
+  }
+
+  public final class InspectableValueKt {
+    method public static inline kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> debugInspectorInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> definitions);
+    method public static kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> getNoInspectorInfo();
+    method public static boolean isDebugInspectorInfoEnabled();
+    method public static void setDebugInspectorInfoEnabled(boolean p);
+  }
+
+  public final class InspectionModeKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> getLocalInspectionMode();
+  }
+
+  public final class InspectorInfo {
+    ctor public InspectorInfo();
+    method public String? getName();
+    method public androidx.compose.ui.platform.ValueElementSequence getProperties();
+    method public Object? getValue();
+    method public void setName(String? p);
+    method public void setValue(Object? p);
+    property public final String? name;
+    property public final androidx.compose.ui.platform.ValueElementSequence properties;
+    property public final Object? value;
+  }
+
+  public abstract class InspectorValueInfo implements androidx.compose.ui.platform.InspectableValue {
+    ctor public InspectorValueInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> info);
+    property public kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+    property public String? nameFallback;
+    property public Object? valueOverride;
+  }
+
+  public final class JvmActuals_jvmKt {
+  }
+
+  @androidx.compose.ui.ExperimentalComposeUiApi public final class LocalSoftwareKeyboardController {
+    method @androidx.compose.runtime.Composable public androidx.compose.ui.platform.SoftwareKeyboardController? getCurrent();
+    method public infix androidx.compose.runtime.ProvidedValue<androidx.compose.ui.platform.SoftwareKeyboardController> provides(androidx.compose.ui.platform.SoftwareKeyboardController softwareKeyboardController);
+    property @androidx.compose.runtime.Composable public final androidx.compose.ui.platform.SoftwareKeyboardController? current;
+    field public static final androidx.compose.ui.platform.LocalSoftwareKeyboardController INSTANCE;
+  }
+
+  @androidx.compose.runtime.Stable @androidx.compose.ui.ExperimentalComposeUiApi public interface SoftwareKeyboardController {
+    method public void hide();
+    method @Deprecated public default void hideSoftwareKeyboard();
+    method public void show();
+    method @Deprecated public default void showSoftwareKeyboard();
+  }
+
+  public final class TestTagKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier testTag(androidx.compose.ui.Modifier, String tag);
+  }
+
+  public interface TextToolbar {
+    method public androidx.compose.ui.platform.TextToolbarStatus getStatus();
+    method public void hide();
+    method public void showMenu(androidx.compose.ui.geometry.Rect rect, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCopyRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onPasteRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCutRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onSelectAllRequested);
+    property public abstract androidx.compose.ui.platform.TextToolbarStatus status;
+  }
+
+  public final class TextToolbarKt {
+  }
+
+  public enum TextToolbarStatus {
+    enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Hidden;
+    enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Shown;
+  }
+
+  public interface UriHandler {
+    method public void openUri(String uri);
+  }
+
+  public final class ValueElement {
+    ctor public ValueElement(String name, Object? value);
+    method public String component1();
+    method public Object? component2();
+    method public androidx.compose.ui.platform.ValueElement copy(String name, Object? value);
+    method public String getName();
+    method public Object? getValue();
+    property public final String name;
+    property public final Object? value;
+  }
+
+  public final class ValueElementSequence implements kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> {
+    ctor public ValueElementSequence();
+    method public java.util.Iterator<androidx.compose.ui.platform.ValueElement> iterator();
+    method public operator void set(String name, Object? value);
+  }
+
+  public interface ViewCompositionStrategy {
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+    field public static final androidx.compose.ui.platform.ViewCompositionStrategy.Companion Companion;
+  }
+
+  public static final class ViewCompositionStrategy.Companion {
+  }
+
+  public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindow implements androidx.compose.ui.platform.ViewCompositionStrategy {
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+    field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
+  }
+
+  public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+    ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.Lifecycle lifecycle);
+    ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.LifecycleOwner lifecycleOwner);
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+  }
+
+  public static final class ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+    field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
+  }
+
+  public final class ViewCompositionStrategy_androidKt {
+  }
+
+  public interface ViewConfiguration {
+    method public long getDoubleTapMinTimeMillis();
+    method public long getDoubleTapTimeoutMillis();
+    method public long getLongPressTimeoutMillis();
+    method public float getTouchSlop();
+    property public abstract long doubleTapMinTimeMillis;
+    property public abstract long doubleTapTimeoutMillis;
+    property public abstract long longPressTimeoutMillis;
+    property public abstract float touchSlop;
+  }
+
+  @VisibleForTesting public interface ViewRootForTest extends androidx.compose.ui.node.RootForTest {
+    method public boolean getHasPendingMeasureOrLayout();
+    method public android.view.View getView();
+    method public void invalidateDescendants();
+    method public boolean isLifecycleInResumedState();
+    property public abstract boolean hasPendingMeasureOrLayout;
+    property public abstract boolean isLifecycleInResumedState;
+    property public abstract android.view.View view;
+    field public static final androidx.compose.ui.platform.ViewRootForTest.Companion Companion;
+  }
+
+  public static final class ViewRootForTest.Companion {
+    method public kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? getOnViewCreatedCallback();
+    method public void setOnViewCreatedCallback(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? p);
+    property public final kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? onViewCreatedCallback;
+  }
+
+  @androidx.compose.runtime.Stable public interface WindowInfo {
+    method public boolean isWindowFocused();
+    property public abstract boolean isWindowFocused;
+  }
+
+  public final class WindowInfoKt {
+  }
+
+  @androidx.compose.ui.InternalComposeUiApi public fun interface WindowRecomposerFactory {
+    method public androidx.compose.runtime.Recomposer createRecomposer(android.view.View windowRootView);
+    field public static final androidx.compose.ui.platform.WindowRecomposerFactory.Companion Companion;
+  }
+
+  public static final class WindowRecomposerFactory.Companion {
+    method public androidx.compose.ui.platform.WindowRecomposerFactory getLifecycleAware();
+    property public final androidx.compose.ui.platform.WindowRecomposerFactory LifecycleAware;
+  }
+
+  @androidx.compose.ui.InternalComposeUiApi public final class WindowRecomposerPolicy {
+    method public void setFactory(androidx.compose.ui.platform.WindowRecomposerFactory factory);
+    method public inline <R> R! withFactory(androidx.compose.ui.platform.WindowRecomposerFactory factory, kotlin.jvm.functions.Function0<? extends R> block);
+    field public static final androidx.compose.ui.platform.WindowRecomposerPolicy INSTANCE;
+  }
+
+  public final class WindowRecomposer_androidKt {
+    method public static androidx.compose.runtime.CompositionContext? findViewTreeCompositionContext(android.view.View);
+    method public static androidx.compose.runtime.CompositionContext? getCompositionContext(android.view.View);
+    method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext? value);
+  }
+
+  public final class Wrapper_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.platform.actionmodecallback {
+
+  public final class TextActionModeCallback_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.res {
+
+  public final class AnimatedVectorResources_androidKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.graphics.vector.AnimatedImageVector animatedVectorResource(@DrawableRes int id);
+  }
+
+  public final class AnimatorResources_androidKt {
+  }
+
+  public final class ColorResources_androidKt {
+    method @androidx.compose.runtime.Composable public static long colorResource(@ColorRes int id);
+  }
+
+  public final class FontResources_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.text.font.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+  }
+
+  public final class ImageResources_androidKt {
+    method public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, android.content.res.Resources res, @DrawableRes int id);
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, @DrawableRes int id);
+  }
+
+  public final class PainterResources_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter painterResource(@DrawableRes int id);
+  }
+
+  public final class PrimitiveResources_androidKt {
+    method @androidx.compose.runtime.Composable public static boolean booleanResource(@BoolRes int id);
+    method @androidx.compose.runtime.Composable public static float dimensionResource(@DimenRes int id);
+    method @androidx.compose.runtime.Composable public static int[] integerArrayResource(@ArrayRes int id);
+    method @androidx.compose.runtime.Composable public static int integerResource(@IntegerRes int id);
+  }
+
+  public final class StringResources_androidKt {
+    method @androidx.compose.runtime.Composable public static String![] stringArrayResource(@ArrayRes int id);
+    method @androidx.compose.runtime.Composable public static String stringResource(@StringRes int id);
+    method @androidx.compose.runtime.Composable public static String stringResource(@StringRes int id, java.lang.Object... formatArgs);
+  }
+
+  public final class VectorResources_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, @DrawableRes int id);
+    method @kotlin.jvm.Throws(exceptionClasses=XmlPullParserException::class) public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, optional android.content.res.Resources.Theme? theme, android.content.res.Resources res, int resId) throws org.xmlpull.v1.XmlPullParserException;
+  }
+
+}
+
+package androidx.compose.ui.semantics {
+
+  public final class AccessibilityAction<T extends kotlin.Function<? extends java.lang.Boolean>> {
+    ctor public AccessibilityAction(String? label, T? action);
+    method public T? getAction();
+    method public String? getLabel();
+    property public final T? action;
+    property public final String? label;
+  }
+
+  public final class CustomAccessibilityAction {
+    ctor public CustomAccessibilityAction(String label, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
+    method public kotlin.jvm.functions.Function0<java.lang.Boolean> getAction();
+    method public String getLabel();
+    property public final kotlin.jvm.functions.Function0<java.lang.Boolean> action;
+    property public final String label;
+  }
+
+  public enum LiveRegionMode {
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Assertive;
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Polite;
+  }
+
+  public final class ProgressBarRangeInfo {
+    ctor public ProgressBarRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional int steps);
+    method public float getCurrent();
+    method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> getRange();
+    method public int getSteps();
+    property public final float current;
+    property public final kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range;
+    property public final int steps;
+    field public static final androidx.compose.ui.semantics.ProgressBarRangeInfo.Companion Companion;
+  }
+
+  public static final class ProgressBarRangeInfo.Companion {
+    method public androidx.compose.ui.semantics.ProgressBarRangeInfo getIndeterminate();
+    property public final androidx.compose.ui.semantics.ProgressBarRangeInfo Indeterminate;
+  }
+
+  public enum Role {
+    enum_constant public static final androidx.compose.ui.semantics.Role Button;
+    enum_constant public static final androidx.compose.ui.semantics.Role Checkbox;
+    enum_constant public static final androidx.compose.ui.semantics.Role Image;
+    enum_constant public static final androidx.compose.ui.semantics.Role RadioButton;
+    enum_constant public static final androidx.compose.ui.semantics.Role Switch;
+    enum_constant public static final androidx.compose.ui.semantics.Role Tab;
+  }
+
+  public final class ScrollAxisRange {
+    ctor public ScrollAxisRange(kotlin.jvm.functions.Function0<java.lang.Float> value, kotlin.jvm.functions.Function0<java.lang.Float> maxValue, optional boolean reverseScrolling);
+    method public kotlin.jvm.functions.Function0<java.lang.Float> getMaxValue();
+    method public boolean getReverseScrolling();
+    method public kotlin.jvm.functions.Function0<java.lang.Float> getValue();
+    property public final kotlin.jvm.functions.Function0<java.lang.Float> maxValue;
+    property public final boolean reverseScrolling;
+    property public final kotlin.jvm.functions.Function0<java.lang.Float> value;
+  }
+
+  public final class SemanticsActions {
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCollapse();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCopyText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> getCustomActions();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCutText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getDismiss();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getExpand();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnLongClick();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getPasteText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Collapse;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CopyText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> CustomActions;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CutText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Dismiss;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Expand;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnLongClick;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> PasteText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+    field public static final androidx.compose.ui.semantics.SemanticsActions INSTANCE;
+  }
+
+  public final class SemanticsConfiguration implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.compose.ui.semantics.SemanticsPropertyKey<?>,?>> kotlin.jvm.internal.markers.KMappedMarker androidx.compose.ui.semantics.SemanticsPropertyReceiver {
+    ctor public SemanticsConfiguration();
+    method public operator <T> boolean contains(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+    method public androidx.compose.ui.semantics.SemanticsConfiguration copy();
+    method public operator <T> T! get(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> T! getOrElse(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public <T> T? getOrElseNullable(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public boolean isClearingSemantics();
+    method public boolean isMergingSemanticsOfDescendants();
+    method public java.util.Iterator<java.util.Map.Entry<androidx.compose.ui.semantics.SemanticsPropertyKey<?>,java.lang.Object>> iterator();
+    method public <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+    method public void setClearingSemantics(boolean p);
+    method public void setMergingSemanticsOfDescendants(boolean p);
+    property public final boolean isClearingSemantics;
+    property public final boolean isMergingSemanticsOfDescendants;
+  }
+
+  public final class SemanticsConfigurationKt {
+    method public static <T> T? getOrNull(androidx.compose.ui.semantics.SemanticsConfiguration, androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+  }
+
+  public interface SemanticsModifier extends androidx.compose.ui.Modifier.Element {
+    method public int getId();
+    method public androidx.compose.ui.semantics.SemanticsConfiguration getSemanticsConfiguration();
+    property public abstract int id;
+    property public abstract androidx.compose.ui.semantics.SemanticsConfiguration semanticsConfiguration;
+  }
+
+  public final class SemanticsModifierKt {
+    method public static androidx.compose.ui.Modifier clearAndSetSemantics(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+    method public static androidx.compose.ui.Modifier semantics(androidx.compose.ui.Modifier, optional boolean mergeDescendants, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+  }
+
+  public final class SemanticsNode {
+    method public int getAlignmentLinePosition(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public androidx.compose.ui.geometry.Rect getBoundsInRoot();
+    method public androidx.compose.ui.geometry.Rect getBoundsInWindow();
+    method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getChildren();
+    method public androidx.compose.ui.semantics.SemanticsConfiguration getConfig();
+    method public int getId();
+    method public androidx.compose.ui.layout.LayoutInfo getLayoutInfo();
+    method public boolean getMergingEnabled();
+    method public androidx.compose.ui.semantics.SemanticsNode? getParent();
+    method public long getPositionInRoot-F1C5BW0();
+    method public long getPositionInWindow-F1C5BW0();
+    method public androidx.compose.ui.node.RootForTest? getRoot();
+    method public long getSize-YbymL2g();
+    method public boolean isRoot();
+    property public final androidx.compose.ui.geometry.Rect boundsInRoot;
+    property public final androidx.compose.ui.geometry.Rect boundsInWindow;
+    property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> children;
+    property public final androidx.compose.ui.semantics.SemanticsConfiguration config;
+    property public final int id;
+    property public final boolean isRoot;
+    property public final androidx.compose.ui.layout.LayoutInfo layoutInfo;
+    property public final boolean mergingEnabled;
+    property public final androidx.compose.ui.semantics.SemanticsNode? parent;
+    property public final long positionInRoot;
+    property public final long positionInWindow;
+    property public final androidx.compose.ui.node.RootForTest? root;
+    property public final long size;
+  }
+
+  public final class SemanticsNodeKt {
+  }
+
+  public final class SemanticsOwner {
+    method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
+    method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
+    property public final androidx.compose.ui.semantics.SemanticsNode rootSemanticsNode;
+    property public final androidx.compose.ui.semantics.SemanticsNode unmergedRootSemanticsNode;
+  }
+
+  public final class SemanticsOwnerKt {
+    method public static java.util.List<androidx.compose.ui.semantics.SemanticsNode> getAllSemanticsNodes(androidx.compose.ui.semantics.SemanticsOwner, boolean mergingEnabled);
+  }
+
+  public final class SemanticsProperties {
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getContentDescription();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getDisabled();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getEditableText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getFocused();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHeading();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getHorizontalScrollAxisRange();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getInvisibleToUser();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsDialog();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> getLiveRegion();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getPaneTitle();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getPassword();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> getProgressBarRangeInfo();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> getRole();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSelectableGroup();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSelected();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getStateDescription();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> getToggleableState();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getVerticalScrollAxisRange();
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> ContentDescription;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Disabled;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> EditableText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Focused;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Heading;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> HorizontalScrollAxisRange;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> InvisibleToUser;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsDialog;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> LiveRegion;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> PaneTitle;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Password;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> ProgressBarRangeInfo;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> Role;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SelectableGroup;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> StateDescription;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> ToggleableState;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> VerticalScrollAxisRange;
+    field public static final androidx.compose.ui.semantics.SemanticsProperties INSTANCE;
+  }
+
+  public final class SemanticsPropertiesKt {
+    method public static void collapse(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void copyText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void cutText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void dialog(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void disabled(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void dismiss(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void expand(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static String getContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.text.AnnotatedString getEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.ScrollAxisRange getHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.LiveRegionMode getLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.ProgressBarRangeInfo getProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.Role getRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.text.AnnotatedString getText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void getTextLayoutResult(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>? action);
+    method public static long getTextSelectionRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.state.ToggleableState getToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.ScrollAxisRange getVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void heading(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method @androidx.compose.ui.ExperimentalComposeUiApi public static void invisibleToUser(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void onClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void onLongClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void password(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void pasteText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void popup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void scrollBy(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,java.lang.Boolean>? action);
+    method public static void selectableGroup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void setContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver, java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction> p);
+    method public static void setEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+    method public static void setFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange p);
+    method public static void setImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
+    method public static void setLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.LiveRegionMode p);
+    method public static void setPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setProgress(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean>? action);
+    method public static void setProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ProgressBarRangeInfo p);
+    method public static void setRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.Role p);
+    method public static void setSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setSelection(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean>? action);
+    method public static void setStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+    method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>? action);
+    method public static void setTextSelectionRange-Hy0MoUY(androidx.compose.ui.semantics.SemanticsPropertyReceiver, long p);
+    method public static void setToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.state.ToggleableState p);
+    method public static void setVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange p);
+  }
+
+  public final class SemanticsPropertyKey<T> {
+    ctor public SemanticsPropertyKey(String name, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends T> mergePolicy);
+    method public String getName();
+    method public operator T! getValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property);
+    method public T? merge(T? parentValue, T? childValue);
+    method public operator void setValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property, T? value);
+    property public final String name;
+  }
+
+  public interface SemanticsPropertyReceiver {
+    method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+  }
+
+}
+
+package androidx.compose.ui.state {
+
+  public enum ToggleableState {
+    enum_constant public static final androidx.compose.ui.state.ToggleableState Indeterminate;
+    enum_constant public static final androidx.compose.ui.state.ToggleableState Off;
+    enum_constant public static final androidx.compose.ui.state.ToggleableState On;
+  }
+
+  public final class ToggleableStateKt {
+    method public static androidx.compose.ui.state.ToggleableState ToggleableState(boolean value);
+  }
+
+}
+
+package androidx.compose.ui.text.input {
+
+  public final class InputState_androidKt {
+  }
+
+  public final class RecordingInputConnection_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.viewinterop {
+
+  public final class AndroidViewHolder_androidKt {
+  }
+
+  public final class AndroidView_androidKt {
+    method @androidx.compose.runtime.Composable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+    method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
+  }
+
+}
+
+package androidx.compose.ui.window {
+
+  public final class AndroidDialog_androidKt {
+    method @androidx.compose.runtime.Composable public static void Dialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class AndroidPopup_androidKt {
+    method @androidx.compose.runtime.Composable public static void Popup(androidx.compose.ui.window.PopupPositionProvider popupPositionProvider, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Popup-wO4EaeM(optional androidx.compose.ui.Alignment alignment, optional long offset, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @org.jetbrains.annotations.TestOnly public static boolean isPopupLayout(android.view.View view, optional String? testTag);
+  }
+
+  @androidx.compose.runtime.Immutable public final class DialogProperties {
+    ctor public DialogProperties(optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy);
+    method public boolean getDismissOnBackPress();
+    method public boolean getDismissOnClickOutside();
+    method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+    property public final boolean dismissOnBackPress;
+    property public final boolean dismissOnClickOutside;
+    property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+  }
+
+  public interface DialogWindowProvider {
+    method public android.view.Window getWindow();
+    property public abstract android.view.Window window;
+  }
+
+  @androidx.compose.runtime.Immutable public interface PopupPositionProvider {
+    method public long calculatePosition-aa5Bd6I(androidx.compose.ui.unit.IntRect anchorBounds, long windowSize, androidx.compose.ui.unit.LayoutDirection layoutDirection, long popupContentSize);
+  }
+
+  @androidx.compose.runtime.Immutable public final class PopupProperties {
+    ctor public PopupProperties(optional boolean focusable, optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy);
+    method public boolean getDismissOnBackPress();
+    method public boolean getDismissOnClickOutside();
+    method public boolean getFocusable();
+    method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+    property public final boolean dismissOnBackPress;
+    property public final boolean dismissOnClickOutside;
+    property public final boolean focusable;
+    property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+  }
+
+  public enum SecureFlagPolicy {
+    enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy Inherit;
+    enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOff;
+    enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
+  }
+
+  public final class SecureFlagPolicy_androidKt {
+  }
+
+}
+

compose/ui/ui/api/public_plus_experimental_current.txt

diff --git a/compose/ui/ui/api/public_plus_experimental_current.txt b/compose/ui/ui/api/public_plus_experimental_current.txt
index 8c2e1ce..dc85fb3 100644
--- a/compose/ui/ui/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui/api/public_plus_experimental_current.txt
@@ -2048,13 +2048,16 @@
 
   @androidx.compose.ui.ExperimentalComposeUiApi public final class LocalSoftwareKeyboardController {
     method @androidx.compose.runtime.Composable public androidx.compose.ui.platform.SoftwareKeyboardController? getCurrent();
+    method public infix androidx.compose.runtime.ProvidedValue<androidx.compose.ui.platform.SoftwareKeyboardController> provides(androidx.compose.ui.platform.SoftwareKeyboardController softwareKeyboardController);
     property @androidx.compose.runtime.Composable public final androidx.compose.ui.platform.SoftwareKeyboardController? current;
     field public static final androidx.compose.ui.platform.LocalSoftwareKeyboardController INSTANCE;
   }
 
-  @androidx.compose.ui.ExperimentalComposeUiApi public interface SoftwareKeyboardController {
-    method public void hideSoftwareKeyboard();
-    method public void showSoftwareKeyboard();
+  @androidx.compose.runtime.Stable @androidx.compose.ui.ExperimentalComposeUiApi public interface SoftwareKeyboardController {
+    method public void hide();
+    method @Deprecated public default void hideSoftwareKeyboard();
+    method public void show();
+    method @Deprecated public default void showSoftwareKeyboard();
   }
 
   public final class TestTagKt {
@@ -2258,6 +2261,11 @@
     property public final String label;
   }
 
+  public enum LiveRegionMode {
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Assertive;
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Polite;
+  }
+
   public final class ProgressBarRangeInfo {
     ctor public ProgressBarRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional int steps);
     method public float getCurrent();
@@ -2413,6 +2421,7 @@
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getInvisibleToUser();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsDialog();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> getLiveRegion();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getPaneTitle();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getPassword();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> getProgressBarRangeInfo();
@@ -2435,6 +2444,7 @@
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> InvisibleToUser;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsDialog;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> LiveRegion;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> PaneTitle;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Password;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> ProgressBarRangeInfo;
@@ -2464,6 +2474,7 @@
     method public static boolean getFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.semantics.ScrollAxisRange getHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.LiveRegionMode getLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static String getPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.semantics.ProgressBarRangeInfo getProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.semantics.Role getRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
@@ -2490,6 +2501,7 @@
     method public static void setFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean p);
     method public static void setHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange p);
     method public static void setImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
+    method public static void setLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.LiveRegionMode p);
     method public static void setPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
     method public static void setProgress(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean>? action);
     method public static void setProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ProgressBarRangeInfo p);

compose/ui/ui/api/res-1.0.0-beta04.txt

diff --git a/ipc/ipc-runtime/api/res-current.txt b/compose/ui/ui/api/res-1.0.0-beta04.txt
similarity index 100%
copy from ipc/ipc-runtime/api/res-current.txt
copy to compose/ui/ui/api/res-1.0.0-beta04.txt

compose/ui/ui/api/restricted_1.0.0-beta04.txt

diff --git a/compose/ui/ui/api/restricted_1.0.0-beta04.txt b/compose/ui/ui/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..a43f540
--- /dev/null
+++ b/compose/ui/ui/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,2517 @@
+// Signature format: 4.0
+package androidx.compose.ui {
+
+  public final class AbsoluteAlignment {
+    method public androidx.compose.ui.Alignment getBottomLeft();
+    method public androidx.compose.ui.Alignment getBottomRight();
+    method public androidx.compose.ui.Alignment getCenterLeft();
+    method public androidx.compose.ui.Alignment getCenterRight();
+    method public androidx.compose.ui.Alignment.Horizontal getLeft();
+    method public androidx.compose.ui.Alignment.Horizontal getRight();
+    method public androidx.compose.ui.Alignment getTopLeft();
+    method public androidx.compose.ui.Alignment getTopRight();
+    property public final androidx.compose.ui.Alignment BottomLeft;
+    property public final androidx.compose.ui.Alignment BottomRight;
+    property public final androidx.compose.ui.Alignment CenterLeft;
+    property public final androidx.compose.ui.Alignment CenterRight;
+    property public final androidx.compose.ui.Alignment.Horizontal Left;
+    property public final androidx.compose.ui.Alignment.Horizontal Right;
+    property public final androidx.compose.ui.Alignment TopLeft;
+    property public final androidx.compose.ui.Alignment TopRight;
+    field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable public fun interface Alignment {
+    method public long align-oYSo38o(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    field public static final androidx.compose.ui.Alignment.Companion Companion;
+  }
+
+  public static final class Alignment.Companion {
+    method public androidx.compose.ui.Alignment.Vertical getBottom();
+    method public androidx.compose.ui.Alignment getBottomCenter();
+    method public androidx.compose.ui.Alignment getBottomEnd();
+    method public androidx.compose.ui.Alignment getBottomStart();
+    method public androidx.compose.ui.Alignment getCenter();
+    method public androidx.compose.ui.Alignment getCenterEnd();
+    method public androidx.compose.ui.Alignment.Horizontal getCenterHorizontally();
+    method public androidx.compose.ui.Alignment getCenterStart();
+    method public androidx.compose.ui.Alignment.Vertical getCenterVertically();
+    method public androidx.compose.ui.Alignment.Horizontal getEnd();
+    method public androidx.compose.ui.Alignment.Horizontal getStart();
+    method public androidx.compose.ui.Alignment.Vertical getTop();
+    method public androidx.compose.ui.Alignment getTopCenter();
+    method public androidx.compose.ui.Alignment getTopEnd();
+    method public androidx.compose.ui.Alignment getTopStart();
+    property public final androidx.compose.ui.Alignment.Vertical Bottom;
+    property public final androidx.compose.ui.Alignment BottomCenter;
+    property public final androidx.compose.ui.Alignment BottomEnd;
+    property public final androidx.compose.ui.Alignment BottomStart;
+    property public final androidx.compose.ui.Alignment Center;
+    property public final androidx.compose.ui.Alignment CenterEnd;
+    property public final androidx.compose.ui.Alignment.Horizontal CenterHorizontally;
+    property public final androidx.compose.ui.Alignment CenterStart;
+    property public final androidx.compose.ui.Alignment.Vertical CenterVertically;
+    property public final androidx.compose.ui.Alignment.Horizontal End;
+    property public final androidx.compose.ui.Alignment.Horizontal Start;
+    property public final androidx.compose.ui.Alignment.Vertical Top;
+    property public final androidx.compose.ui.Alignment TopCenter;
+    property public final androidx.compose.ui.Alignment TopEnd;
+    property public final androidx.compose.ui.Alignment TopStart;
+  }
+
+  @androidx.compose.runtime.Immutable public static fun interface Alignment.Horizontal {
+    method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+  }
+
+  @androidx.compose.runtime.Immutable public static fun interface Alignment.Vertical {
+    method public int align(int size, int space);
+  }
+
+  @androidx.compose.runtime.Immutable public final class BiasAbsoluteAlignment implements androidx.compose.ui.Alignment {
+    ctor public BiasAbsoluteAlignment(float horizontalBias, float verticalBias);
+    method public long align-oYSo38o(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAbsoluteAlignment copy(float horizontalBias, float verticalBias);
+  }
+
+  @androidx.compose.runtime.Immutable public static final class BiasAbsoluteAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+    ctor public BiasAbsoluteAlignment.Horizontal(float bias);
+    method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAbsoluteAlignment.Horizontal copy(float bias);
+  }
+
+  @androidx.compose.runtime.Immutable public final class BiasAlignment implements androidx.compose.ui.Alignment {
+    ctor public BiasAlignment(float horizontalBias, float verticalBias);
+    method public long align-oYSo38o(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method public float component1();
+    method public float component2();
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAlignment copy(float horizontalBias, float verticalBias);
+    method public float getHorizontalBias();
+    method public float getVerticalBias();
+    property public final float horizontalBias;
+    property public final float verticalBias;
+  }
+
+  @androidx.compose.runtime.Immutable public static final class BiasAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+    ctor public BiasAlignment.Horizontal(float bias);
+    method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAlignment.Horizontal copy(float bias);
+  }
+
+  @androidx.compose.runtime.Immutable public static final class BiasAlignment.Vertical implements androidx.compose.ui.Alignment.Vertical {
+    ctor public BiasAlignment.Vertical(float bias);
+    method public int align(int size, int space);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.BiasAlignment.Vertical copy(float bias);
+  }
+
+  public final class CombinedModifier implements androidx.compose.ui.Modifier {
+    ctor public CombinedModifier(androidx.compose.ui.Modifier outer, androidx.compose.ui.Modifier inner);
+    method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public final class ComposedModifierKt {
+    method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+    method public static androidx.compose.ui.Modifier materialize(androidx.compose.runtime.Composer, androidx.compose.ui.Modifier modifier);
+  }
+
+  @androidx.compose.runtime.Stable public interface Modifier {
+    method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+    method public default infix androidx.compose.ui.Modifier then(androidx.compose.ui.Modifier other);
+    field public static final androidx.compose.ui.Modifier.Companion Companion;
+  }
+
+  public static final class Modifier.Companion implements androidx.compose.ui.Modifier {
+    method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public static interface Modifier.Element extends androidx.compose.ui.Modifier {
+    method public default boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public default boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+    method public default <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+    method public default <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public final class TempListUtilsKt {
+  }
+
+  public final class ZIndexModifierKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier zIndex(androidx.compose.ui.Modifier, float zIndex);
+  }
+
+}
+
+package androidx.compose.ui.autofill {
+
+  public final class AndroidAutofillDebugUtils_androidKt {
+  }
+
+  public final class AndroidAutofillType_androidKt {
+  }
+
+  public final class AndroidAutofill_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.draw {
+
+  public final class AlphaKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier alpha(androidx.compose.ui.Modifier, float alpha);
+  }
+
+  public interface BuildDrawCacheParams {
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public long getSize-NH-jbRc();
+    property public abstract androidx.compose.ui.unit.Density density;
+    property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public abstract long size;
+  }
+
+  public final class CacheDrawScope implements androidx.compose.ui.unit.Density {
+    method public float getDensity();
+    method public float getFontScale();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public long getSize-NH-jbRc();
+    method public androidx.compose.ui.draw.DrawResult onDrawBehind(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+    method public androidx.compose.ui.draw.DrawResult onDrawWithContent(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> block);
+    property public float density;
+    property public float fontScale;
+    property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public final long size;
+  }
+
+  public final class ClipKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clip(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Shape shape);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clipToBounds(androidx.compose.ui.Modifier);
+  }
+
+  public interface DrawCacheModifier extends androidx.compose.ui.draw.DrawModifier {
+    method public void onBuildCache(androidx.compose.ui.draw.BuildDrawCacheParams params);
+  }
+
+  public interface DrawModifier extends androidx.compose.ui.Modifier.Element {
+    method public void draw(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+  }
+
+  public final class DrawModifierKt {
+    method public static androidx.compose.ui.Modifier drawBehind(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+    method public static androidx.compose.ui.Modifier drawWithCache(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.draw.CacheDrawScope,androidx.compose.ui.draw.DrawResult> onBuildDrawCache);
+    method public static androidx.compose.ui.Modifier drawWithContent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> onDraw);
+  }
+
+  public final class DrawResult {
+  }
+
+  public final class PainterModifierKt {
+    method public static androidx.compose.ui.Modifier paint(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.painter.Painter painter, optional boolean sizeToIntrinsics, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+  }
+
+  public final class RotateKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier rotate(androidx.compose.ui.Modifier, float degrees);
+  }
+
+  public final class ScaleKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scaleX, float scaleY);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scale);
+  }
+
+  public final class ShadowKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier shadow-HfQes2E(androidx.compose.ui.Modifier, float elevation, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+  }
+
+}
+
+package androidx.compose.ui.focus {
+
+  public final class FocusChangedModifierKt {
+    method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
+  }
+
+  public enum FocusDirection {
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Down;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Left;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Next;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Previous;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Right;
+    enum_constant public static final androidx.compose.ui.focus.FocusDirection Up;
+  }
+
+  public interface FocusEventModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onFocusEvent(androidx.compose.ui.focus.FocusState focusState);
+  }
+
+  public final class FocusEventModifierKt {
+    method public static androidx.compose.ui.Modifier onFocusEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusEvent);
+  }
+
+  public interface FocusManager {
+    method public void clearFocus(optional boolean forcedClear);
+    method public boolean moveFocus(androidx.compose.ui.focus.FocusDirection focusDirection);
+  }
+
+  public final class FocusModifierKt {
+    method public static androidx.compose.ui.Modifier focusModifier(androidx.compose.ui.Modifier);
+  }
+
+  public final class FocusNodeUtilsKt {
+  }
+
+  public final class FocusOrder {
+    ctor public FocusOrder();
+    method public androidx.compose.ui.focus.FocusRequester getDown();
+    method public androidx.compose.ui.focus.FocusRequester getEnd();
+    method public androidx.compose.ui.focus.FocusRequester getLeft();
+    method public androidx.compose.ui.focus.FocusRequester getNext();
+    method public androidx.compose.ui.focus.FocusRequester getPrevious();
+    method public androidx.compose.ui.focus.FocusRequester getRight();
+    method public androidx.compose.ui.focus.FocusRequester getStart();
+    method public androidx.compose.ui.focus.FocusRequester getUp();
+    method public void setDown(androidx.compose.ui.focus.FocusRequester p);
+    method public void setEnd(androidx.compose.ui.focus.FocusRequester p);
+    method public void setLeft(androidx.compose.ui.focus.FocusRequester p);
+    method public void setNext(androidx.compose.ui.focus.FocusRequester p);
+    method public void setPrevious(androidx.compose.ui.focus.FocusRequester p);
+    method public void setRight(androidx.compose.ui.focus.FocusRequester p);
+    method public void setStart(androidx.compose.ui.focus.FocusRequester p);
+    method public void setUp(androidx.compose.ui.focus.FocusRequester p);
+    property public final androidx.compose.ui.focus.FocusRequester down;
+    property public final androidx.compose.ui.focus.FocusRequester end;
+    property public final androidx.compose.ui.focus.FocusRequester left;
+    property public final androidx.compose.ui.focus.FocusRequester next;
+    property public final androidx.compose.ui.focus.FocusRequester previous;
+    property public final androidx.compose.ui.focus.FocusRequester right;
+    property public final androidx.compose.ui.focus.FocusRequester start;
+    property public final androidx.compose.ui.focus.FocusRequester up;
+  }
+
+  public interface FocusOrderModifier extends androidx.compose.ui.Modifier.Element {
+    method public void populateFocusOrder(androidx.compose.ui.focus.FocusOrder focusOrder);
+  }
+
+  public final class FocusOrderModifierKt {
+    method public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+    method public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+    method public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+  }
+
+  public final class FocusRequester {
+    ctor public FocusRequester();
+    method public boolean captureFocus();
+    method public boolean freeFocus();
+    method public void requestFocus();
+    field public static final androidx.compose.ui.focus.FocusRequester.Companion Companion;
+  }
+
+  public static final class FocusRequester.Companion {
+    method public androidx.compose.ui.focus.FocusRequester getDefault();
+    property public final androidx.compose.ui.focus.FocusRequester Default;
+  }
+
+  public final class FocusRequesterKt {
+  }
+
+  public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
+    method public androidx.compose.ui.focus.FocusRequester getFocusRequester();
+    property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
+  }
+
+  public final class FocusRequesterModifierKt {
+    method public static androidx.compose.ui.Modifier focusRequester(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+  }
+
+  public enum FocusState {
+    enum_constant public static final androidx.compose.ui.focus.FocusState Active;
+    enum_constant public static final androidx.compose.ui.focus.FocusState ActiveParent;
+    enum_constant public static final androidx.compose.ui.focus.FocusState Captured;
+    enum_constant public static final androidx.compose.ui.focus.FocusState Disabled;
+    enum_constant public static final androidx.compose.ui.focus.FocusState Inactive;
+  }
+
+  public final class FocusStateKt {
+    method public static boolean isFocused(androidx.compose.ui.focus.FocusState);
+  }
+
+  public final class FocusTransactionsKt {
+  }
+
+  public final class FocusTraversalKt {
+  }
+
+}
+
+package androidx.compose.ui.graphics {
+
+  public final class GraphicsLayerModifierKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> block);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer-i_P0lGk(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier toolingGraphicsLayer(androidx.compose.ui.Modifier);
+  }
+
+  public interface GraphicsLayerScope extends androidx.compose.ui.unit.Density {
+    method public float getAlpha();
+    method public float getCameraDistance();
+    method public boolean getClip();
+    method public float getRotationX();
+    method public float getRotationY();
+    method public float getRotationZ();
+    method public float getScaleX();
+    method public float getScaleY();
+    method public float getShadowElevation();
+    method public androidx.compose.ui.graphics.Shape getShape();
+    method public long getTransformOrigin-SzJe1aQ();
+    method public float getTranslationX();
+    method public float getTranslationY();
+    method public void setAlpha(float p);
+    method public void setCameraDistance(float p);
+    method public void setClip(boolean p);
+    method public void setRotationX(float p);
+    method public void setRotationY(float p);
+    method public void setRotationZ(float p);
+    method public void setScaleX(float p);
+    method public void setScaleY(float p);
+    method public void setShadowElevation(float p);
+    method public void setShape(androidx.compose.ui.graphics.Shape p);
+    method public void setTransformOrigin-__ExYCQ(long p);
+    method public void setTranslationX(float p);
+    method public void setTranslationY(float p);
+    property public abstract float alpha;
+    property public abstract float cameraDistance;
+    property public abstract boolean clip;
+    property public abstract float rotationX;
+    property public abstract float rotationY;
+    property public abstract float rotationZ;
+    property public abstract float scaleX;
+    property public abstract float scaleY;
+    property public abstract float shadowElevation;
+    property public abstract androidx.compose.ui.graphics.Shape shape;
+    property public abstract long transformOrigin;
+    property public abstract float translationX;
+    property public abstract float translationY;
+  }
+
+  public final class GraphicsLayerScopeKt {
+    method public static androidx.compose.ui.graphics.GraphicsLayerScope GraphicsLayerScope();
+    field public static final float DefaultCameraDistance = 8.0f;
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class TransformOrigin {
+    ctor public TransformOrigin();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-SzJe1aQ(long $this, optional float pivotFractionX, optional float pivotFractionY);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getPivotFractionX-impl(long $this);
+    method public static float getPivotFractionY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Immutable public static inline String! toString-impl(long p);
+    field public static final androidx.compose.ui.graphics.TransformOrigin.Companion Companion;
+  }
+
+  public static final class TransformOrigin.Companion {
+    method public long getCenter-SzJe1aQ();
+    property public final long Center;
+  }
+
+  public final class TransformOriginKt {
+    method public static long TransformOrigin(float pivotFractionX, float pivotFractionY);
+  }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+  public final class AnimatorKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class ImageVector {
+    method public float getDefaultHeight-D9Ej5fM();
+    method public float getDefaultWidth-D9Ej5fM();
+    method public String getName();
+    method public androidx.compose.ui.graphics.vector.VectorGroup getRoot();
+    method public androidx.compose.ui.graphics.BlendMode getTintBlendMode();
+    method public long getTintColor-0d7_KjU();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+    property public final float defaultHeight;
+    property public final float defaultWidth;
+    property public final String name;
+    property public final androidx.compose.ui.graphics.vector.VectorGroup root;
+    property public final androidx.compose.ui.graphics.BlendMode tintBlendMode;
+    property public final long tintColor;
+    property public final float viewportHeight;
+    property public final float viewportWidth;
+    field public static final androidx.compose.ui.graphics.vector.ImageVector.Companion Companion;
+  }
+
+  public static final class ImageVector.Builder {
+    method public androidx.compose.ui.graphics.vector.ImageVector.Builder addGroup(optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData);
+    method public androidx.compose.ui.graphics.vector.ImageVector.Builder addPath(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional androidx.compose.ui.graphics.PathFillType pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional androidx.compose.ui.graphics.StrokeCap strokeLineCap, optional androidx.compose.ui.graphics.StrokeJoin strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+    method public androidx.compose.ui.graphics.vector.ImageVector build();
+    method public androidx.compose.ui.graphics.vector.ImageVector.Builder clearGroup();
+  }
+
+  public static final class ImageVector.Companion {
+  }
+
+  public final class ImageVectorKt {
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder group(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,kotlin.Unit> block);
+    method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder path(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional androidx.compose.ui.graphics.StrokeCap strokeLineCap, optional androidx.compose.ui.graphics.StrokeJoin strokeLineJoin, optional float strokeLineMiter, optional androidx.compose.ui.graphics.PathFillType pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+  public abstract sealed class VNode {
+    method public abstract void draw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    method public final void invalidate();
+  }
+
+  public final class VectorApplier extends androidx.compose.runtime.AbstractApplier<androidx.compose.ui.graphics.vector.VNode> {
+    ctor public VectorApplier(androidx.compose.ui.graphics.vector.VNode root);
+    method public void insertBottomUp(int index, androidx.compose.ui.graphics.vector.VNode instance);
+    method public void insertTopDown(int index, androidx.compose.ui.graphics.vector.VNode instance);
+    method public void move(int from, int to, int count);
+    method protected void onClear();
+    method public void remove(int index, int count);
+  }
+
+  public final class VectorComposeKt {
+    method @androidx.compose.runtime.Composable public static void Group(optional String name, optional float rotation, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Path(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional androidx.compose.ui.graphics.PathFillType pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional androidx.compose.ui.graphics.StrokeCap strokeLineCap, optional androidx.compose.ui.graphics.StrokeJoin strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+  }
+
+  @androidx.compose.runtime.Immutable public final class VectorGroup extends androidx.compose.ui.graphics.vector.VectorNode implements java.lang.Iterable<androidx.compose.ui.graphics.vector.VectorNode> kotlin.jvm.internal.markers.KMappedMarker {
+    method public operator androidx.compose.ui.graphics.vector.VectorNode get(int index);
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getClipPathData();
+    method public String getName();
+    method public float getPivotX();
+    method public float getPivotY();
+    method public float getRotation();
+    method public float getScaleX();
+    method public float getScaleY();
+    method public int getSize();
+    method public float getTranslationX();
+    method public float getTranslationY();
+    method public java.util.Iterator<androidx.compose.ui.graphics.vector.VectorNode> iterator();
+    property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> clipPathData;
+    property public final String name;
+    property public final float pivotX;
+    property public final float pivotY;
+    property public final float rotation;
+    property public final float scaleX;
+    property public final float scaleY;
+    property public final int size;
+    property public final float translationX;
+    property public final float translationY;
+  }
+
+  public final class VectorKt {
+    method public static inline java.util.List<androidx.compose.ui.graphics.vector.PathNode> PathData(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> block);
+    method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> addPathNodes(String? pathStr);
+    method public static androidx.compose.ui.graphics.PathFillType getDefaultFillType();
+    method public static androidx.compose.ui.graphics.StrokeCap getDefaultStrokeLineCap();
+    method public static androidx.compose.ui.graphics.StrokeJoin getDefaultStrokeLineJoin();
+    method public static androidx.compose.ui.graphics.BlendMode getDefaultTintBlendMode();
+    method public static long getDefaultTintColor();
+    method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> getEmptyPath();
+    field public static final String DefaultGroupName = "";
+    field public static final String DefaultPathName = "";
+    field public static final float DefaultPivotX = 0.0f;
+    field public static final float DefaultPivotY = 0.0f;
+    field public static final float DefaultRotation = 0.0f;
+    field public static final float DefaultScaleX = 1.0f;
+    field public static final float DefaultScaleY = 1.0f;
+    field public static final float DefaultStrokeLineMiter = 4.0f;
+    field public static final float DefaultStrokeLineWidth = 0.0f;
+    field public static final float DefaultTranslationX = 0.0f;
+    field public static final float DefaultTranslationY = 0.0f;
+    field public static final float DefaultTrimPathEnd = 1.0f;
+    field public static final float DefaultTrimPathOffset = 0.0f;
+    field public static final float DefaultTrimPathStart = 0.0f;
+  }
+
+  public abstract sealed class VectorNode {
+  }
+
+  public final class VectorPainter extends androidx.compose.ui.graphics.painter.Painter {
+    method public long getIntrinsicSize-NH-jbRc();
+    method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+    property public long intrinsicSize;
+  }
+
+  public final class VectorPainterKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(androidx.compose.ui.graphics.vector.ImageVector image);
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter-u_AqRoo(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional androidx.compose.ui.graphics.BlendMode tintBlendMode, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+    field public static final String RootGroupName = "VectorRootGroup";
+  }
+
+  @androidx.compose.runtime.Immutable public final class VectorPath extends androidx.compose.ui.graphics.vector.VectorNode {
+    method public androidx.compose.ui.graphics.Brush? getFill();
+    method public float getFillAlpha();
+    method public String getName();
+    method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getPathData();
+    method public androidx.compose.ui.graphics.PathFillType getPathFillType();
+    method public androidx.compose.ui.graphics.Brush? getStroke();
+    method public float getStrokeAlpha();
+    method public androidx.compose.ui.graphics.StrokeCap getStrokeLineCap();
+    method public androidx.compose.ui.graphics.StrokeJoin getStrokeLineJoin();
+    method public float getStrokeLineMiter();
+    method public float getStrokeLineWidth();
+    method public float getTrimPathEnd();
+    method public float getTrimPathOffset();
+    method public float getTrimPathStart();
+    property public final androidx.compose.ui.graphics.Brush? fill;
+    property public final float fillAlpha;
+    property public final String name;
+    property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> pathData;
+    property public final androidx.compose.ui.graphics.PathFillType pathFillType;
+    property public final androidx.compose.ui.graphics.Brush? stroke;
+    property public final float strokeAlpha;
+    property public final androidx.compose.ui.graphics.StrokeCap strokeLineCap;
+    property public final androidx.compose.ui.graphics.StrokeJoin strokeLineJoin;
+    property public final float strokeLineMiter;
+    property public final float strokeLineWidth;
+    property public final float trimPathEnd;
+    property public final float trimPathOffset;
+    property public final float trimPathStart;
+  }
+
+}
+
+package androidx.compose.ui.graphics.vector.compat {
+
+  public final class XmlAnimatedVectorParser_androidKt {
+  }
+
+  public final class XmlAnimatorParser_androidKt {
+  }
+
+  public final class XmlPullParserUtils_androidKt {
+  }
+
+  public final class XmlVectorParser_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.hapticfeedback {
+
+  public interface HapticFeedback {
+    method public void performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType hapticFeedbackType);
+  }
+
+  public enum HapticFeedbackType {
+    enum_constant public static final androidx.compose.ui.hapticfeedback.HapticFeedbackType LongPress;
+    enum_constant public static final androidx.compose.ui.hapticfeedback.HapticFeedbackType TextHandleMove;
+  }
+
+}
+
+package androidx.compose.ui.input.key {
+
+  public final inline class Key {
+    ctor public Key();
+    method public static long constructor-impl(long keyCode);
+    method public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getKeyCode();
+    method public static inline int hashCode-impl(long p);
+    method public static String toString-impl(long $this);
+    property public final long keyCode;
+    field public static final androidx.compose.ui.input.key.Key.Companion Companion;
+  }
+
+  public static final class Key.Companion {
+    method public long getA-EK5gGoQ();
+    method public long getAllApps-EK5gGoQ();
+    method public long getAltLeft-EK5gGoQ();
+    method public long getAltRight-EK5gGoQ();
+    method public long getApostrophe-EK5gGoQ();
+    method public long getAppSwitch-EK5gGoQ();
+    method public long getAssist-EK5gGoQ();
+    method public long getAt-EK5gGoQ();
+    method public long getAvReceiverInput-EK5gGoQ();
+    method public long getAvReceiverPower-EK5gGoQ();
+    method public long getB-EK5gGoQ();
+    method public long getBack-EK5gGoQ();
+    method public long getBackslash-EK5gGoQ();
+    method public long getBackspace-EK5gGoQ();
+    method public long getBookmark-EK5gGoQ();
+    method public long getBreak-EK5gGoQ();
+    method public long getBrightnessDown-EK5gGoQ();
+    method public long getBrightnessUp-EK5gGoQ();
+    method public long getBrowser-EK5gGoQ();
+    method public long getButton1-EK5gGoQ();
+    method public long getButton10-EK5gGoQ();
+    method public long getButton11-EK5gGoQ();
+    method public long getButton12-EK5gGoQ();
+    method public long getButton13-EK5gGoQ();
+    method public long getButton14-EK5gGoQ();
+    method public long getButton15-EK5gGoQ();
+    method public long getButton16-EK5gGoQ();
+    method public long getButton2-EK5gGoQ();
+    method public long getButton3-EK5gGoQ();
+    method public long getButton4-EK5gGoQ();
+    method public long getButton5-EK5gGoQ();
+    method public long getButton6-EK5gGoQ();
+    method public long getButton7-EK5gGoQ();
+    method public long getButton8-EK5gGoQ();
+    method public long getButton9-EK5gGoQ();
+    method public long getButtonA-EK5gGoQ();
+    method public long getButtonB-EK5gGoQ();
+    method public long getButtonC-EK5gGoQ();
+    method public long getButtonL1-EK5gGoQ();
+    method public long getButtonL2-EK5gGoQ();
+    method public long getButtonMode-EK5gGoQ();
+    method public long getButtonR1-EK5gGoQ();
+    method public long getButtonR2-EK5gGoQ();
+    method public long getButtonSelect-EK5gGoQ();
+    method public long getButtonStart-EK5gGoQ();
+    method public long getButtonThumbLeft-EK5gGoQ();
+    method public long getButtonThumbRight-EK5gGoQ();
+    method public long getButtonX-EK5gGoQ();
+    method public long getButtonY-EK5gGoQ();
+    method public long getButtonZ-EK5gGoQ();
+    method public long getC-EK5gGoQ();
+    method public long getCalculator-EK5gGoQ();
+    method public long getCalendar-EK5gGoQ();
+    method public long getCall-EK5gGoQ();
+    method public long getCamera-EK5gGoQ();
+    method public long getCapsLock-EK5gGoQ();
+    method public long getCaptions-EK5gGoQ();
+    method public long getChannelDown-EK5gGoQ();
+    method public long getChannelUp-EK5gGoQ();
+    method public long getClear-EK5gGoQ();
+    method public long getComma-EK5gGoQ();
+    method public long getContacts-EK5gGoQ();
+    method public long getCopy-EK5gGoQ();
+    method public long getCtrlLeft-EK5gGoQ();
+    method public long getCtrlRight-EK5gGoQ();
+    method public long getCut-EK5gGoQ();
+    method public long getD-EK5gGoQ();
+    method public long getDelete-EK5gGoQ();
+    method public long getDirectionCenter-EK5gGoQ();
+    method public long getDirectionDown-EK5gGoQ();
+    method public long getDirectionDownLeft-EK5gGoQ();
+    method public long getDirectionDownRight-EK5gGoQ();
+    method public long getDirectionLeft-EK5gGoQ();
+    method public long getDirectionRight-EK5gGoQ();
+    method public long getDirectionUp-EK5gGoQ();
+    method public long getDirectionUpLeft-EK5gGoQ();
+    method public long getDirectionUpRight-EK5gGoQ();
+    method public long getDvr-EK5gGoQ();
+    method public long getE-EK5gGoQ();
+    method public long getEight-EK5gGoQ();
+    method public long getEisu-EK5gGoQ();
+    method public long getEndCall-EK5gGoQ();
+    method public long getEnter-EK5gGoQ();
+    method public long getEnvelope-EK5gGoQ();
+    method public long getEquals-EK5gGoQ();
+    method public long getEscape-EK5gGoQ();
+    method public long getF-EK5gGoQ();
+    method public long getF1-EK5gGoQ();
+    method public long getF10-EK5gGoQ();
+    method public long getF11-EK5gGoQ();
+    method public long getF12-EK5gGoQ();
+    method public long getF2-EK5gGoQ();
+    method public long getF3-EK5gGoQ();
+    method public long getF4-EK5gGoQ();
+    method public long getF5-EK5gGoQ();
+    method public long getF6-EK5gGoQ();
+    method public long getF7-EK5gGoQ();
+    method public long getF8-EK5gGoQ();
+    method public long getF9-EK5gGoQ();
+    method public long getFive-EK5gGoQ();
+    method public long getFocus-EK5gGoQ();
+    method public long getForward-EK5gGoQ();
+    method public long getFour-EK5gGoQ();
+    method public long getFunction-EK5gGoQ();
+    method public long getG-EK5gGoQ();
+    method public long getGrave-EK5gGoQ();
+    method public long getGuide-EK5gGoQ();
+    method public long getH-EK5gGoQ();
+    method public long getHeadsetHook-EK5gGoQ();
+    method public long getHelp-EK5gGoQ();
+    method public long getHenkan-EK5gGoQ();
+    method public long getHome-EK5gGoQ();
+    method public long getI-EK5gGoQ();
+    method public long getInfo-EK5gGoQ();
+    method public long getInsert-EK5gGoQ();
+    method public long getJ-EK5gGoQ();
+    method public long getK-EK5gGoQ();
+    method public long getKana-EK5gGoQ();
+    method public long getKatakanaHiragana-EK5gGoQ();
+    method public long getL-EK5gGoQ();
+    method public long getLanguageSwitch-EK5gGoQ();
+    method public long getLastChannel-EK5gGoQ();
+    method public long getLeftBracket-EK5gGoQ();
+    method public long getM-EK5gGoQ();
+    method public long getMannerMode-EK5gGoQ();
+    method public long getMediaAudioTrack-EK5gGoQ();
+    method public long getMediaClose-EK5gGoQ();
+    method public long getMediaEject-EK5gGoQ();
+    method public long getMediaFastForward-EK5gGoQ();
+    method public long getMediaNext-EK5gGoQ();
+    method public long getMediaPause-EK5gGoQ();
+    method public long getMediaPlay-EK5gGoQ();
+    method public long getMediaPlayPause-EK5gGoQ();
+    method public long getMediaPrevious-EK5gGoQ();
+    method public long getMediaRecord-EK5gGoQ();
+    method public long getMediaRewind-EK5gGoQ();
+    method public long getMediaSkipBackward-EK5gGoQ();
+    method public long getMediaSkipForward-EK5gGoQ();
+    method public long getMediaStepBackward-EK5gGoQ();
+    method public long getMediaStepForward-EK5gGoQ();
+    method public long getMediaStop-EK5gGoQ();
+    method public long getMediaTopMenu-EK5gGoQ();
+    method public long getMenu-EK5gGoQ();
+    method public long getMetaLeft-EK5gGoQ();
+    method public long getMetaRight-EK5gGoQ();
+    method public long getMicrophoneMute-EK5gGoQ();
+    method public long getMinus-EK5gGoQ();
+    method public long getMoveEnd-EK5gGoQ();
+    method public long getMoveHome-EK5gGoQ();
+    method public long getMuhenkan-EK5gGoQ();
+    method public long getMultiply-EK5gGoQ();
+    method public long getMusic-EK5gGoQ();
+    method public long getN-EK5gGoQ();
+    method public long getNavigateIn-EK5gGoQ();
+    method public long getNavigateNext-EK5gGoQ();
+    method public long getNavigateOut-EK5gGoQ();
+    method public long getNavigatePrevious-EK5gGoQ();
+    method public long getNine-EK5gGoQ();
+    method public long getNotification-EK5gGoQ();
+    method public long getNumLock-EK5gGoQ();
+    method public long getNumPad0-EK5gGoQ();
+    method public long getNumPad1-EK5gGoQ();
+    method public long getNumPad2-EK5gGoQ();
+    method public long getNumPad3-EK5gGoQ();
+    method public long getNumPad4-EK5gGoQ();
+    method public long getNumPad5-EK5gGoQ();
+    method public long getNumPad6-EK5gGoQ();
+    method public long getNumPad7-EK5gGoQ();
+    method public long getNumPad8-EK5gGoQ();
+    method public long getNumPad9-EK5gGoQ();
+    method public long getNumPadAdd-EK5gGoQ();
+    method public long getNumPadComma-EK5gGoQ();
+    method public long getNumPadDivide-EK5gGoQ();
+    method public long getNumPadDot-EK5gGoQ();
+    method public long getNumPadEnter-EK5gGoQ();
+    method public long getNumPadEquals-EK5gGoQ();
+    method public long getNumPadLeftParenthesis-EK5gGoQ();
+    method public long getNumPadMultiply-EK5gGoQ();
+    method public long getNumPadRightParenthesis-EK5gGoQ();
+    method public long getNumPadSubtract-EK5gGoQ();
+    method public long getNumber-EK5gGoQ();
+    method public long getO-EK5gGoQ();
+    method public long getOne-EK5gGoQ();
+    method public long getP-EK5gGoQ();
+    method public long getPageDown-EK5gGoQ();
+    method public long getPageUp-EK5gGoQ();
+    method public long getPairing-EK5gGoQ();
+    method public long getPaste-EK5gGoQ();
+    method public long getPeriod-EK5gGoQ();
+    method public long getPictureSymbols-EK5gGoQ();
+    method public long getPlus-EK5gGoQ();
+    method public long getPound-EK5gGoQ();
+    method public long getPower-EK5gGoQ();
+    method public long getPrintScreen-EK5gGoQ();
+    method public long getProfileSwitch-EK5gGoQ();
+    method public long getProgramBlue-EK5gGoQ();
+    method public long getProgramGreen-EK5gGoQ();
+    method public long getProgramRed-EK5gGoQ();
+    method public long getProgramYellow-EK5gGoQ();
+    method public long getQ-EK5gGoQ();
+    method public long getR-EK5gGoQ();
+    method public long getRefresh-EK5gGoQ();
+    method public long getRightBracket-EK5gGoQ();
+    method public long getRo-EK5gGoQ();
+    method public long getS-EK5gGoQ();
+    method public long getScrollLock-EK5gGoQ();
+    method public long getSearch-EK5gGoQ();
+    method public long getSemicolon-EK5gGoQ();
+    method public long getSetTopBoxInput-EK5gGoQ();
+    method public long getSetTopBoxPower-EK5gGoQ();
+    method public long getSettings-EK5gGoQ();
+    method public long getSeven-EK5gGoQ();
+    method public long getShiftLeft-EK5gGoQ();
+    method public long getShiftRight-EK5gGoQ();
+    method public long getSix-EK5gGoQ();
+    method public long getSlash-EK5gGoQ();
+    method public long getSleep-EK5gGoQ();
+    method public long getSoftLeft-EK5gGoQ();
+    method public long getSoftRight-EK5gGoQ();
+    method public long getSoftSleep-EK5gGoQ();
+    method public long getSpacebar-EK5gGoQ();
+    method public long getStem1-EK5gGoQ();
+    method public long getStem2-EK5gGoQ();
+    method public long getStem3-EK5gGoQ();
+    method public long getStemPrimary-EK5gGoQ();
+    method public long getSwitchCharset-EK5gGoQ();
+    method public long getSymbol-EK5gGoQ();
+    method public long getSystemNavigationDown-EK5gGoQ();
+    method public long getSystemNavigationLeft-EK5gGoQ();
+    method public long getSystemNavigationRight-EK5gGoQ();
+    method public long getSystemNavigationUp-EK5gGoQ();
+    method public long getT-EK5gGoQ();
+    method public long getTab-EK5gGoQ();
+    method public long getThree-EK5gGoQ();
+    method public long getThumbsDown-EK5gGoQ();
+    method public long getThumbsUp-EK5gGoQ();
+    method public long getToggle2D3D-EK5gGoQ();
+    method public long getTv-EK5gGoQ();
+    method public long getTvAntennaCable-EK5gGoQ();
+    method public long getTvAudioDescription-EK5gGoQ();
+    method public long getTvAudioDescriptionMixingVolumeDown-EK5gGoQ();
+    method public long getTvAudioDescriptionMixingVolumeUp-EK5gGoQ();
+    method public long getTvContentsMenu-EK5gGoQ();
+    method public long getTvDataService-EK5gGoQ();
+    method public long getTvInput-EK5gGoQ();
+    method public long getTvInputComponent1-EK5gGoQ();
+    method public long getTvInputComponent2-EK5gGoQ();
+    method public long getTvInputComposite1-EK5gGoQ();
+    method public long getTvInputComposite2-EK5gGoQ();
+    method public long getTvInputHdmi1-EK5gGoQ();
+    method public long getTvInputHdmi2-EK5gGoQ();
+    method public long getTvInputHdmi3-EK5gGoQ();
+    method public long getTvInputHdmi4-EK5gGoQ();
+    method public long getTvInputVga1-EK5gGoQ();
+    method public long getTvMediaContextMenu-EK5gGoQ();
+    method public long getTvNetwork-EK5gGoQ();
+    method public long getTvNumberEntry-EK5gGoQ();
+    method public long getTvPower-EK5gGoQ();
+    method public long getTvRadioService-EK5gGoQ();
+    method public long getTvSatellite-EK5gGoQ();
+    method public long getTvSatelliteBs-EK5gGoQ();
+    method public long getTvSatelliteCs-EK5gGoQ();
+    method public long getTvSatelliteService-EK5gGoQ();
+    method public long getTvTeletext-EK5gGoQ();
+    method public long getTvTerrestrialAnalog-EK5gGoQ();
+    method public long getTvTerrestrialDigital-EK5gGoQ();
+    method public long getTvTimerProgramming-EK5gGoQ();
+    method public long getTvZoomMode-EK5gGoQ();
+    method public long getTwo-EK5gGoQ();
+    method public long getU-EK5gGoQ();
+    method public long getUnknown-EK5gGoQ();
+    method public long getV-EK5gGoQ();
+    method public long getVoiceAssist-EK5gGoQ();
+    method public long getVolumeDown-EK5gGoQ();
+    method public long getVolumeMute-EK5gGoQ();
+    method public long getVolumeUp-EK5gGoQ();
+    method public long getW-EK5gGoQ();
+    method public long getWakeUp-EK5gGoQ();
+    method public long getWindow-EK5gGoQ();
+    method public long getX-EK5gGoQ();
+    method public long getY-EK5gGoQ();
+    method public long getYen-EK5gGoQ();
+    method public long getZ-EK5gGoQ();
+    method public long getZenkakuHankaru-EK5gGoQ();
+    method public long getZero-EK5gGoQ();
+    method public long getZoomIn-EK5gGoQ();
+    method public long getZoomOut-EK5gGoQ();
+    property public final long A;
+    property public final long AllApps;
+    property public final long AltLeft;
+    property public final long AltRight;
+    property public final long Apostrophe;
+    property public final long AppSwitch;
+    property public final long Assist;
+    property public final long At;
+    property public final long AvReceiverInput;
+    property public final long AvReceiverPower;
+    property public final long B;
+    property public final long Back;
+    property public final long Backslash;
+    property public final long Backspace;
+    property public final long Bookmark;
+    property public final long Break;
+    property public final long BrightnessDown;
+    property public final long BrightnessUp;
+    property public final long Browser;
+    property public final long Button1;
+    property public final long Button10;
+    property public final long Button11;
+    property public final long Button12;
+    property public final long Button13;
+    property public final long Button14;
+    property public final long Button15;
+    property public final long Button16;
+    property public final long Button2;
+    property public final long Button3;
+    property public final long Button4;
+    property public final long Button5;
+    property public final long Button6;
+    property public final long Button7;
+    property public final long Button8;
+    property public final long Button9;
+    property public final long ButtonA;
+    property public final long ButtonB;
+    property public final long ButtonC;
+    property public final long ButtonL1;
+    property public final long ButtonL2;
+    property public final long ButtonMode;
+    property public final long ButtonR1;
+    property public final long ButtonR2;
+    property public final long ButtonSelect;
+    property public final long ButtonStart;
+    property public final long ButtonThumbLeft;
+    property public final long ButtonThumbRight;
+    property public final long ButtonX;
+    property public final long ButtonY;
+    property public final long ButtonZ;
+    property public final long C;
+    property public final long Calculator;
+    property public final long Calendar;
+    property public final long Call;
+    property public final long Camera;
+    property public final long CapsLock;
+    property public final long Captions;
+    property public final long ChannelDown;
+    property public final long ChannelUp;
+    property public final long Clear;
+    property public final long Comma;
+    property public final long Contacts;
+    property public final long Copy;
+    property public final long CtrlLeft;
+    property public final long CtrlRight;
+    property public final long Cut;
+    property public final long D;
+    property public final long Delete;
+    property public final long DirectionCenter;
+    property public final long DirectionDown;
+    property public final long DirectionDownLeft;
+    property public final long DirectionDownRight;
+    property public final long DirectionLeft;
+    property public final long DirectionRight;
+    property public final long DirectionUp;
+    property public final long DirectionUpLeft;
+    property public final long DirectionUpRight;
+    property public final long Dvr;
+    property public final long E;
+    property public final long Eight;
+    property public final long Eisu;
+    property public final long EndCall;
+    property public final long Enter;
+    property public final long Envelope;
+    property public final long Equals;
+    property public final long Escape;
+    property public final long F;
+    property public final long F1;
+    property public final long F10;
+    property public final long F11;
+    property public final long F12;
+    property public final long F2;
+    property public final long F3;
+    property public final long F4;
+    property public final long F5;
+    property public final long F6;
+    property public final long F7;
+    property public final long F8;
+    property public final long F9;
+    property public final long Five;
+    property public final long Focus;
+    property public final long Forward;
+    property public final long Four;
+    property public final long Function;
+    property public final long G;
+    property public final long Grave;
+    property public final long Guide;
+    property public final long H;
+    property public final long HeadsetHook;
+    property public final long Help;
+    property public final long Henkan;
+    property public final long Home;
+    property public final long I;
+    property public final long Info;
+    property public final long Insert;
+    property public final long J;
+    property public final long K;
+    property public final long Kana;
+    property public final long KatakanaHiragana;
+    property public final long L;
+    property public final long LanguageSwitch;
+    property public final long LastChannel;
+    property public final long LeftBracket;
+    property public final long M;
+    property public final long MannerMode;
+    property public final long MediaAudioTrack;
+    property public final long MediaClose;
+    property public final long MediaEject;
+    property public final long MediaFastForward;
+    property public final long MediaNext;
+    property public final long MediaPause;
+    property public final long MediaPlay;
+    property public final long MediaPlayPause;
+    property public final long MediaPrevious;
+    property public final long MediaRecord;
+    property public final long MediaRewind;
+    property public final long MediaSkipBackward;
+    property public final long MediaSkipForward;
+    property public final long MediaStepBackward;
+    property public final long MediaStepForward;
+    property public final long MediaStop;
+    property public final long MediaTopMenu;
+    property public final long Menu;
+    property public final long MetaLeft;
+    property public final long MetaRight;
+    property public final long MicrophoneMute;
+    property public final long Minus;
+    property public final long MoveEnd;
+    property public final long MoveHome;
+    property public final long Muhenkan;
+    property public final long Multiply;
+    property public final long Music;
+    property public final long N;
+    property public final long NavigateIn;
+    property public final long NavigateNext;
+    property public final long NavigateOut;
+    property public final long NavigatePrevious;
+    property public final long Nine;
+    property public final long Notification;
+    property public final long NumLock;
+    property public final long NumPad0;
+    property public final long NumPad1;
+    property public final long NumPad2;
+    property public final long NumPad3;
+    property public final long NumPad4;
+    property public final long NumPad5;
+    property public final long NumPad6;
+    property public final long NumPad7;
+    property public final long NumPad8;
+    property public final long NumPad9;
+    property public final long NumPadAdd;
+    property public final long NumPadComma;
+    property public final long NumPadDivide;
+    property public final long NumPadDot;
+    property public final long NumPadEnter;
+    property public final long NumPadEquals;
+    property public final long NumPadLeftParenthesis;
+    property public final long NumPadMultiply;
+    property public final long NumPadRightParenthesis;
+    property public final long NumPadSubtract;
+    property public final long Number;
+    property public final long O;
+    property public final long One;
+    property public final long P;
+    property public final long PageDown;
+    property public final long PageUp;
+    property public final long Pairing;
+    property public final long Paste;
+    property public final long Period;
+    property public final long PictureSymbols;
+    property public final long Plus;
+    property public final long Pound;
+    property public final long Power;
+    property public final long PrintScreen;
+    property public final long ProfileSwitch;
+    property public final long ProgramBlue;
+    property public final long ProgramGreen;
+    property public final long ProgramRed;
+    property public final long ProgramYellow;
+    property public final long Q;
+    property public final long R;
+    property public final long Refresh;
+    property public final long RightBracket;
+    property public final long Ro;
+    property public final long S;
+    property public final long ScrollLock;
+    property public final long Search;
+    property public final long Semicolon;
+    property public final long SetTopBoxInput;
+    property public final long SetTopBoxPower;
+    property public final long Settings;
+    property public final long Seven;
+    property public final long ShiftLeft;
+    property public final long ShiftRight;
+    property public final long Six;
+    property public final long Slash;
+    property public final long Sleep;
+    property public final long SoftLeft;
+    property public final long SoftRight;
+    property public final long SoftSleep;
+    property public final long Spacebar;
+    property public final long Stem1;
+    property public final long Stem2;
+    property public final long Stem3;
+    property public final long StemPrimary;
+    property public final long SwitchCharset;
+    property public final long Symbol;
+    property public final long SystemNavigationDown;
+    property public final long SystemNavigationLeft;
+    property public final long SystemNavigationRight;
+    property public final long SystemNavigationUp;
+    property public final long T;
+    property public final long Tab;
+    property public final long Three;
+    property public final long ThumbsDown;
+    property public final long ThumbsUp;
+    property public final long Toggle2D3D;
+    property public final long Tv;
+    property public final long TvAntennaCable;
+    property public final long TvAudioDescription;
+    property public final long TvAudioDescriptionMixingVolumeDown;
+    property public final long TvAudioDescriptionMixingVolumeUp;
+    property public final long TvContentsMenu;
+    property public final long TvDataService;
+    property public final long TvInput;
+    property public final long TvInputComponent1;
+    property public final long TvInputComponent2;
+    property public final long TvInputComposite1;
+    property public final long TvInputComposite2;
+    property public final long TvInputHdmi1;
+    property public final long TvInputHdmi2;
+    property public final long TvInputHdmi3;
+    property public final long TvInputHdmi4;
+    property public final long TvInputVga1;
+    property public final long TvMediaContextMenu;
+    property public final long TvNetwork;
+    property public final long TvNumberEntry;
+    property public final long TvPower;
+    property public final long TvRadioService;
+    property public final long TvSatellite;
+    property public final long TvSatelliteBs;
+    property public final long TvSatelliteCs;
+    property public final long TvSatelliteService;
+    property public final long TvTeletext;
+    property public final long TvTerrestrialAnalog;
+    property public final long TvTerrestrialDigital;
+    property public final long TvTimerProgramming;
+    property public final long TvZoomMode;
+    property public final long Two;
+    property public final long U;
+    property public final long Unknown;
+    property public final long V;
+    property public final long VoiceAssist;
+    property public final long VolumeDown;
+    property public final long VolumeMute;
+    property public final long VolumeUp;
+    property public final long W;
+    property public final long WakeUp;
+    property public final long Window;
+    property public final long X;
+    property public final long Y;
+    property public final long Yen;
+    property public final long Z;
+    property public final long ZenkakuHankaru;
+    property public final long Zero;
+    property public final long ZoomIn;
+    property public final long ZoomOut;
+  }
+
+  public final inline class KeyEvent {
+    ctor public KeyEvent();
+    method public static android.view.KeyEvent! constructor-impl(android.view.KeyEvent nativeKeyEvent);
+    method public static inline boolean equals-impl(android.view.KeyEvent! p, Object? p1);
+    method public static boolean equals-impl0(android.view.KeyEvent p1, android.view.KeyEvent p2);
+    method public android.view.KeyEvent getNativeKeyEvent();
+    method public static inline int hashCode-impl(android.view.KeyEvent! p);
+    method public static inline String! toString-impl(android.view.KeyEvent! p);
+    property public final android.view.KeyEvent nativeKeyEvent;
+  }
+
+  public enum KeyEventType {
+    enum_constant public static final androidx.compose.ui.input.key.KeyEventType KeyDown;
+    enum_constant public static final androidx.compose.ui.input.key.KeyEventType KeyUp;
+    enum_constant public static final androidx.compose.ui.input.key.KeyEventType Unknown;
+  }
+
+  public final class KeyEvent_androidKt {
+    method public static long getKey-ZmokQxo(android.view.KeyEvent);
+    method public static androidx.compose.ui.input.key.KeyEventType getType-ZmokQxo(android.view.KeyEvent);
+    method public static int getUtf16CodePoint-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isAltPressed-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isCtrlPressed-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isMetaPressed-ZmokQxo(android.view.KeyEvent);
+    method public static boolean isShiftPressed-ZmokQxo(android.view.KeyEvent);
+  }
+
+  public final class KeyInputModifierKt {
+    method public static androidx.compose.ui.Modifier onKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onKeyEvent);
+    method public static androidx.compose.ui.Modifier onPreviewKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onPreviewKeyEvent);
+  }
+
+  public final class Key_androidKt {
+    method public static long Key(int nativeKeyCode);
+    method public static int getNativeKeyCode-YVgTNJs(long);
+  }
+
+}
+
+package androidx.compose.ui.input.nestedscroll {
+
+  public interface NestedScrollConnection {
+    method public default suspend Object? onPostFling-k5p9STU(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public default long onPostScroll-61dr0bI(long consumed, long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+    method public default suspend Object? onPreFling-bHeVL4A(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public default long onPreScroll-ScU7Jk8(long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+  }
+
+  public final class NestedScrollDelegatingWrapperKt {
+  }
+
+  public final class NestedScrollDispatcher {
+    ctor public NestedScrollDispatcher();
+    method public suspend Object? dispatchPostFling-k5p9STU(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public long dispatchPostScroll-61dr0bI(long consumed, long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+    method public suspend Object? dispatchPreFling-bHeVL4A(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity> p);
+    method public long dispatchPreScroll-ScU7Jk8(long available, androidx.compose.ui.input.nestedscroll.NestedScrollSource source);
+    method public kotlinx.coroutines.CoroutineScope getCoroutineScope();
+    property public final kotlinx.coroutines.CoroutineScope coroutineScope;
+  }
+
+  public final class NestedScrollModifierKt {
+    method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
+  }
+
+  public enum NestedScrollSource {
+    enum_constant public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource Drag;
+    enum_constant public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource Fling;
+  }
+
+}
+
+package androidx.compose.ui.input.pointer {
+
+  @kotlin.coroutines.RestrictsSuspension public interface AwaitPointerEventScope extends androidx.compose.ui.unit.Density {
+    method public suspend Object? awaitPointerEvent(optional androidx.compose.ui.input.pointer.PointerEventPass pass, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerEvent> p);
+    method public androidx.compose.ui.input.pointer.PointerEvent getCurrentEvent();
+    method public long getSize-YbymL2g();
+    method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+    property public abstract androidx.compose.ui.input.pointer.PointerEvent currentEvent;
+    property public abstract long size;
+    property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+  }
+
+  public final class ConsumedData {
+    ctor public ConsumedData(optional boolean positionChange, optional boolean downChange);
+    method public boolean getDownChange();
+    method public boolean getPositionChange();
+    method public void setDownChange(boolean p);
+    method public void setPositionChange(boolean p);
+    property public final boolean downChange;
+    property public final boolean positionChange;
+  }
+
+  public final class HitPathTrackerKt {
+  }
+
+  public final class MotionEventAdapter_androidKt {
+  }
+
+  public final class PointerEvent {
+    ctor public PointerEvent(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes);
+    method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> component1();
+    method public androidx.compose.ui.input.pointer.PointerEvent copy(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes, android.view.MotionEvent? motionEvent);
+    method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> getChanges();
+    property public final java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes;
+  }
+
+  public final class PointerEventKt {
+    method public static boolean anyChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToDown(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToDownIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToUp(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean changedToUpIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static void consumeAllChanges(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static void consumeDownChange(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static void consumePositionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean isOutOfBounds-MReStF0(androidx.compose.ui.input.pointer.PointerInputChange, long size);
+    method public static long positionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean positionChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static long positionChangeIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean positionChanged(androidx.compose.ui.input.pointer.PointerInputChange);
+    method public static boolean positionChangedIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+  }
+
+  public enum PointerEventPass {
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Final;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Initial;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Main;
+  }
+
+  public final inline class PointerId {
+    ctor public PointerId();
+    method public static long constructor-impl(long value);
+    method public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getValue();
+    method public static inline int hashCode-impl(long p);
+    method public static inline String! toString-impl(long p);
+    property public final long value;
+  }
+
+  @androidx.compose.runtime.Immutable public final class PointerInputChange {
+    method public androidx.compose.ui.input.pointer.PointerInputChange copy-aJ2ieLA(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, optional androidx.compose.ui.input.pointer.ConsumedData consumed, optional androidx.compose.ui.input.pointer.PointerType type);
+    method public androidx.compose.ui.input.pointer.ConsumedData getConsumed();
+    method public long getId-J3iCeTQ();
+    method public long getPosition-F1C5BW0();
+    method public boolean getPressed();
+    method public long getPreviousPosition-F1C5BW0();
+    method public boolean getPreviousPressed();
+    method public long getPreviousUptimeMillis();
+    method public androidx.compose.ui.input.pointer.PointerType getType();
+    method public long getUptimeMillis();
+    property public final androidx.compose.ui.input.pointer.ConsumedData consumed;
+    property public final long id;
+    property public final long position;
+    property public final boolean pressed;
+    property public final long previousPosition;
+    property public final boolean previousPressed;
+    property public final long previousUptimeMillis;
+    property public final androidx.compose.ui.input.pointer.PointerType type;
+    property public final long uptimeMillis;
+  }
+
+  public final class PointerInputEventProcessorKt {
+  }
+
+  public abstract class PointerInputFilter {
+    ctor public PointerInputFilter();
+    method public final long getSize-YbymL2g();
+    method public abstract void onCancel();
+    method public abstract void onPointerEvent-d1fqKvQ(androidx.compose.ui.input.pointer.PointerEvent pointerEvent, androidx.compose.ui.input.pointer.PointerEventPass pass, long bounds);
+    property public final long size;
+  }
+
+  public interface PointerInputModifier extends androidx.compose.ui.Modifier.Element {
+    method public androidx.compose.ui.input.pointer.PointerInputFilter getPointerInputFilter();
+    property public abstract androidx.compose.ui.input.pointer.PointerInputFilter pointerInputFilter;
+  }
+
+  public interface PointerInputScope extends androidx.compose.ui.unit.Density {
+    method public suspend <R> Object? awaitPointerEventScope(kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R> p);
+    method public long getSize-YbymL2g();
+    method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+    property public abstract long size;
+    property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+  }
+
+  public final class PointerInputTestUtilKt {
+  }
+
+  public final class PointerInteropFilter_androidKt {
+    method public static androidx.compose.ui.Modifier pointerInteropFilter(androidx.compose.ui.Modifier, optional androidx.compose.ui.input.pointer.RequestDisallowInterceptTouchEvent? requestDisallowInterceptTouchEvent, kotlin.jvm.functions.Function1<? super android.view.MotionEvent,java.lang.Boolean> onTouchEvent);
+  }
+
+  public final class PointerInteropUtils_androidKt {
+  }
+
+  public enum PointerType {
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Eraser;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Mouse;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Stylus;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Touch;
+    enum_constant public static final androidx.compose.ui.input.pointer.PointerType Unknown;
+  }
+
+  public final class RequestDisallowInterceptTouchEvent implements kotlin.jvm.functions.Function1<java.lang.Boolean,kotlin.Unit> {
+    ctor public RequestDisallowInterceptTouchEvent();
+    method public void invoke(boolean disallowIntercept);
+  }
+
+  public final class SuspendingPointerInputFilterKt {
+    method @Deprecated public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+    method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+  }
+
+}
+
+package androidx.compose.ui.input.pointer.util {
+
+  public final class VelocityTracker {
+    ctor public VelocityTracker();
+    method public void addPosition-OX7LsLU(long timeMillis, long position);
+    method public long calculateVelocity-9UxMQ8M();
+    method public void resetTracking();
+  }
+
+  public final class VelocityTrackerKt {
+  }
+
+}
+
+package androidx.compose.ui.layout {
+
+  @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
+    field public static final androidx.compose.ui.layout.AlignmentLine.Companion Companion;
+    field public static final int Unspecified = -2147483648; // 0x80000000
+  }
+
+  public static final class AlignmentLine.Companion {
+  }
+
+  public final class AlignmentLineKt {
+    method public static androidx.compose.ui.layout.HorizontalAlignmentLine getFirstBaseline();
+    method public static androidx.compose.ui.layout.HorizontalAlignmentLine getLastBaseline();
+  }
+
+  @androidx.compose.runtime.Stable public interface ContentScale {
+    method public long computeScaleFactor-AhF4CD4(long srcSize, long dstSize);
+    field public static final androidx.compose.ui.layout.ContentScale.Companion Companion;
+  }
+
+  public static final class ContentScale.Companion {
+    method public androidx.compose.ui.layout.ContentScale getCrop();
+    method public androidx.compose.ui.layout.ContentScale getFillBounds();
+    method public androidx.compose.ui.layout.ContentScale getFillHeight();
+    method public androidx.compose.ui.layout.ContentScale getFillWidth();
+    method public androidx.compose.ui.layout.ContentScale getFit();
+    method public androidx.compose.ui.layout.ContentScale getInside();
+    method public androidx.compose.ui.layout.FixedScale getNone();
+    property public final androidx.compose.ui.layout.ContentScale Crop;
+    property public final androidx.compose.ui.layout.ContentScale FillBounds;
+    property public final androidx.compose.ui.layout.ContentScale FillHeight;
+    property public final androidx.compose.ui.layout.ContentScale FillWidth;
+    property public final androidx.compose.ui.layout.ContentScale Fit;
+    property public final androidx.compose.ui.layout.ContentScale Inside;
+    property public final androidx.compose.ui.layout.FixedScale None;
+  }
+
+  public final class ContentScaleKt {
+  }
+
+  @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
+    ctor public FixedScale(float value);
+    method public float component1();
+    method public long computeScaleFactor-AhF4CD4(long srcSize, long dstSize);
+    method @androidx.compose.runtime.Immutable public androidx.compose.ui.layout.FixedScale copy(float value);
+    method public float getValue();
+    property public final float value;
+  }
+
+  public interface GraphicLayerInfo {
+    method public long getLayerId();
+    property public abstract long layerId;
+  }
+
+  public final class HorizontalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+    ctor public HorizontalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+  }
+
+  public interface IntrinsicMeasurable {
+    method public Object? getParentData();
+    method public int maxIntrinsicHeight(int width);
+    method public int maxIntrinsicWidth(int height);
+    method public int minIntrinsicHeight(int width);
+    method public int minIntrinsicWidth(int height);
+    property public abstract Object? parentData;
+  }
+
+  public final class IntrinsicMeasurableKt {
+  }
+
+  public interface IntrinsicMeasureScope extends androidx.compose.ui.unit.Density {
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+  }
+
+  public interface LayoutCoordinates {
+    method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public androidx.compose.ui.layout.LayoutCoordinates? getParentCoordinates();
+    method public androidx.compose.ui.layout.LayoutCoordinates? getParentLayoutCoordinates();
+    method public java.util.Set<androidx.compose.ui.layout.AlignmentLine> getProvidedAlignmentLines();
+    method public long getSize-YbymL2g();
+    method public boolean isAttached();
+    method public androidx.compose.ui.geometry.Rect localBoundingBoxOf(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, optional boolean clipBounds);
+    method public long localPositionOf-YJiYy8w(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, long relativeToSource);
+    method public long localToRoot-k-4lQ0M(long relativeToLocal);
+    method public long localToWindow-k-4lQ0M(long relativeToLocal);
+    method public long windowToLocal-k-4lQ0M(long relativeToWindow);
+    property public abstract boolean isAttached;
+    property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentCoordinates;
+    property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentLayoutCoordinates;
+    property public abstract java.util.Set<androidx.compose.ui.layout.AlignmentLine> providedAlignmentLines;
+    property public abstract long size;
+  }
+
+  public final class LayoutCoordinatesKt {
+    method public static androidx.compose.ui.geometry.Rect boundsInParent(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static androidx.compose.ui.geometry.Rect boundsInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static androidx.compose.ui.geometry.Rect boundsInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static long positionInParent(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static long positionInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+    method public static long positionInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+  }
+
+  public final class LayoutIdKt {
+    method public static Object? getLayoutId(androidx.compose.ui.layout.Measurable);
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier layoutId(androidx.compose.ui.Modifier, Object layoutId);
+  }
+
+  public interface LayoutIdParentData {
+    method public Object getLayoutId();
+    property public abstract Object layoutId;
+  }
+
+  public interface LayoutInfo {
+    method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+    method public int getHeight();
+    method public java.util.List<androidx.compose.ui.layout.ModifierInfo> getModifierInfo();
+    method public androidx.compose.ui.layout.LayoutInfo? getParentInfo();
+    method public int getWidth();
+    method public boolean isAttached();
+    method public boolean isPlaced();
+    property public abstract androidx.compose.ui.layout.LayoutCoordinates coordinates;
+    property public abstract int height;
+    property public abstract boolean isAttached;
+    property public abstract boolean isPlaced;
+    property public abstract androidx.compose.ui.layout.LayoutInfo? parentInfo;
+    property public abstract int width;
+  }
+
+  public final class LayoutKt {
+    method @androidx.compose.runtime.Composable public static inline void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> content, optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+    method @Deprecated @androidx.compose.runtime.Composable public static void MultiMeasureLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+    method @kotlin.PublishedApi internal static kotlin.jvm.functions.Function1<androidx.compose.runtime.SkippableUpdater<androidx.compose.ui.node.ComposeUiNode>,kotlin.Unit> materializerOf(androidx.compose.ui.Modifier modifier);
+  }
+
+  public interface LayoutModifier extends androidx.compose.ui.Modifier.Element {
+    method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+    method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+    method public androidx.compose.ui.layout.MeasureResult measure-za8Wrwc(androidx.compose.ui.layout.MeasureScope, androidx.compose.ui.layout.Measurable measurable, long constraints);
+    method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+    method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+  }
+
+  public final class LayoutModifierKt {
+    method public static androidx.compose.ui.Modifier layout(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function3<? super androidx.compose.ui.layout.MeasureScope,? super androidx.compose.ui.layout.Measurable,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measure);
+  }
+
+  public interface Measurable extends androidx.compose.ui.layout.IntrinsicMeasurable {
+    method public androidx.compose.ui.layout.Placeable measure-BRTryo0(long constraints);
+  }
+
+  @androidx.compose.runtime.Stable public fun interface MeasurePolicy {
+    method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+    method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+    method public androidx.compose.ui.layout.MeasureResult measure-8A2P9vY(androidx.compose.ui.layout.MeasureScope, java.util.List<? extends androidx.compose.ui.layout.Measurable> measurables, long constraints);
+    method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+    method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+  }
+
+  public interface MeasureResult {
+    method public java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> getAlignmentLines();
+    method public int getHeight();
+    method public int getWidth();
+    method public void placeChildren();
+    property public abstract java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines;
+    property public abstract int height;
+    property public abstract int width;
+  }
+
+  public interface MeasureScope extends androidx.compose.ui.layout.IntrinsicMeasureScope {
+    method public default androidx.compose.ui.layout.MeasureResult layout(int width, int height, optional java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+  }
+
+  public final class MeasureScopeKt {
+  }
+
+  public interface Measured {
+    method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public int getMeasuredHeight();
+    method public int getMeasuredWidth();
+    property public abstract int measuredHeight;
+    property public abstract int measuredWidth;
+  }
+
+  public final class ModifierInfo {
+    ctor public ModifierInfo(androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.LayoutCoordinates coordinates, optional Object? extra);
+    method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+    method public Object? getExtra();
+    method public androidx.compose.ui.Modifier getModifier();
+    property public final androidx.compose.ui.layout.LayoutCoordinates coordinates;
+    property public final Object? extra;
+    property public final androidx.compose.ui.Modifier modifier;
+  }
+
+  public interface OnGloballyPositionedModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
+  }
+
+  public final class OnGloballyPositionedModifierKt {
+    method public static inline androidx.compose.ui.Modifier onGloballyPositioned(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,kotlin.Unit> onGloballyPositioned);
+  }
+
+  public interface OnRemeasuredModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onRemeasured-ozmzZPI(long size);
+  }
+
+  public final class OnRemeasuredModifierKt {
+    method public static inline androidx.compose.ui.Modifier onSizeChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit> onSizeChanged);
+  }
+
+  public interface ParentDataModifier extends androidx.compose.ui.Modifier.Element {
+    method public Object? modifyParentData(androidx.compose.ui.unit.Density, Object? parentData);
+  }
+
+  public abstract class Placeable implements androidx.compose.ui.layout.Measured {
+    ctor public Placeable();
+    method protected final long getApparentToRealOffset-nOcc-ac();
+    method public final int getHeight();
+    method public int getMeasuredHeight();
+    method protected final long getMeasuredSize-YbymL2g();
+    method public int getMeasuredWidth();
+    method protected final long getMeasurementConstraints-msEJaDk();
+    method public final int getWidth();
+    method protected abstract void placeAt-rMeLuDI(long position, float zIndex, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit>? layerBlock);
+    method protected final void setMeasuredSize-ozmzZPI(long value);
+    method protected final void setMeasurementConstraints-BRTryo0(long p);
+    property protected final long apparentToRealOffset;
+    property public final int height;
+    property public int measuredHeight;
+    property protected final long measuredSize;
+    property public int measuredWidth;
+    property protected final long measurementConstraints;
+    property public final int width;
+  }
+
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method protected abstract androidx.compose.ui.unit.LayoutDirection getParentLayoutDirection();
+    method protected abstract int getParentWidth();
+    method public final void place(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+    method public final void place-z2mxYZE(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+    method public final void placeRelative(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+    method public final void placeRelative-z2mxYZE(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+    method public final void placeRelativeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    method public final void placeRelativeWithLayer-muyPCdA(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    method public final void placeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    method public final void placeWithLayer-muyPCdA(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+    property protected abstract androidx.compose.ui.unit.LayoutDirection parentLayoutDirection;
+    property protected abstract int parentWidth;
+  }
+
+  public final class PlaceableKt {
+  }
+
+  public interface Remeasurement {
+    method public void forceRemeasure();
+  }
+
+  public interface RemeasurementModifier extends androidx.compose.ui.Modifier.Element {
+    method public void onRemeasurementAvailable(androidx.compose.ui.layout.Remeasurement remeasurement);
+  }
+
+  @androidx.compose.runtime.Immutable public final inline class ScaleFactor {
+    ctor public ScaleFactor();
+    method @androidx.compose.runtime.Stable public static inline operator float component1-impl(long $this);
+    method @androidx.compose.runtime.Stable public static inline operator float component2-impl(long $this);
+    method public static long copy-_hLwfpc(long $this, optional float scaleX, optional float scaleY);
+    method @androidx.compose.runtime.Stable public static operator long div-_hLwfpc(long $this, float operand);
+    method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static float getScaleX-impl(long $this);
+    method public static float getScaleY-impl(long $this);
+    method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+    method @androidx.compose.runtime.Stable public static operator long times-_hLwfpc(long $this, float operand);
+    method public static String toString-impl(long $this);
+    field public static final androidx.compose.ui.layout.ScaleFactor.Companion Companion;
+  }
+
+  public static final class ScaleFactor.Companion {
+    method public long getUnspecified-_hLwfpc();
+    property public final long Unspecified;
+  }
+
+  public final class ScaleFactorKt {
+    method @androidx.compose.runtime.Stable public static long ScaleFactor(float scaleX, float scaleY);
+    method @androidx.compose.runtime.Stable public static operator long div-ngKnWWw(long, long scaleFactor);
+    method public static inline boolean isSpecified-FK8aYYs(long);
+    method public static inline boolean isUnspecified-FK8aYYs(long);
+    method @androidx.compose.runtime.Stable public static long lerp-bKVCie4(long start, long stop, float fraction);
+    method public static inline long takeOrElse-L-byAFk(long, kotlin.jvm.functions.Function0<androidx.compose.ui.layout.ScaleFactor> block);
+    method @androidx.compose.runtime.Stable public static operator long times-Sp6zcS4(long, long size);
+    method @androidx.compose.runtime.Stable public static operator long times-ngKnWWw(long, long scaleFactor);
+  }
+
+  public final class SubcomposeLayoutKt {
+    method @androidx.compose.runtime.Composable public static void SubcomposeLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.layout.SubcomposeMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
+  }
+
+  public interface SubcomposeMeasureScope extends androidx.compose.ui.layout.MeasureScope {
+    method public java.util.List<androidx.compose.ui.layout.Measurable> subcompose(Object? slotId, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class TestModifierUpdaterKt {
+  }
+
+  public final class VerticalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+    ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+  }
+
+}
+
+package androidx.compose.ui.node {
+
+  @kotlin.PublishedApi internal interface ComposeUiNode {
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+    method public androidx.compose.ui.layout.MeasurePolicy getMeasurePolicy();
+    method public androidx.compose.ui.Modifier getModifier();
+    method public void setDensity(androidx.compose.ui.unit.Density p);
+    method public void setLayoutDirection(androidx.compose.ui.unit.LayoutDirection p);
+    method public void setMeasurePolicy(androidx.compose.ui.layout.MeasurePolicy p);
+    method public void setModifier(androidx.compose.ui.Modifier p);
+    property public abstract androidx.compose.ui.unit.Density density;
+    property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+    property public abstract androidx.compose.ui.layout.MeasurePolicy measurePolicy;
+    property public abstract androidx.compose.ui.Modifier modifier;
+    field public static final androidx.compose.ui.node.ComposeUiNode.Companion Companion;
+  }
+
+  public static final class ComposeUiNode.Companion {
+    method public kotlin.jvm.functions.Function0<androidx.compose.ui.node.ComposeUiNode> getConstructor();
+    method public kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.unit.Density,kotlin.Unit> getSetDensity();
+    method public kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.unit.LayoutDirection,kotlin.Unit> getSetLayoutDirection();
+    method public kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.layout.MeasurePolicy,kotlin.Unit> getSetMeasurePolicy();
+    method public kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.Modifier,kotlin.Unit> getSetModifier();
+    property public final kotlin.jvm.functions.Function0<androidx.compose.ui.node.ComposeUiNode> Constructor;
+    property public final kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.unit.Density,kotlin.Unit> SetDensity;
+    property public final kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.unit.LayoutDirection,kotlin.Unit> SetLayoutDirection;
+    property public final kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.layout.MeasurePolicy,kotlin.Unit> SetMeasurePolicy;
+    property public final kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.Modifier,kotlin.Unit> SetModifier;
+  }
+
+  public final class LayoutNodeKt {
+  }
+
+  public final class Ref<T> {
+    ctor public Ref();
+    method public T? getValue();
+    method public void setValue(T? p);
+    property public final T? value;
+  }
+
+  public interface RootForTest {
+    method public androidx.compose.ui.unit.Density getDensity();
+    method public androidx.compose.ui.semantics.SemanticsOwner getSemanticsOwner();
+    method public androidx.compose.ui.text.input.TextInputService getTextInputService();
+    method public boolean sendKeyEvent-ZmokQxo(android.view.KeyEvent keyEvent);
+    property public abstract androidx.compose.ui.unit.Density density;
+    property public abstract androidx.compose.ui.semantics.SemanticsOwner semanticsOwner;
+    property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
+  }
+
+  public final class ViewInterop_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.platform {
+
+  public abstract class AbstractComposeView extends android.view.ViewGroup {
+    ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+    ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+    ctor public AbstractComposeView(android.content.Context context);
+    method @androidx.compose.runtime.Composable public abstract void Content();
+    method public final void createComposition();
+    method public final void disposeComposition();
+    method public final boolean getHasComposition();
+    method protected boolean getShouldCreateCompositionOnAttachedToWindow();
+    method public final boolean getShowLayoutBounds();
+    method protected final void onLayout(boolean changed, int left, int top, int right, int bottom);
+    method protected final void onMeasure(int widthMeasureSpec, int heightMeasureSpec);
+    method public final void setParentCompositionContext(androidx.compose.runtime.CompositionContext? parent);
+    method public final void setShowLayoutBounds(boolean value);
+    method public final void setViewCompositionStrategy(androidx.compose.ui.platform.ViewCompositionStrategy strategy);
+    property public final boolean hasComposition;
+    property protected boolean shouldCreateCompositionOnAttachedToWindow;
+    property public final boolean showLayoutBounds;
+  }
+
+  public interface AccessibilityManager {
+    method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
+  }
+
+  public final class AndroidClipboardManager_androidKt {
+  }
+
+  public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
+  }
+
+  public final class AndroidComposeView_androidKt {
+  }
+
+  public final class AndroidCompositionLocals_androidKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.res.Configuration> getLocalConfiguration();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.Context> getLocalContext();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.lifecycle.LifecycleOwner> getLocalLifecycleOwner();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.savedstate.SavedStateRegistryOwner> getLocalSavedStateRegistryOwner();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<android.view.View> getLocalView();
+  }
+
+  public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
+    method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
+    method public android.view.Choreographer getChoreographer();
+    method public androidx.compose.runtime.MonotonicFrameClock getFrameClock();
+    property public final android.view.Choreographer choreographer;
+    property public final androidx.compose.runtime.MonotonicFrameClock frameClock;
+    field public static final androidx.compose.ui.platform.AndroidUiDispatcher.Companion Companion;
+  }
+
+  public static final class AndroidUiDispatcher.Companion {
+    method public kotlin.coroutines.CoroutineContext getCurrentThread();
+    method public kotlin.coroutines.CoroutineContext getMain();
+    property public final kotlin.coroutines.CoroutineContext CurrentThread;
+    property public final kotlin.coroutines.CoroutineContext Main;
+  }
+
+  public final class AndroidUiDispatcher_androidKt {
+  }
+
+  public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+    ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
+    method public android.view.Choreographer getChoreographer();
+    method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+    property public final android.view.Choreographer choreographer;
+  }
+
+  public final class AndroidUriHandler implements androidx.compose.ui.platform.UriHandler {
+    ctor public AndroidUriHandler(android.content.Context context);
+    method public void openUri(String uri);
+  }
+
+  public final class AndroidViewConfiguration implements androidx.compose.ui.platform.ViewConfiguration {
+    ctor public AndroidViewConfiguration(android.view.ViewConfiguration viewConfiguration);
+    method public long getDoubleTapMinTimeMillis();
+    method public long getDoubleTapTimeoutMillis();
+    method public long getLongPressTimeoutMillis();
+    method public float getTouchSlop();
+    property public long doubleTapMinTimeMillis;
+    property public long doubleTapTimeoutMillis;
+    property public long longPressTimeoutMillis;
+    property public float touchSlop;
+  }
+
+  public interface ClipboardManager {
+    method public androidx.compose.ui.text.AnnotatedString? getText();
+    method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
+  }
+
+  public final class ComposeView extends androidx.compose.ui.platform.AbstractComposeView {
+    ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+    ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+    ctor public ComposeView(android.content.Context context);
+    method @androidx.compose.runtime.Composable public void Content();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    property protected boolean shouldCreateCompositionOnAttachedToWindow;
+  }
+
+  public final class ComposeView_androidKt {
+  }
+
+  public final class CompositionLocalsKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager> getLocalAccessibilityManager();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> getLocalClipboardManager();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Density> getLocalDensity();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.focus.FocusManager> getLocalFocusManager();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.hapticfeedback.HapticFeedback> getLocalHapticFeedback();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.LayoutDirection> getLocalLayoutDirection();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.input.TextInputService> getLocalTextInputService();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.TextToolbar> getLocalTextToolbar();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.UriHandler> getLocalUriHandler();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> getLocalViewConfiguration();
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> getLocalWindowInfo();
+  }
+
+  public final class DebugUtilsKt {
+  }
+
+  public final class DisposableSaveableStateRegistry_androidKt {
+  }
+
+  public interface InspectableValue {
+    method public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> getInspectableElements();
+    method public default String? getNameFallback();
+    method public default Object? getValueOverride();
+    property public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+    property public default String? nameFallback;
+    property public default Object? valueOverride;
+  }
+
+  public final class InspectableValueKt {
+    method public static inline kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> debugInspectorInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> definitions);
+    method public static kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> getNoInspectorInfo();
+    method public static boolean isDebugInspectorInfoEnabled();
+    method public static void setDebugInspectorInfoEnabled(boolean p);
+  }
+
+  public final class InspectionModeKt {
+    method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> getLocalInspectionMode();
+  }
+
+  public final class InspectorInfo {
+    ctor public InspectorInfo();
+    method public String? getName();
+    method public androidx.compose.ui.platform.ValueElementSequence getProperties();
+    method public Object? getValue();
+    method public void setName(String? p);
+    method public void setValue(Object? p);
+    property public final String? name;
+    property public final androidx.compose.ui.platform.ValueElementSequence properties;
+    property public final Object? value;
+  }
+
+  public abstract class InspectorValueInfo implements androidx.compose.ui.platform.InspectableValue {
+    ctor public InspectorValueInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> info);
+    property public kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+    property public String? nameFallback;
+    property public Object? valueOverride;
+  }
+
+  public final class JvmActuals_jvmKt {
+  }
+
+  public final class TestTagKt {
+    method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier testTag(androidx.compose.ui.Modifier, String tag);
+  }
+
+  public interface TextToolbar {
+    method public androidx.compose.ui.platform.TextToolbarStatus getStatus();
+    method public void hide();
+    method public void showMenu(androidx.compose.ui.geometry.Rect rect, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCopyRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onPasteRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCutRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onSelectAllRequested);
+    property public abstract androidx.compose.ui.platform.TextToolbarStatus status;
+  }
+
+  public final class TextToolbarKt {
+  }
+
+  public enum TextToolbarStatus {
+    enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Hidden;
+    enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Shown;
+  }
+
+  public interface UriHandler {
+    method public void openUri(String uri);
+  }
+
+  public final class ValueElement {
+    ctor public ValueElement(String name, Object? value);
+    method public String component1();
+    method public Object? component2();
+    method public androidx.compose.ui.platform.ValueElement copy(String name, Object? value);
+    method public String getName();
+    method public Object? getValue();
+    property public final String name;
+    property public final Object? value;
+  }
+
+  public final class ValueElementSequence implements kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> {
+    ctor public ValueElementSequence();
+    method public java.util.Iterator<androidx.compose.ui.platform.ValueElement> iterator();
+    method public operator void set(String name, Object? value);
+  }
+
+  public interface ViewCompositionStrategy {
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+    field public static final androidx.compose.ui.platform.ViewCompositionStrategy.Companion Companion;
+  }
+
+  public static final class ViewCompositionStrategy.Companion {
+  }
+
+  public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindow implements androidx.compose.ui.platform.ViewCompositionStrategy {
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+    field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
+  }
+
+  public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+    ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.Lifecycle lifecycle);
+    ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.LifecycleOwner lifecycleOwner);
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+  }
+
+  public static final class ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+    field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
+  }
+
+  public final class ViewCompositionStrategy_androidKt {
+  }
+
+  public interface ViewConfiguration {
+    method public long getDoubleTapMinTimeMillis();
+    method public long getDoubleTapTimeoutMillis();
+    method public long getLongPressTimeoutMillis();
+    method public float getTouchSlop();
+    property public abstract long doubleTapMinTimeMillis;
+    property public abstract long doubleTapTimeoutMillis;
+    property public abstract long longPressTimeoutMillis;
+    property public abstract float touchSlop;
+  }
+
+  @VisibleForTesting public interface ViewRootForTest extends androidx.compose.ui.node.RootForTest {
+    method public boolean getHasPendingMeasureOrLayout();
+    method public android.view.View getView();
+    method public void invalidateDescendants();
+    method public boolean isLifecycleInResumedState();
+    property public abstract boolean hasPendingMeasureOrLayout;
+    property public abstract boolean isLifecycleInResumedState;
+    property public abstract android.view.View view;
+    field public static final androidx.compose.ui.platform.ViewRootForTest.Companion Companion;
+  }
+
+  public static final class ViewRootForTest.Companion {
+    method public kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? getOnViewCreatedCallback();
+    method public void setOnViewCreatedCallback(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? p);
+    property public final kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? onViewCreatedCallback;
+  }
+
+  @androidx.compose.runtime.Stable public interface WindowInfo {
+    method public boolean isWindowFocused();
+    property public abstract boolean isWindowFocused;
+  }
+
+  public final class WindowInfoKt {
+  }
+
+  public final class WindowRecomposer_androidKt {
+    method public static androidx.compose.runtime.CompositionContext? findViewTreeCompositionContext(android.view.View);
+    method public static androidx.compose.runtime.CompositionContext? getCompositionContext(android.view.View);
+    method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext? value);
+  }
+
+  public final class Wrapper_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.platform.actionmodecallback {
+
+  public final class TextActionModeCallback_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.res {
+
+  public final class AnimatedVectorResources_androidKt {
+  }
+
+  public final class AnimatorResources_androidKt {
+  }
+
+  public final class ColorResources_androidKt {
+    method @androidx.compose.runtime.Composable public static long colorResource(@ColorRes int id);
+  }
+
+  public final class FontResources_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.text.font.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+  }
+
+  public final class ImageResources_androidKt {
+    method public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, android.content.res.Resources res, @DrawableRes int id);
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, @DrawableRes int id);
+  }
+
+  public final class PainterResources_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter painterResource(@DrawableRes int id);
+  }
+
+  public final class PrimitiveResources_androidKt {
+    method @androidx.compose.runtime.Composable public static boolean booleanResource(@BoolRes int id);
+    method @androidx.compose.runtime.Composable public static float dimensionResource(@DimenRes int id);
+    method @androidx.compose.runtime.Composable public static int[] integerArrayResource(@ArrayRes int id);
+    method @androidx.compose.runtime.Composable public static int integerResource(@IntegerRes int id);
+  }
+
+  public final class StringResources_androidKt {
+    method @androidx.compose.runtime.Composable public static String![] stringArrayResource(@ArrayRes int id);
+    method @androidx.compose.runtime.Composable public static String stringResource(@StringRes int id);
+    method @androidx.compose.runtime.Composable public static String stringResource(@StringRes int id, java.lang.Object... formatArgs);
+  }
+
+  public final class VectorResources_androidKt {
+    method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, @DrawableRes int id);
+    method @kotlin.jvm.Throws(exceptionClasses=XmlPullParserException::class) public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, optional android.content.res.Resources.Theme? theme, android.content.res.Resources res, int resId) throws org.xmlpull.v1.XmlPullParserException;
+  }
+
+}
+
+package androidx.compose.ui.semantics {
+
+  public final class AccessibilityAction<T extends kotlin.Function<? extends java.lang.Boolean>> {
+    ctor public AccessibilityAction(String? label, T? action);
+    method public T? getAction();
+    method public String? getLabel();
+    property public final T? action;
+    property public final String? label;
+  }
+
+  public final class CustomAccessibilityAction {
+    ctor public CustomAccessibilityAction(String label, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
+    method public kotlin.jvm.functions.Function0<java.lang.Boolean> getAction();
+    method public String getLabel();
+    property public final kotlin.jvm.functions.Function0<java.lang.Boolean> action;
+    property public final String label;
+  }
+
+  public enum LiveRegionMode {
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Assertive;
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Polite;
+  }
+
+  public final class ProgressBarRangeInfo {
+    ctor public ProgressBarRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional int steps);
+    method public float getCurrent();
+    method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> getRange();
+    method public int getSteps();
+    property public final float current;
+    property public final kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range;
+    property public final int steps;
+    field public static final androidx.compose.ui.semantics.ProgressBarRangeInfo.Companion Companion;
+  }
+
+  public static final class ProgressBarRangeInfo.Companion {
+    method public androidx.compose.ui.semantics.ProgressBarRangeInfo getIndeterminate();
+    property public final androidx.compose.ui.semantics.ProgressBarRangeInfo Indeterminate;
+  }
+
+  public enum Role {
+    enum_constant public static final androidx.compose.ui.semantics.Role Button;
+    enum_constant public static final androidx.compose.ui.semantics.Role Checkbox;
+    enum_constant public static final androidx.compose.ui.semantics.Role Image;
+    enum_constant public static final androidx.compose.ui.semantics.Role RadioButton;
+    enum_constant public static final androidx.compose.ui.semantics.Role Switch;
+    enum_constant public static final androidx.compose.ui.semantics.Role Tab;
+  }
+
+  public final class ScrollAxisRange {
+    ctor public ScrollAxisRange(kotlin.jvm.functions.Function0<java.lang.Float> value, kotlin.jvm.functions.Function0<java.lang.Float> maxValue, optional boolean reverseScrolling);
+    method public kotlin.jvm.functions.Function0<java.lang.Float> getMaxValue();
+    method public boolean getReverseScrolling();
+    method public kotlin.jvm.functions.Function0<java.lang.Float> getValue();
+    property public final kotlin.jvm.functions.Function0<java.lang.Float> maxValue;
+    property public final boolean reverseScrolling;
+    property public final kotlin.jvm.functions.Function0<java.lang.Float> value;
+  }
+
+  public final class SemanticsActions {
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCollapse();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCopyText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> getCustomActions();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCutText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getDismiss();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getExpand();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnLongClick();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getPasteText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Collapse;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CopyText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> CustomActions;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CutText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Dismiss;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Expand;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnLongClick;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> PasteText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+    field public static final androidx.compose.ui.semantics.SemanticsActions INSTANCE;
+  }
+
+  public final class SemanticsConfiguration implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.compose.ui.semantics.SemanticsPropertyKey<?>,?>> kotlin.jvm.internal.markers.KMappedMarker androidx.compose.ui.semantics.SemanticsPropertyReceiver {
+    ctor public SemanticsConfiguration();
+    method public operator <T> boolean contains(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+    method public androidx.compose.ui.semantics.SemanticsConfiguration copy();
+    method public operator <T> T! get(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> T! getOrElse(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public <T> T? getOrElseNullable(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public boolean isClearingSemantics();
+    method public boolean isMergingSemanticsOfDescendants();
+    method public java.util.Iterator<java.util.Map.Entry<androidx.compose.ui.semantics.SemanticsPropertyKey<?>,java.lang.Object>> iterator();
+    method public <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+    method public void setClearingSemantics(boolean p);
+    method public void setMergingSemanticsOfDescendants(boolean p);
+    property public final boolean isClearingSemantics;
+    property public final boolean isMergingSemanticsOfDescendants;
+  }
+
+  public final class SemanticsConfigurationKt {
+    method public static <T> T? getOrNull(androidx.compose.ui.semantics.SemanticsConfiguration, androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+  }
+
+  public interface SemanticsModifier extends androidx.compose.ui.Modifier.Element {
+    method public int getId();
+    method public androidx.compose.ui.semantics.SemanticsConfiguration getSemanticsConfiguration();
+    property public abstract int id;
+    property public abstract androidx.compose.ui.semantics.SemanticsConfiguration semanticsConfiguration;
+  }
+
+  public final class SemanticsModifierKt {
+    method public static androidx.compose.ui.Modifier clearAndSetSemantics(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+    method public static androidx.compose.ui.Modifier semantics(androidx.compose.ui.Modifier, optional boolean mergeDescendants, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+  }
+
+  public final class SemanticsNode {
+    method public int getAlignmentLinePosition(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+    method public androidx.compose.ui.geometry.Rect getBoundsInRoot();
+    method public androidx.compose.ui.geometry.Rect getBoundsInWindow();
+    method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getChildren();
+    method public androidx.compose.ui.semantics.SemanticsConfiguration getConfig();
+    method public int getId();
+    method public androidx.compose.ui.layout.LayoutInfo getLayoutInfo();
+    method public boolean getMergingEnabled();
+    method public androidx.compose.ui.semantics.SemanticsNode? getParent();
+    method public long getPositionInRoot-F1C5BW0();
+    method public long getPositionInWindow-F1C5BW0();
+    method public androidx.compose.ui.node.RootForTest? getRoot();
+    method public long getSize-YbymL2g();
+    method public boolean isRoot();
+    property public final androidx.compose.ui.geometry.Rect boundsInRoot;
+    property public final androidx.compose.ui.geometry.Rect boundsInWindow;
+    property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> children;
+    property public final androidx.compose.ui.semantics.SemanticsConfiguration config;
+    property public final int id;
+    property public final boolean isRoot;
+    property public final androidx.compose.ui.layout.LayoutInfo layoutInfo;
+    property public final boolean mergingEnabled;
+    property public final androidx.compose.ui.semantics.SemanticsNode? parent;
+    property public final long positionInRoot;
+    property public final long positionInWindow;
+    property public final androidx.compose.ui.node.RootForTest? root;
+    property public final long size;
+  }
+
+  public final class SemanticsNodeKt {
+  }
+
+  public final class SemanticsOwner {
+    method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
+    method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
+    property public final androidx.compose.ui.semantics.SemanticsNode rootSemanticsNode;
+    property public final androidx.compose.ui.semantics.SemanticsNode unmergedRootSemanticsNode;
+  }
+
+  public final class SemanticsOwnerKt {
+    method public static java.util.List<androidx.compose.ui.semantics.SemanticsNode> getAllSemanticsNodes(androidx.compose.ui.semantics.SemanticsOwner, boolean mergingEnabled);
+  }
+
+  public final class SemanticsProperties {
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getContentDescription();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getDisabled();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getEditableText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getFocused();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHeading();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getHorizontalScrollAxisRange();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getInvisibleToUser();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsDialog();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> getLiveRegion();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getPaneTitle();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getPassword();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> getProgressBarRangeInfo();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> getRole();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSelectableGroup();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSelected();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getStateDescription();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> getToggleableState();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getVerticalScrollAxisRange();
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> ContentDescription;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Disabled;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> EditableText;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Focused;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Heading;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> HorizontalScrollAxisRange;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> InvisibleToUser;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsDialog;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> LiveRegion;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> PaneTitle;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Password;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> ProgressBarRangeInfo;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> Role;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SelectableGroup;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> StateDescription;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> ToggleableState;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> VerticalScrollAxisRange;
+    field public static final androidx.compose.ui.semantics.SemanticsProperties INSTANCE;
+  }
+
+  public final class SemanticsPropertiesKt {
+    method public static void collapse(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void copyText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void cutText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void dialog(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void disabled(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void dismiss(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void expand(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static String getContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.text.AnnotatedString getEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.ScrollAxisRange getHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.LiveRegionMode getLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.ProgressBarRangeInfo getProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.Role getRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.text.AnnotatedString getText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void getTextLayoutResult(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>? action);
+    method public static long getTextSelectionRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.state.ToggleableState getToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.ScrollAxisRange getVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void heading(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void onClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void onLongClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void password(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void pasteText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+    method public static void popup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void scrollBy(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,java.lang.Boolean>? action);
+    method public static void selectableGroup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static void setContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver, java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction> p);
+    method public static void setEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+    method public static void setFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange p);
+    method public static void setImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
+    method public static void setLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.LiveRegionMode p);
+    method public static void setPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setProgress(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean>? action);
+    method public static void setProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ProgressBarRangeInfo p);
+    method public static void setRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.Role p);
+    method public static void setSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setSelection(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean>? action);
+    method public static void setStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+    method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>? action);
+    method public static void setTextSelectionRange-Hy0MoUY(androidx.compose.ui.semantics.SemanticsPropertyReceiver, long p);
+    method public static void setToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.state.ToggleableState p);
+    method public static void setVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange p);
+  }
+
+  public final class SemanticsPropertyKey<T> {
+    ctor public SemanticsPropertyKey(String name, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends T> mergePolicy);
+    method public String getName();
+    method public operator T! getValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property);
+    method public T? merge(T? parentValue, T? childValue);
+    method public operator void setValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property, T? value);
+    property public final String name;
+  }
+
+  public interface SemanticsPropertyReceiver {
+    method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+  }
+
+}
+
+package androidx.compose.ui.state {
+
+  public enum ToggleableState {
+    enum_constant public static final androidx.compose.ui.state.ToggleableState Indeterminate;
+    enum_constant public static final androidx.compose.ui.state.ToggleableState Off;
+    enum_constant public static final androidx.compose.ui.state.ToggleableState On;
+  }
+
+  public final class ToggleableStateKt {
+    method public static androidx.compose.ui.state.ToggleableState ToggleableState(boolean value);
+  }
+
+}
+
+package androidx.compose.ui.text.input {
+
+  public final class InputState_androidKt {
+  }
+
+  public final class RecordingInputConnection_androidKt {
+  }
+
+}
+
+package androidx.compose.ui.viewinterop {
+
+  public final class AndroidViewHolder_androidKt {
+  }
+
+  public final class AndroidView_androidKt {
+    method @androidx.compose.runtime.Composable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+    method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
+  }
+
+}
+
+package androidx.compose.ui.window {
+
+  public final class AndroidDialog_androidKt {
+    method @androidx.compose.runtime.Composable public static void Dialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class AndroidPopup_androidKt {
+    method @androidx.compose.runtime.Composable public static void Popup(androidx.compose.ui.window.PopupPositionProvider popupPositionProvider, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public static void Popup-wO4EaeM(optional androidx.compose.ui.Alignment alignment, optional long offset, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @org.jetbrains.annotations.TestOnly public static boolean isPopupLayout(android.view.View view, optional String? testTag);
+  }
+
+  @androidx.compose.runtime.Immutable public final class DialogProperties {
+    ctor public DialogProperties(optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy);
+    method public boolean getDismissOnBackPress();
+    method public boolean getDismissOnClickOutside();
+    method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+    property public final boolean dismissOnBackPress;
+    property public final boolean dismissOnClickOutside;
+    property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+  }
+
+  public interface DialogWindowProvider {
+    method public android.view.Window getWindow();
+    property public abstract android.view.Window window;
+  }
+
+  @androidx.compose.runtime.Immutable public interface PopupPositionProvider {
+    method public long calculatePosition-aa5Bd6I(androidx.compose.ui.unit.IntRect anchorBounds, long windowSize, androidx.compose.ui.unit.LayoutDirection layoutDirection, long popupContentSize);
+  }
+
+  @androidx.compose.runtime.Immutable public final class PopupProperties {
+    ctor public PopupProperties(optional boolean focusable, optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy);
+    method public boolean getDismissOnBackPress();
+    method public boolean getDismissOnClickOutside();
+    method public boolean getFocusable();
+    method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+    property public final boolean dismissOnBackPress;
+    property public final boolean dismissOnClickOutside;
+    property public final boolean focusable;
+    property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+  }
+
+  public enum SecureFlagPolicy {
+    enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy Inherit;
+    enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOff;
+    enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
+  }
+
+  public final class SecureFlagPolicy_androidKt {
+  }
+
+}
+

compose/ui/ui/api/restricted_current.txt

diff --git a/compose/ui/ui/api/restricted_current.txt b/compose/ui/ui/api/restricted_current.txt
index 8d26e88..a43f540 100644
--- a/compose/ui/ui/api/restricted_current.txt
+++ b/compose/ui/ui/api/restricted_current.txt
@@ -2155,6 +2155,11 @@
     property public final String label;
   }
 
+  public enum LiveRegionMode {
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Assertive;
+    enum_constant public static final androidx.compose.ui.semantics.LiveRegionMode Polite;
+  }
+
   public final class ProgressBarRangeInfo {
     ctor public ProgressBarRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional int steps);
     method public float getCurrent();
@@ -2310,6 +2315,7 @@
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getInvisibleToUser();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsDialog();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
+    method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> getLiveRegion();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getPaneTitle();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getPassword();
     method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> getProgressBarRangeInfo();
@@ -2332,6 +2338,7 @@
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> InvisibleToUser;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsDialog;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
+    property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> LiveRegion;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> PaneTitle;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Password;
     property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> ProgressBarRangeInfo;
@@ -2361,6 +2368,7 @@
     method public static boolean getFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.semantics.ScrollAxisRange getHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.compose.ui.semantics.LiveRegionMode getLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static String getPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.semantics.ProgressBarRangeInfo getProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static androidx.compose.ui.semantics.Role getRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
@@ -2386,6 +2394,7 @@
     method public static void setFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean p);
     method public static void setHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange p);
     method public static void setImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
+    method public static void setLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.LiveRegionMode p);
     method public static void setPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String p);
     method public static void setProgress(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean>? action);
     method public static void setProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ProgressBarRangeInfo p);

compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/AnimatedVectorGraphicsDemo.kt

diff --git a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/AnimatedVectorGraphicsDemo.kt b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/AnimatedVectorGraphicsDemo.kt
index b45f5eb..418eb4c 100644
--- a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/AnimatedVectorGraphicsDemo.kt
+++ b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/AnimatedVectorGraphicsDemo.kt
@@ -117,6 +117,7 @@
         ) { state ->
             if (state) 360f else 0f
         }
+        @Suppress("UnusedTransitionTargetStateParameter")
         val translationX by transition.animateFloat(
             transitionSpec = {
                 if (targetState) {
@@ -135,6 +136,7 @@
                 }
             }
         ) { 0f }
+        @Suppress("UnusedTransitionTargetStateParameter")
         val translationY by transition.animateFloat(
             transitionSpec = {
                 if (targetState) {

compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/SoftwareKeyboardControllerDemo.kt

diff --git a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/SoftwareKeyboardControllerDemo.kt b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/SoftwareKeyboardControllerDemo.kt
index ea2650c..e88deb2 100644
--- a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/SoftwareKeyboardControllerDemo.kt
+++ b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/SoftwareKeyboardControllerDemo.kt
@@ -63,7 +63,7 @@
         Button(
             onClick = {
                 isHidden = true
-                keyboardController?.hideSoftwareKeyboard()
+                keyboardController?.hide()
             },
             enabled = !isHidden,
             modifier = Modifier.padding(vertical = 8.dp)
@@ -74,7 +74,7 @@
             onClick = {
                 isHidden = false
                 focusRequester.requestFocus()
-                keyboardController?.showSoftwareKeyboard()
+                keyboardController?.show()
             },
             enabled = isHidden
         ) {

compose/ui/ui/samples/src/main/java/androidx/compose/ui/samples/SoftwareKeyboardControllerSample.kt

diff --git a/compose/ui/ui/samples/src/main/java/androidx/compose/ui/samples/SoftwareKeyboardControllerSample.kt b/compose/ui/ui/samples/src/main/java/androidx/compose/ui/samples/SoftwareKeyboardControllerSample.kt
index dd27b86..49313dc 100644
--- a/compose/ui/ui/samples/src/main/java/androidx/compose/ui/samples/SoftwareKeyboardControllerSample.kt
+++ b/compose/ui/ui/samples/src/main/java/androidx/compose/ui/samples/SoftwareKeyboardControllerSample.kt
@@ -55,7 +55,7 @@
             setText,
             keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
             keyboardActions = KeyboardActions(
-                onDone = { keyboardController?.hideSoftwareKeyboard() }
+                onDone = { keyboardController?.hide() }
             ),
             modifier = Modifier
                 .focusRequester(focusRequester)
@@ -65,7 +65,7 @@
         Button(
             onClick = {
                 focusRequester.requestFocus()
-                keyboardController?.showSoftwareKeyboard()
+                keyboardController?.show()
             },
             modifier = Modifier.fillMaxWidth()
         ) {

compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidAccessibilityTest.kt

diff --git a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidAccessibilityTest.kt b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidAccessibilityTest.kt
index e9dcb07..adfa884 100644
--- a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidAccessibilityTest.kt
+++ b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidAccessibilityTest.kt
@@ -16,6 +16,7 @@
 
 package androidx.compose.ui
 
+import android.graphics.Rect
 import android.graphics.RectF
 import android.os.Build
 import android.os.Bundle
@@ -137,7 +138,6 @@
             }
 
             activity.setContentView(container)
-
             androidComposeView = container.getChildAt(0) as AndroidComposeView
             delegate = ViewCompat.getAccessibilityDelegate(androidComposeView) as
                 AndroidComposeViewAccessibilityDelegateCompat
@@ -939,7 +939,7 @@
     }
 
     @Test
-    fun testAccessibilityNodeInfoTreePruned() {
+    fun testAccessibilityNodeInfoTreePruned_completelyCovered() {
         val parentTag = "ParentForOverlappedChildren"
         val childOneTag = "OverlappedChildOne"
         val childTwoTag = "OverlappedChildTwo"
@@ -967,7 +967,6 @@
             .fetchSemanticsNode("couldn't find node with tag $childOneTag")
         val overlappedChildTwoNode = rule.onNodeWithTag(childTwoTag)
             .fetchSemanticsNode("couldn't find node with tag $childTwoTag")
-
         assertEquals(1, provider.createAccessibilityNodeInfo(parentNode.id).childCount)
         assertEquals(
             "Child One",
@@ -977,6 +976,44 @@
     }
 
     @Test
+    fun testAccessibilityNodeInfoTreePruned_partiallyCovered() {
+        val parentTag = "parent"
+        val density = Density(2f)
+        container.setContent {
+            CompositionLocalProvider(LocalDensity provides density) {
+                Box(Modifier.testTag(parentTag)) {
+                    BasicText(
+                        "Child One",
+                        Modifier
+                            .zIndex(1f)
+                            .requiredSize(100.dp)
+                    )
+                    BasicText(
+                        "Child Two",
+                        Modifier.requiredSize(200.dp, 100.dp)
+                    )
+                }
+            }
+        }
+
+        val parentNode = rule.onNodeWithTag(parentTag)
+            .fetchSemanticsNode("couldn't find node with tag $parentTag")
+        assertEquals(2, provider.createAccessibilityNodeInfo(parentNode.id).childCount)
+
+        val childTwoNode = rule.onNodeWithText("Child Two")
+            .fetchSemanticsNode("couldn't find node with text Child Two")
+        val childTwoBounds = Rect()
+        provider.createAccessibilityNodeInfo(childTwoNode.id)
+            .getBoundsInScreen(childTwoBounds)
+        val expectedSize: Int
+        with(density) {
+            expectedSize = 100.dp.roundToPx()
+        }
+        assertEquals(expectedSize, childTwoBounds.height())
+        assertEquals(expectedSize, childTwoBounds.width())
+    }
+
+    @Test
     fun testPaneAppear() {
         val paneTag = "Pane"
         var isPaneVisible by mutableStateOf(false)
@@ -1144,29 +1181,29 @@
                 dialogComposeView = LocalView.current as AndroidComposeView
                 delegate = ViewCompat.getAccessibilityDelegate(dialogComposeView!!) as
                     AndroidComposeViewAccessibilityDelegateCompat
+                provider = delegate.getAccessibilityNodeProvider(dialogComposeView).provider
+                    as AccessibilityNodeProvider
 
                 Box(Modifier.size(300.dp)) {
                     BasicText(
                         text = "text",
-                        modifier = Modifier.offset(10.dp, 10.dp).fillMaxSize()
+                        modifier = Modifier.offset(100.dp, 100.dp).fillMaxSize()
                     )
                 }
             }
         }
 
         val textNode = rule.onNodeWithText("text").fetchSemanticsNode()
-        val info = AccessibilityNodeInfoCompat.obtain()
-        delegate.populateAccessibilityNodeInfoProperties(
-            textNode.id,
-            info,
-            textNode
-        )
+        var info: AccessibilityNodeInfo = AccessibilityNodeInfo.obtain()
+        rule.runOnUiThread {
+            info = provider.createAccessibilityNodeInfo(textNode.id)
+        }
 
         val viewPosition = intArrayOf(0, 0)
         dialogComposeView!!.getLocationOnScreen(viewPosition)
         with(rule.density) {
-            val offset = 10.dp.roundToPx()
-            val size = 300.dp.roundToPx()
+            val offset = 100.dp.roundToPx()
+            val size = 200.dp.roundToPx()
             val textPositionOnScreenX = viewPosition[0] + offset
             val textPositionOnScreenY = viewPosition[1] + offset
 

compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidComposeViewAccessibilityDelegateCompatTest.kt

diff --git a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidComposeViewAccessibilityDelegateCompatTest.kt b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidComposeViewAccessibilityDelegateCompatTest.kt
index 2c15da3..59e9c0d 100644
--- a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidComposeViewAccessibilityDelegateCompatTest.kt
+++ b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidComposeViewAccessibilityDelegateCompatTest.kt
@@ -38,14 +38,18 @@
 import androidx.compose.ui.platform.AndroidComposeView
 import androidx.compose.ui.platform.AndroidComposeViewAccessibilityDelegateCompat
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.SemanticsNodeWithAdjustedBounds
+import androidx.compose.ui.platform.getAllUncoveredSemanticsNodesToMap
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.semantics.CustomAccessibilityAction
+import androidx.compose.ui.semantics.LiveRegionMode
 import androidx.compose.ui.semantics.ProgressBarRangeInfo
 import androidx.compose.ui.semantics.ScrollAxisRange
 import androidx.compose.ui.semantics.SemanticsModifierCore
 import androidx.compose.ui.semantics.SemanticsNode
 import androidx.compose.ui.semantics.SemanticsPropertyReceiver
 import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.SemanticsOwner
 import androidx.compose.ui.semantics.SemanticsWrapper
 import androidx.compose.ui.semantics.collapse
 import androidx.compose.ui.semantics.heading
@@ -60,6 +64,7 @@
 import androidx.compose.ui.semantics.focused
 import androidx.compose.ui.semantics.getTextLayoutResult
 import androidx.compose.ui.semantics.horizontalScrollAxisRange
+import androidx.compose.ui.semantics.liveRegion
 import androidx.compose.ui.semantics.onClick
 import androidx.compose.ui.semantics.onLongClick
 import androidx.compose.ui.semantics.pasteText
@@ -75,6 +80,7 @@
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.unit.dp
+import androidx.core.view.ViewCompat
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
@@ -380,6 +386,23 @@
     }
 
     @Test
+    fun testPopulateAccessibilityNodeInfoProperties_liveRegion() {
+        var semanticsNode = createSemanticsNodeWithProperties(1, true) {
+            liveRegion = LiveRegionMode.Polite
+        }
+        accessibilityDelegate.populateAccessibilityNodeInfoProperties(1, info, semanticsNode)
+        assertEquals(ViewCompat.ACCESSIBILITY_LIVE_REGION_POLITE, info.liveRegion)
+        info.recycle()
+
+        info = AccessibilityNodeInfoCompat.obtain()
+        semanticsNode = createSemanticsNodeWithProperties(1, true) {
+            liveRegion = LiveRegionMode.Assertive
+        }
+        accessibilityDelegate.populateAccessibilityNodeInfoProperties(1, info, semanticsNode)
+        assertEquals(ViewCompat.ACCESSIBILITY_LIVE_REGION_ASSERTIVE, info.liveRegion)
+    }
+
+    @Test
     fun testPopulateAccessibilityNodeInfoProperties_SeekBar() {
         val setProgressActionLabel = "setProgress"
         val semanticsNode = createSemanticsNodeWithProperties(1, true) {
@@ -558,11 +581,10 @@
                 oldSemanticsNode,
                 mapOf()
             )
-        val newSemanticsNode = createSemanticsNodeWithProperties(1, true) {
+        val newNodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()
+        newNodes[1] = createSemanticsNodeWithAdjustedBoundsWithProperties(1, true) {
             this.verticalScrollAxisRange = ScrollAxisRange({ 0f }, { 5f }, false)
         }
-        val newNodes = mutableMapOf<Int, SemanticsNode>()
-        newNodes[1] = newSemanticsNode
         accessibilityDelegate.sendSemanticsPropertyChangeEvents(newNodes)
 
         verify(container, never()).requestSendAccessibilityEvent(
@@ -585,11 +607,10 @@
                 oldSemanticsNode,
                 mapOf()
             )
-        val newSemanticsNode = createSemanticsNodeWithProperties(2, false) {
+        val newNodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()
+        newNodes[2] = createSemanticsNodeWithAdjustedBoundsWithProperties(2, false) {
             this.verticalScrollAxisRange = ScrollAxisRange({ 2f }, { 5f }, false)
         }
-        val newNodes = mutableMapOf<Int, SemanticsNode>()
-        newNodes[2] = newSemanticsNode
         accessibilityDelegate.sendSemanticsPropertyChangeEvents(newNodes)
 
         verify(container, times(1)).requestSendAccessibilityEvent(
@@ -616,11 +637,10 @@
                 oldSemanticsNode,
                 mapOf()
             )
-        val newSemanticsNode = createSemanticsNodeWithProperties(1, false) {
+        val newNodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()
+        newNodes[1] = createSemanticsNodeWithAdjustedBoundsWithProperties(1, false) {
             disabled()
         }
-        val newNodes = mutableMapOf<Int, SemanticsNode>()
-        newNodes[1] = newSemanticsNode
         accessibilityDelegate.sendSemanticsPropertyChangeEvents(newNodes)
 
         verify(container, times(1)).requestSendAccessibilityEvent(
@@ -644,9 +664,8 @@
                 oldSemanticsNode,
                 mapOf()
             )
-        val newSemanticsNode = createSemanticsNodeWithProperties(1, false) {}
-        val newNodes = mutableMapOf<Int, SemanticsNode>()
-        newNodes[1] = newSemanticsNode
+        val newNodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()
+        newNodes[1] = createSemanticsNodeWithAdjustedBoundsWithProperties(1, false) {}
         accessibilityDelegate.sendSemanticsPropertyChangeEvents(newNodes)
 
         verify(container, times(1)).requestSendAccessibilityEvent(
@@ -670,11 +689,10 @@
                 oldSemanticsNode,
                 mapOf()
             )
-        val newSemanticsNode = createSemanticsNodeWithProperties(1, false) {
+        val newNodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()
+        newNodes[1] = createSemanticsNodeWithAdjustedBoundsWithProperties(1, false) {
             onClick { true }
         }
-        val newNodes = mutableMapOf<Int, SemanticsNode>()
-        newNodes[1] = newSemanticsNode
         accessibilityDelegate.sendSemanticsPropertyChangeEvents(newNodes)
 
         verify(container, times(1)).requestSendAccessibilityEvent(
@@ -699,11 +717,10 @@
                 oldSemanticsNode,
                 mapOf()
             )
-        val newSemanticsNode = createSemanticsNodeWithProperties(1, false) {
+        val newNodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()
+        newNodes[1] = createSemanticsNodeWithAdjustedBoundsWithProperties(1, false) {
             onClick(label = label) { true }
         }
-        val newNodes = mutableMapOf<Int, SemanticsNode>()
-        newNodes[1] = newSemanticsNode
         accessibilityDelegate.sendSemanticsPropertyChangeEvents(newNodes)
 
         verify(container, never()).requestSendAccessibilityEvent(
@@ -729,11 +746,10 @@
                 oldSemanticsNode,
                 mapOf()
             )
-        val newSemanticsNode = createSemanticsNodeWithProperties(1, false) {
+        val newNodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()
+        newNodes[1] = createSemanticsNodeWithAdjustedBoundsWithProperties(1, false) {
             onClick(label = labelNew) { true }
         }
-        val newNodes = mutableMapOf<Int, SemanticsNode>()
-        newNodes[1] = newSemanticsNode
         accessibilityDelegate.sendSemanticsPropertyChangeEvents(newNodes)
 
         verify(container, times(1)).requestSendAccessibilityEvent(
@@ -758,11 +774,10 @@
                 oldSemanticsNode,
                 mapOf()
             )
-        val newSemanticsNode = createSemanticsNodeWithProperties(1, false) {
+        val newNodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()
+        newNodes[1] = createSemanticsNodeWithAdjustedBoundsWithProperties(1, false) {
             customActions = listOf(CustomAccessibilityAction(label) { true })
         }
-        val newNodes = mutableMapOf<Int, SemanticsNode>()
-        newNodes[1] = newSemanticsNode
         accessibilityDelegate.sendSemanticsPropertyChangeEvents(newNodes)
 
         verify(container, never()).requestSendAccessibilityEvent(
@@ -788,11 +803,10 @@
                 oldSemanticsNode,
                 mapOf()
             )
-        val newSemanticsNode = createSemanticsNodeWithProperties(1, false) {
+        val newNodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()
+        newNodes[1] = createSemanticsNodeWithAdjustedBoundsWithProperties(1, false) {
             customActions = listOf(CustomAccessibilityAction(labelNew) { true })
         }
-        val newNodes = mutableMapOf<Int, SemanticsNode>()
-        newNodes[1] = newSemanticsNode
         accessibilityDelegate.sendSemanticsPropertyChangeEvents(newNodes)
 
         verify(container, times(1)).requestSendAccessibilityEvent(
@@ -868,6 +882,21 @@
         }
     }
 
+    @Test
+    fun testNotPlacedNodesAreNotIncluded() {
+        val nodes = SemanticsOwner(
+            LayoutNode().also {
+                it.modifier = SemanticsModifierCore(
+                    id = SemanticsModifierCore.generateSemanticsId(),
+                    mergeDescendants = false,
+                    clearAndSetSemantics = false,
+                    properties = {}
+                )
+            }
+        ).getAllUncoveredSemanticsNodesToMap()
+        assertEquals(0, nodes.size)
+    }
+
     private fun createSemanticsNodeWithProperties(
         id: Int,
         mergeDescendants: Boolean,
@@ -880,6 +909,17 @@
         )
     }
 
+    private fun createSemanticsNodeWithAdjustedBoundsWithProperties(
+        id: Int,
+        mergeDescendants: Boolean,
+        properties: (SemanticsPropertyReceiver.() -> Unit)
+    ): SemanticsNodeWithAdjustedBounds {
+        return SemanticsNodeWithAdjustedBounds(
+            createSemanticsNodeWithProperties(id, mergeDescendants, properties),
+            android.graphics.Rect()
+        )
+    }
+
     private fun containsAction(
         info: AccessibilityNodeInfoCompat,
         action: AccessibilityNodeInfoCompat.AccessibilityActionCompat

compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/platform/LocalSoftwareKeyboardControllerTest.kt

diff --git a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/platform/LocalSoftwareKeyboardControllerTest.kt b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/platform/LocalSoftwareKeyboardControllerTest.kt
index ef211d1..46dbe8b 100644
--- a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/platform/LocalSoftwareKeyboardControllerTest.kt
+++ b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/platform/LocalSoftwareKeyboardControllerTest.kt
@@ -16,10 +16,15 @@
 
 package androidx.compose.ui.platform
 
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.text.BasicText
 import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
@@ -29,6 +34,7 @@
 import androidx.test.filters.LargeTest
 import com.nhaarman.mockitokotlin2.inOrder
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import org.junit.Rule
@@ -43,7 +49,37 @@
     @get:Rule
     val rule = createComposeRule()
 
-    @ExperimentalComposeUiApi
+    @Test
+    fun whenButtonClicked_performsHide_realisticAppTestCase() {
+        // code under test
+        @Composable
+        fun TestComposable() {
+            val softwareKeyboardController = LocalSoftwareKeyboardController.current
+            // Box instead of Button in this file for module dependency reasons
+            Box(Modifier.clickable { softwareKeyboardController?.hide() }) {
+                BasicText("Click Me")
+            }
+        }
+
+        // arrange
+        val mockSoftwareKeyboardController: SoftwareKeyboardController = mock()
+        rule.setContent {
+            CompositionLocalProvider(
+                LocalSoftwareKeyboardController provides mockSoftwareKeyboardController
+            ) {
+                TestComposable()
+            }
+        }
+
+        // act
+        rule.onNodeWithText("Click Me").performClick()
+
+        // assert
+        rule.runOnIdle {
+            verify(mockSoftwareKeyboardController).hide()
+        }
+    }
+
     @Test
     fun localSoftwareKeybardController_delegatesTo_textInputService() {
         val platformTextInputService = mock<PlatformTextInputService>()
@@ -55,7 +91,7 @@
             ) {
                 val controller = LocalSoftwareKeyboardController.current
                 SideEffect {
-                    controller?.hideSoftwareKeyboard()
+                    controller?.hide()
                 }
             }
         }
@@ -84,8 +120,8 @@
         rule.onNodeWithText("string").performClick()
 
         rule.runOnIdle {
-            controller?.hideSoftwareKeyboard()
-            controller?.showSoftwareKeyboard()
+            controller?.hide()
+            controller?.show()
             inOrder(platformTextInputService) {
                 verify(platformTextInputService).showSoftwareKeyboard() // focus
                 verify(platformTextInputService).hideSoftwareKeyboard() // explicit call
@@ -100,7 +136,29 @@
         rule.setContent {
             keyboardController = LocalSoftwareKeyboardController.current
         }
-        keyboardController!!.showSoftwareKeyboard()
-        keyboardController!!.hideSoftwareKeyboard()
+        keyboardController!!.show()
+        keyboardController!!.hide()
+    }
+
+    @Test
+    fun showAndHide_noOp_whenProvidedMock() {
+        val mockSoftwareKeyboardController: SoftwareKeyboardController = mock()
+        val platformTextInputService = mock<PlatformTextInputService>()
+        val textInputService = TextInputService(platformTextInputService)
+        var controller: SoftwareKeyboardController? = null
+        rule.setContent {
+            CompositionLocalProvider(
+                LocalSoftwareKeyboardController provides mockSoftwareKeyboardController,
+                LocalTextInputService provides textInputService
+            ) {
+                controller = LocalSoftwareKeyboardController.current
+            }
+        }
+        rule.runOnIdle {
+            controller?.show()
+            controller?.hide()
+        }
+        verify(platformTextInputService, never()).hideSoftwareKeyboard()
+        verify(platformTextInputService, never()).showSoftwareKeyboard()
     }
 }
\ No newline at end of file

compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/semantics/SemanticsTests.kt

diff --git a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/semantics/SemanticsTests.kt b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/semantics/SemanticsTests.kt
index 3c13021..3528238 100644
--- a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/semantics/SemanticsTests.kt
+++ b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/semantics/SemanticsTests.kt
@@ -99,7 +99,7 @@
     }
 
     @Test
-    fun depthFirstLabelConcat() {
+    fun depthFirstPropertyConcat() {
         val root = "root"
         val child1 = "child1"
         val grandchild1 = "grandchild1"
@@ -108,17 +108,17 @@
         rule.setContent {
             SimpleTestLayout(
                 Modifier.testTag(TestTag)
-                    .semantics(mergeDescendants = true) { contentDescription = root }
+                    .semantics(mergeDescendants = true) { testProperty = root }
             ) {
-                SimpleTestLayout(Modifier.semantics { contentDescription = child1 }) {
-                    SimpleTestLayout(Modifier.semantics { contentDescription = grandchild1 }) { }
-                    SimpleTestLayout(Modifier.semantics { contentDescription = grandchild2 }) { }
+                SimpleTestLayout(Modifier.semantics { testProperty = child1 }) {
+                    SimpleTestLayout(Modifier.semantics { testProperty = grandchild1 }) { }
+                    SimpleTestLayout(Modifier.semantics { testProperty = grandchild2 }) { }
                 }
-                SimpleTestLayout(Modifier.semantics { contentDescription = child2 }) { }
+                SimpleTestLayout(Modifier.semantics { testProperty = child2 }) { }
             }
         }
 
-        rule.onNodeWithTag(TestTag).assertContentDescriptionEquals(
+        rule.onNodeWithTag(TestTag).assertTestPropertyEquals(
             "$root, $child1, $grandchild1, $grandchild2, $child2"
         )
     }
@@ -131,15 +131,15 @@
         val label2 = "bar"
         rule.setContent {
             SimpleTestLayout(Modifier.semantics(mergeDescendants = true) {}.testTag(tag1)) {
-                SimpleTestLayout(Modifier.semantics { contentDescription = label1 }) { }
+                SimpleTestLayout(Modifier.semantics { testProperty = label1 }) { }
                 SimpleTestLayout(Modifier.semantics(mergeDescendants = true) {}.testTag(tag2)) {
-                    SimpleTestLayout(Modifier.semantics { contentDescription = label2 }) { }
+                    SimpleTestLayout(Modifier.semantics { testProperty = label2 }) { }
                 }
             }
         }
 
-        rule.onNodeWithTag(tag1).assertContentDescriptionEquals(label1)
-        rule.onNodeWithTag(tag2).assertContentDescriptionEquals(label2)
+        rule.onNodeWithTag(tag1).assertTestPropertyEquals(label1)
+        rule.onNodeWithTag(tag2).assertTestPropertyEquals(label2)
     }
 
     @Test
@@ -151,16 +151,16 @@
         val label3 = "hi"
         rule.setContent {
             SimpleTestLayout(Modifier.semantics(mergeDescendants = true) {}.testTag(tag1)) {
-                SimpleTestLayout(Modifier.semantics { contentDescription = label1 }) { }
+                SimpleTestLayout(Modifier.semantics { testProperty = label1 }) { }
                 SimpleTestLayout(Modifier.semantics(mergeDescendants = true) {}.testTag(tag2)) {
-                    SimpleTestLayout(Modifier.semantics { contentDescription = label2 }) { }
+                    SimpleTestLayout(Modifier.semantics { testProperty = label2 }) { }
                 }
-                SimpleTestLayout(Modifier.semantics { contentDescription = label3 }) { }
+                SimpleTestLayout(Modifier.semantics { testProperty = label3 }) { }
             }
         }
 
-        rule.onNodeWithTag(tag1).assertContentDescriptionEquals("$label1, $label3")
-        rule.onNodeWithTag(tag2).assertContentDescriptionEquals(label2)
+        rule.onNodeWithTag(tag1).assertTestPropertyEquals("$label1, $label3")
+        rule.onNodeWithTag(tag2).assertTestPropertyEquals(label2)
     }
 
     @Test
@@ -172,12 +172,12 @@
         val label3 = "baz"
         rule.setContent {
             SimpleTestLayout(Modifier.semantics(mergeDescendants = true) {}.testTag(tag1)) {
-                SimpleTestLayout(Modifier.semantics { contentDescription = label1 }) { }
+                SimpleTestLayout(Modifier.semantics { testProperty = label1 }) { }
                 SimpleTestLayout(Modifier.clearAndSetSemantics {}) {
-                    SimpleTestLayout(Modifier.semantics { contentDescription = label2 }) { }
+                    SimpleTestLayout(Modifier.semantics { testProperty = label2 }) { }
                 }
-                SimpleTestLayout(Modifier.clearAndSetSemantics { contentDescription = label3 }) {
-                    SimpleTestLayout(Modifier.semantics { contentDescription = label2 }) { }
+                SimpleTestLayout(Modifier.clearAndSetSemantics { testProperty = label3 }) {
+                    SimpleTestLayout(Modifier.semantics { testProperty = label2 }) { }
                 }
                 SimpleTestLayout(
                     Modifier.semantics(mergeDescendants = true) {}.testTag(tag2)
@@ -188,7 +188,7 @@
             }
         }
 
-        rule.onNodeWithTag(tag1).assertContentDescriptionEquals("$label1, $label3")
+        rule.onNodeWithTag(tag1).assertTestPropertyEquals("$label1, $label3")
         rule.onNodeWithTag(tag2).assertTextEquals(label1)
     }
 
@@ -203,26 +203,26 @@
             SimpleTestLayout(Modifier.semantics(mergeDescendants = true) {}.testTag(tag1)) {
                 SimpleTestLayout(
                     Modifier
-                        .clearAndSetSemantics { contentDescription = label1 }
+                        .clearAndSetSemantics { testProperty = label1 }
                         .semantics { text = AnnotatedString(label2) }
                 ) {}
                 SimpleTestLayout(
                     Modifier
-                        .semantics { contentDescription = label3 }
+                        .semantics { testProperty = label3 }
                         .clearAndSetSemantics { text = AnnotatedString(label3) }
                 ) {}
             }
             SimpleTestLayout(
                 Modifier.testTag(tag2)
-                    .semantics { contentDescription = label1 }
+                    .semantics { testProperty = label1 }
                     .clearAndSetSemantics {}
                     .semantics { text = AnnotatedString(label1) }
             ) {}
         }
 
-        rule.onNodeWithTag(tag1).assertContentDescriptionEquals("$label1, $label3")
+        rule.onNodeWithTag(tag1).assertTestPropertyEquals("$label1, $label3")
         rule.onNodeWithTag(tag1).assertTextEquals(label3)
-        rule.onNodeWithTag(tag2).assertContentDescriptionEquals("$label1")
+        rule.onNodeWithTag(tag2).assertTestPropertyEquals("$label1")
         rule.onNodeWithTag(tag2).assertDoesNotHaveProperty(SemanticsProperties.Text)
     }
 
@@ -233,17 +233,17 @@
         rule.setContent {
             SimpleTestLayout(Modifier.semantics(mergeDescendants = true) {}.testTag(TestTag)) {
                 if (showSubtree.value) {
-                    SimpleTestLayout(Modifier.semantics { contentDescription = label }) { }
+                    SimpleTestLayout(Modifier.semantics { testProperty = label }) { }
                 }
             }
         }
 
-        rule.onNodeWithTag(TestTag).assertContentDescriptionEquals(label)
+        rule.onNodeWithTag(TestTag).assertTestPropertyEquals(label)
 
         rule.runOnIdle { showSubtree.value = false }
 
         rule.onNodeWithTag(TestTag)
-            .assertDoesNotHaveProperty(SemanticsProperties.ContentDescription)
+            .assert(SemanticsMatcher.keyNotDefined(TestProperty))
 
         rule.onAllNodesWithText(label).assertCountEquals(0)
     }
@@ -255,7 +255,7 @@
         val showNewNode = mutableStateOf(false)
         rule.setContent {
             SimpleTestLayout(Modifier.semantics(mergeDescendants = true) {}.testTag(TestTag)) {
-                SimpleTestLayout(Modifier.semantics { contentDescription = label }) { }
+                SimpleTestLayout(Modifier.semantics { testProperty = label }) { }
                 if (showNewNode.value) {
                     SimpleTestLayout(Modifier.semantics { stateDescription = value }) { }
                 }
@@ -263,13 +263,13 @@
         }
 
         rule.onNodeWithTag(TestTag)
-            .assertContentDescriptionEquals(label)
+            .assertTestPropertyEquals(label)
             .assertDoesNotHaveProperty(SemanticsProperties.StateDescription)
 
         rule.runOnIdle { showNewNode.value = true }
 
         rule.onNodeWithTag(TestTag)
-            .assertContentDescriptionEquals(label)
+            .assertTestPropertyEquals(label)
             .assertValueEquals(value)
     }
 
@@ -372,17 +372,17 @@
             SimpleTestLayout(Modifier.testTag(TestTag).semantics(mergeDescendants = true) {}) {
                 SimpleTestLayout(
                     Modifier.semantics {
-                        contentDescription = if (isAfter.value) afterLabel else beforeLabel
+                        testProperty = if (isAfter.value) afterLabel else beforeLabel
                     }
                 ) {}
             }
         }
 
-        rule.onNodeWithTag(TestTag).assertContentDescriptionEquals(beforeLabel)
+        rule.onNodeWithTag(TestTag).assertTestPropertyEquals(beforeLabel)
 
         rule.runOnIdle { isAfter.value = true }
 
-        rule.onNodeWithTag(TestTag).assertContentDescriptionEquals(afterLabel)
+        rule.onNodeWithTag(TestTag).assertTestPropertyEquals(afterLabel)
     }
 
     @Test
@@ -728,6 +728,15 @@
     assert(SemanticsMatcher.keyNotDefined(property))
 }
 
+private val TestProperty = SemanticsPropertyKey<String>("TestProperty") { parent, child ->
+    if (parent == null) child else "$parent, $child"
+}
+private var SemanticsPropertyReceiver.testProperty by TestProperty
+
+private fun SemanticsNodeInteraction.assertTestPropertyEquals(value: String) = assert(
+    SemanticsMatcher.expectValue(TestProperty, value)
+)
+
 // Falsely mark the layout counter stable to avoid influencing recomposition behavior
 @Stable
 private class Counter(var count: Int)

compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt

diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt
index cabf8762..a556129 100644
--- a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt
+++ b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt
@@ -62,11 +62,14 @@
 import androidx.compose.ui.fastZipWithNext
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.semantics.AccessibilityAction
+import androidx.compose.ui.semantics.LiveRegionMode
 import androidx.compose.ui.semantics.ProgressBarRangeInfo
 import androidx.compose.ui.text.InternalTextApi
 import androidx.compose.ui.util.fastForEachIndexed
 import androidx.core.view.AccessibilityDelegateCompat
 import androidx.core.view.ViewCompat
+import androidx.core.view.ViewCompat.ACCESSIBILITY_LIVE_REGION_ASSERTIVE
+import androidx.core.view.ViewCompat.ACCESSIBILITY_LIVE_REGION_POLITE
 import androidx.core.view.accessibility.AccessibilityEventCompat
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import androidx.core.view.accessibility.AccessibilityNodeProviderCompat
@@ -175,8 +178,9 @@
     private var currentSemanticsNodesInvalidated = true
 
     // Up to date semantics nodes in pruned semantics tree. It always reflects the current
-    // semantics tree.
-    private var currentSemanticsNodes: Map<Int, SemanticsNode> = mapOf()
+    // semantics tree. They key is the virtual view id(the root node has a key of
+    // AccessibilityNodeProviderCompat.HOST_VIEW_ID and other node has a key of its id).
+    private var currentSemanticsNodes: Map<Int, SemanticsNodeWithAdjustedBounds> = mapOf()
         get() {
             if (currentSemanticsNodesInvalidated) {
                 field = view.semanticsOwner.getAllUncoveredSemanticsNodesToMap()
@@ -186,10 +190,14 @@
         }
     private var paneDisplayed = ArraySet<Int>()
 
+    /**
+     * A snapshot of the semantics node. The children here is fixed and are taken from the time
+     * this node is constructed. While a SemanticsNode always contains the up-to-date children.
+     */
     @VisibleForTesting
     internal class SemanticsNodeCopy(
         semanticsNode: SemanticsNode,
-        currentSemanticsNodes: Map<Int, SemanticsNode>
+        currentSemanticsNodes: Map<Int, SemanticsNodeWithAdjustedBounds>
     ) {
         val config = semanticsNode.config
         val children: MutableSet<Int> = mutableSetOf()
@@ -227,18 +235,15 @@
 
     private fun createNodeInfo(virtualViewId: Int): AccessibilityNodeInfo? {
         val info: AccessibilityNodeInfoCompat = AccessibilityNodeInfoCompat.obtain()
-        val semanticsNode: SemanticsNode?
+        val semanticsNodeWithAdjustedBounds = currentSemanticsNodes[virtualViewId]
+        if (semanticsNodeWithAdjustedBounds == null) {
+            info.recycle()
+            return null
+        }
+        val semanticsNode: SemanticsNode = semanticsNodeWithAdjustedBounds.semanticsNode
         if (virtualViewId == AccessibilityNodeProviderCompat.HOST_VIEW_ID) {
-            info.setSource(view)
-            semanticsNode = view.semanticsOwner.rootSemanticsNode
             info.setParent(ViewCompat.getParentForAccessibility(view) as? View)
         } else {
-            semanticsNode = currentSemanticsNodes[virtualViewId]
-            if (semanticsNode == null) {
-                info.recycle()
-                return null
-            }
-            info.setSource(view, semanticsNode.id)
             if (semanticsNode.parent != null) {
                 var parentId = semanticsNode.parent!!.id
                 if (parentId == view.semanticsOwner.rootSemanticsNode.id) {
@@ -249,6 +254,20 @@
                 throw IllegalStateException("semanticsNode $virtualViewId has null parent")
             }
         }
+        info.setSource(view, virtualViewId)
+        val boundsInRoot = semanticsNodeWithAdjustedBounds.adjustedBounds
+        val topLeftInScreen =
+            view.localToScreen(Offset(boundsInRoot.left.toFloat(), boundsInRoot.top.toFloat()))
+        val bottomRightInScreen =
+            view.localToScreen(Offset(boundsInRoot.right.toFloat(), boundsInRoot.bottom.toFloat()))
+        info.setBoundsInScreen(
+            android.graphics.Rect(
+                floor(topLeftInScreen.x).toInt(),
+                floor(topLeftInScreen.y).toInt(),
+                ceil(bottomRightInScreen.x).toInt(),
+                ceil(bottomRightInScreen.y).toInt()
+            )
+        )
 
         populateAccessibilityNodeInfoProperties(virtualViewId, info, semanticsNode)
 
@@ -274,23 +293,6 @@
             }
         }
         info.packageName = view.context.packageName
-        try {
-            val boundsInRoot = semanticsNode.boundsInRoot
-            val topLeftInScreen = view.localToScreen(boundsInRoot.topLeft)
-            val bottomRightInScreen = view.localToScreen(boundsInRoot.bottomRight)
-            info.setBoundsInScreen(
-                android.graphics.Rect(
-                    floor(topLeftInScreen.x).toInt(),
-                    floor(topLeftInScreen.y).toInt(),
-                    ceil(bottomRightInScreen.x).toInt(),
-                    ceil(bottomRightInScreen.y).toInt()
-                )
-            )
-        } catch (e: IllegalStateException) {
-            // We may get "Asking for measurement result of unmeasured layout modifier" error.
-            // TODO(b/153198816): check whether we still get this exception when R is in.
-            info.setBoundsInScreen(android.graphics.Rect())
-        }
 
         semanticsNode.children.fastForEach { child ->
             if (currentSemanticsNodes.contains(child.id)) {
@@ -337,6 +339,12 @@
         }
         info.isVisibleToUser =
             (semanticsNode.config.getOrNull(SemanticsProperties.InvisibleToUser) == null)
+        semanticsNode.config.getOrNull(SemanticsProperties.LiveRegion)?.let {
+            info.liveRegion = when (it) {
+                LiveRegionMode.Polite -> ACCESSIBILITY_LIVE_REGION_POLITE
+                LiveRegionMode.Assertive -> ACCESSIBILITY_LIVE_REGION_ASSERTIVE
+            }
+        }
         info.isClickable = false
         semanticsNode.config.getOrNull(SemanticsActions.OnClick)?.let {
             // Selectable items that are already selected should not announce it again
@@ -821,7 +829,7 @@
 
         // populate additional information from the node
         currentSemanticsNodes[virtualViewId]?.let {
-            event.isPassword = it.isPassword
+            event.isPassword = it.semanticsNode.isPassword
         }
 
         return event
@@ -852,12 +860,7 @@
         action: Int,
         arguments: Bundle?
     ): Boolean {
-        val node: SemanticsNode =
-            if (virtualViewId == AccessibilityNodeProviderCompat.HOST_VIEW_ID) {
-                view.semanticsOwner.rootSemanticsNode
-            } else {
-                currentSemanticsNodes[virtualViewId] ?: return false
-            }
+        val node = currentSemanticsNodes[virtualViewId]?.semanticsNode ?: return false
 
         // Actions can be performed when disabled.
         when (action) {
@@ -1085,12 +1088,7 @@
         extraDataKey: String,
         arguments: Bundle?
     ) {
-        val node: SemanticsNode =
-            if (virtualViewId == AccessibilityNodeProviderCompat.HOST_VIEW_ID) {
-                view.semanticsOwner.rootSemanticsNode
-            } else {
-                currentSemanticsNodes[virtualViewId] ?: return
-            }
+        val node = currentSemanticsNodes[virtualViewId]?.semanticsNode ?: return
         // TODO(b/157474582): This only works for single text, which means that for text field it
         //  gets the editable text only and for multiple merged text it gets one text only
         val text = getIterableTextForAccessibility(node)
@@ -1428,7 +1426,7 @@
     private fun updateSemanticsNodesCopyAndPanes() {
         // TODO(b/172606324): removed this compose specific fix when talkback has a proper solution.
         for (id in paneDisplayed) {
-            val currentNode = currentSemanticsNodes[id]
+            val currentNode = currentSemanticsNodes[id]?.semanticsNode
             if (currentNode == null || !currentNode.hasPaneTitle()) {
                 paneDisplayed.remove(id)
                 sendPaneChangeEvents(
@@ -1440,27 +1438,29 @@
         }
         previousSemanticsNodes.clear()
         for (entry in currentSemanticsNodes.entries) {
-            if (entry.value.hasPaneTitle() && paneDisplayed.add(entry.key)) {
+            if (entry.value.semanticsNode.hasPaneTitle() && paneDisplayed.add(entry.key)) {
                 sendPaneChangeEvents(
                     entry.key,
                     AccessibilityEventCompat.CONTENT_CHANGE_TYPE_PANE_APPEARED,
-                    entry.value.config[SemanticsProperties.PaneTitle]
+                    entry.value.semanticsNode.config[SemanticsProperties.PaneTitle]
                 )
             }
             previousSemanticsNodes[entry.key] =
-                SemanticsNodeCopy(entry.value, currentSemanticsNodes)
+                SemanticsNodeCopy(entry.value.semanticsNode, currentSemanticsNodes)
         }
         previousSemanticsRoot =
             SemanticsNodeCopy(view.semanticsOwner.rootSemanticsNode, currentSemanticsNodes)
     }
 
     @VisibleForTesting
-    internal fun sendSemanticsPropertyChangeEvents(newSemanticsNodes: Map<Int, SemanticsNode>) {
+    internal fun sendSemanticsPropertyChangeEvents(
+        newSemanticsNodes: Map<Int, SemanticsNodeWithAdjustedBounds>
+    ) {
         for (id in newSemanticsNodes.keys) {
             // We do doing this search because the new configuration is set as a whole, so we
             // can't indicate which property is changed when setting the new configuration.
             val oldNode = previousSemanticsNodes[id] ?: continue
-            val newNode = newSemanticsNodes[id]
+            val newNode = newSemanticsNodes[id]?.semanticsNode
             var propertyChanged = false
             for (entry in newNode!!.config) {
                 if (entry.value == oldNode.config.getOrNull(entry.key)) {
@@ -2210,25 +2210,41 @@
 }
 
 /**
+ * Semantics node with adjusted bounds for the uncovered(by siblings) part.
+ */
+internal class SemanticsNodeWithAdjustedBounds(
+    val semanticsNode: SemanticsNode,
+    val adjustedBounds: android.graphics.Rect
+)
+
+/**
  * Finds pruned [SemanticsNode]s in the tree owned by this [SemanticsOwner]. A semantics node
  * completely covered by siblings drawn on top of it will be pruned. Return the results in a
  * map.
  */
 internal fun SemanticsOwner.getAllUncoveredSemanticsNodesToMap(
     useUnmergedTree: Boolean = false
-): Map<Int, SemanticsNode> {
+): Map<Int, SemanticsNodeWithAdjustedBounds> {
     val root = if (useUnmergedTree) unmergedRootSemanticsNode else rootSemanticsNode
-    val nodes = mutableMapOf<Int, SemanticsNode>()
-    val unaccountedSpace = Region().also { it.set(root.boundsInWindow.toAndroidRect()) }
+    val nodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()
+    if (!root.layoutNode.isPlaced) {
+        return nodes
+    }
+    val unaccountedSpace = Region().also { it.set(root.boundsInRoot.toAndroidRect()) }
 
     fun findAllSemanticNodesRecursive(currentNode: SemanticsNode) {
-        if (unaccountedSpace.isEmpty || !currentNode.layoutNode.isAttached) {
+        if (unaccountedSpace.isEmpty || !currentNode.layoutNode.isPlaced) {
             return
         }
-        val rect = currentNode.boundsInWindow.toAndroidRect()
-
-        if (Region(unaccountedSpace).op(rect, Region.Op.INTERSECT)) {
-            nodes[currentNode.id] = currentNode
+        val rect = currentNode.boundsInRoot.toAndroidRect()
+        val region = Region().also { it.set(rect) }
+        if (region.op(unaccountedSpace, region, Region.Op.INTERSECT)) {
+            val virtualViewId = if (currentNode.id == root.id) {
+                AccessibilityNodeProviderCompat.HOST_VIEW_ID
+            } else {
+                currentNode.id
+            }
+            nodes[virtualViewId] = SemanticsNodeWithAdjustedBounds(currentNode, region.bounds)
             // Children could be drawn outside of parent, but we are using clipped bounds for
             // accessibility now, so let's put the children recursion inside of this if. If later
             // we decide to support children drawn outside of parent, we can move it out of the

compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidUiDispatcher.android.kt

diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidUiDispatcher.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidUiDispatcher.android.kt
index e72b4a2..5be4139 100644
--- a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidUiDispatcher.android.kt
+++ b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidUiDispatcher.android.kt
@@ -19,8 +19,6 @@
 import android.os.Looper
 import android.view.Choreographer
 import androidx.compose.runtime.MonotonicFrameClock
-import androidx.compose.ui.platform.AndroidUiDispatcher.Companion.CurrentThread
-import androidx.compose.ui.platform.AndroidUiDispatcher.Companion.Main
 import androidx.core.os.HandlerCompat
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
@@ -40,7 +38,6 @@
 // not marked as async will adversely affect dispatch behavior but not to the point of
 // incorrectness; more operations would be deferred to the choreographer frame as racing handler
 // messages would wait behind a frame barrier.
-@OptIn(ExperimentalStdlibApi::class)
 class AndroidUiDispatcher private constructor(
     val choreographer: Choreographer,
     private val handler: android.os.Handler

compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/layout/AlignmentLine.kt

diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/layout/AlignmentLine.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/layout/AlignmentLine.kt
index 4640ac6..593831d 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/layout/AlignmentLine.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/layout/AlignmentLine.kt
@@ -49,8 +49,6 @@
  *
  * @see VerticalAlignmentLine
  * @see HorizontalAlignmentLine
- *
- * @param merger Defines the position of an alignment line inherited from more than one child.
  */
 @Immutable
 sealed class AlignmentLine(

compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/layout/Placeable.kt

diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/layout/Placeable.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/layout/Placeable.kt
index ebbc0b2..f4d9abd 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/layout/Placeable.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/layout/Placeable.kt
@@ -97,7 +97,7 @@
     /**
      * The constraints used for the measurement made to obtain this [Placeable].
      */
-    protected var measurementConstraints: Constraints = Constraints()
+    protected var measurementConstraints: Constraints = DefaultConstraints
 
     /**
      * The offset to be added to an apparent position assigned to this [Placeable] to make it real.
@@ -330,3 +330,5 @@
  * Block on [GraphicsLayerScope] which applies the default layer parameters.
  */
 private val DefaultLayerBlock: GraphicsLayerScope.() -> Unit = {}
+
+private val DefaultConstraints = Constraints()
\ No newline at end of file

compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/LayoutNode.kt

diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/LayoutNode.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/LayoutNode.kt
index ea36814..4c84c63 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/LayoutNode.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/LayoutNode.kt
@@ -31,7 +31,6 @@
 import androidx.compose.ui.input.pointer.PointerInputFilter
 import androidx.compose.ui.input.pointer.PointerInputModifier
 import androidx.compose.ui.layout.AlignmentLine
-import androidx.compose.ui.layout.HorizontalAlignmentLine
 import androidx.compose.ui.layout.IntrinsicMeasurable
 import androidx.compose.ui.layout.IntrinsicMeasureScope
 import androidx.compose.ui.layout.LayoutCoordinates
@@ -48,7 +47,6 @@
 import androidx.compose.ui.layout.Placeable
 import androidx.compose.ui.layout.Remeasurement
 import androidx.compose.ui.layout.RemeasurementModifier
-import androidx.compose.ui.layout.merge
 import androidx.compose.ui.node.LayoutNode.LayoutState.LayingOut
 import androidx.compose.ui.node.LayoutNode.LayoutState.Measuring
 import androidx.compose.ui.node.LayoutNode.LayoutState.NeedsRelayout
@@ -62,7 +60,6 @@
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.LayoutDirection
-import kotlin.math.roundToInt
 
 /**
  * Enable to log changes to the LayoutNode tree.  This logging is quite chatty.
@@ -102,17 +99,20 @@
 
     // the list of nodes where the virtual children are unfolded (their children are represented
     // as our direct children)
-    private val _unfoldedChildren = mutableVectorOf<LayoutNode>()
+    private var _unfoldedChildren: MutableVector<LayoutNode>? = null
 
     private fun recreateUnfoldedChildrenIfDirty() {
         if (unfoldedVirtualChildrenListDirty) {
             unfoldedVirtualChildrenListDirty = false
-            _unfoldedChildren.clear()
+            val unfoldedChildren = _unfoldedChildren ?: mutableVectorOf<LayoutNode>().also {
+                _unfoldedChildren = it
+            }
+            unfoldedChildren.clear()
             _foldedChildren.forEach {
                 if (it.isVirtual) {
-                    _unfoldedChildren.addAll(it._children)
+                    unfoldedChildren.addAll(it._children)
                 } else {
-                    _unfoldedChildren.add(it)
+                    unfoldedChildren.add(it)
                 }
             }
         }
@@ -135,7 +135,7 @@
             _foldedChildren
         } else {
             recreateUnfoldedChildrenIfDirty()
-            _unfoldedChildren
+            _unfoldedChildren!!
         }
 
     /**
@@ -491,12 +491,13 @@
     /**
      * The alignment lines of this layout, inherited + intrinsic
      */
-    internal val alignmentLines: MutableMap<AlignmentLine, Int> = hashMapOf()
+    internal var alignmentLines: LayoutNodeAlignmentLines? = null
+        private set
 
     /**
      * The alignment lines provided by this layout at the last measurement
      */
-    internal val providedAlignmentLines: MutableMap<AlignmentLine, Int> = hashMapOf()
+    internal var providedAlignmentLines: Map<AlignmentLine, Int> = emptyMap()
 
     internal val mDrawScope: LayoutNodeDrawScope = sharedDrawScope
 
@@ -558,8 +559,6 @@
 
     internal var alignmentUsageByParent = UsageByParent.NotUsed
 
-    private val previousAlignmentLines = mutableMapOf<AlignmentLine, Int>()
-
     @Deprecated("Temporary API to support ConstraintLayout prototyping.")
     internal var canMultiMeasure: Boolean = false
 
@@ -638,13 +637,17 @@
                 owner!!.onSemanticsChange()
             }
             val addedCallback = hasNewPositioningCallback()
-            onPositionedCallbacks.clear()
+            onPositionedCallbacks?.clear()
 
             // Create a new chain of LayoutNodeWrappers, reusing existing ones from wrappers
             // when possible.
             val outerWrapper = modifier.foldOut(innerLayoutNodeWrapper) { mod, toWrap ->
                 var wrapper = toWrap
                 if (mod is OnGloballyPositionedModifier) {
+                    val onPositionedCallbacks = onPositionedCallbacks
+                        ?: mutableVectorOf<OnGloballyPositionedModifier>().also {
+                            onPositionedCallbacks = it
+                        }
                     onPositionedCallbacks += mod
                 }
                 if (mod is RemeasurementModifier) {
@@ -763,7 +766,7 @@
     /**
      * List of all OnPositioned callbacks in the modifier chain.
      */
-    private val onPositionedCallbacks = mutableVectorOf<OnGloballyPositionedModifier>()
+    private var onPositionedCallbacks: MutableVector<OnGloballyPositionedModifier>? = null
 
     /**
      * Flag used by [OnPositionedDispatcher] to identify LayoutNodes that have already
@@ -812,30 +815,11 @@
     }
 
     /**
-     * Returns the alignment line value for a given alignment line without affecting whether
-     * the flag for whether the alignment line was read.
-     */
-    internal fun getAlignmentLine(alignmentLine: AlignmentLine): Int? {
-        val linePos = alignmentLines[alignmentLine] ?: return null
-        var pos = Offset(linePos.toFloat(), linePos.toFloat())
-        var wrapper = innerLayoutNodeWrapper
-        while (wrapper != outerLayoutNodeWrapper) {
-            pos = wrapper.toParentPosition(pos)
-            wrapper = wrapper.wrappedBy!!
-        }
-        pos = wrapper.toParentPosition(pos)
-        return if (alignmentLine is HorizontalAlignmentLine) {
-            pos.y.roundToInt()
-        } else {
-            pos.x.roundToInt()
-        }
-    }
-
-    /**
      * Return true if there is a new [OnGloballyPositionedModifier] assigned to this Layout.
      */
     private fun hasNewPositioningCallback(): Boolean {
-        return modifier.foldOut(false) { mod, hasNewCallback ->
+        val onPositionedCallbacks = onPositionedCallbacks
+        return onPositionedCallbacks != null && modifier.foldOut(false) { mod, hasNewCallback ->
             hasNewCallback ||
                 (mod is OnGloballyPositionedModifier && mod !in onPositionedCallbacks)
         }
@@ -930,28 +914,10 @@
             alignmentLinesCalculatedDuringLastLayout = false
             if (alignmentLinesRequired) {
                 alignmentLinesCalculatedDuringLastLayout = true
-                previousAlignmentLines.clear()
-                previousAlignmentLines.putAll(alignmentLines)
-                alignmentLines.clear()
-                _children.forEach { child ->
-                    if (!child.isPlaced) return@forEach
-                    child.alignmentLines.keys.forEach { childLine ->
-                        val linePositionInContainer = child.getAlignmentLine(childLine)!!
-                        // If the line was already provided by a previous child, merge the values.
-                        alignmentLines[childLine] = if (childLine in alignmentLines) {
-                            childLine.merge(
-                                alignmentLines.getValue(childLine),
-                                linePositionInContainer
-                            )
-                        } else {
-                            linePositionInContainer
-                        }
-                    }
+                val alignments = alignmentLines ?: LayoutNodeAlignmentLines(this).also {
+                    alignmentLines = it
                 }
-                alignmentLines += providedAlignmentLines
-                if (previousAlignmentLines != alignmentLines) {
-                    onAlignmentsChanged()
-                }
+                alignments.recalculate()
             }
             layoutState = Ready
         }
@@ -1055,13 +1021,12 @@
             layoutState = endState
         }
         isCalculatingAlignmentLines = false
-        return alignmentLines
+        return alignmentLines?.getLastCalculation() ?: emptyMap()
     }
 
     internal fun handleMeasureResult(measureResult: MeasureResult) {
         innerLayoutNodeWrapper.measureResult = measureResult
-        this.providedAlignmentLines.clear()
-        this.providedAlignmentLines += measureResult.alignmentLines
+        providedAlignmentLines = measureResult.alignmentLines
     }
 
     /**
@@ -1093,7 +1058,7 @@
         if (!isPlaced) {
             return // it hasn't been placed, so don't make a call
         }
-        onPositionedCallbacks.forEach { it.onGloballyPositioned(coordinates) }
+        onPositionedCallbacks?.forEach { it.onGloballyPositioned(coordinates) }
     }
 
     /**

compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/LayoutNodeAlignmentLines.kt

diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/LayoutNodeAlignmentLines.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/LayoutNodeAlignmentLines.kt
new file mode 100644
index 0000000..fba763a
--- /dev/null
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/LayoutNodeAlignmentLines.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.node
+
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.layout.AlignmentLine
+import androidx.compose.ui.layout.HorizontalAlignmentLine
+import androidx.compose.ui.layout.merge
+import kotlin.math.roundToInt
+
+internal class LayoutNodeAlignmentLines(
+    private val layoutNode: LayoutNode
+) {
+    /**
+     * The alignment lines of this layout, inherited + intrinsic
+     */
+    private val alignmentLines: MutableMap<AlignmentLine, Int> = hashMapOf()
+
+    private val previousAlignmentLines = mutableMapOf<AlignmentLine, Int>()
+
+    fun getLastCalculation(): Map<AlignmentLine, Int> = alignmentLines
+
+    fun recalculate() {
+        previousAlignmentLines.clear()
+        previousAlignmentLines.putAll(alignmentLines)
+        alignmentLines.clear()
+        layoutNode._children.forEach { child ->
+            val childAlignments = child.alignmentLines
+            if (!child.isPlaced || childAlignments == null) return@forEach
+            childAlignments.alignmentLines.keys.forEach { childLine ->
+                val linePositionInContainer = childAlignments.getAlignmentLine(childLine)!!
+                // If the line was already provided by a previous child, merge the values.
+                alignmentLines[childLine] = if (childLine in alignmentLines) {
+                    childLine.merge(
+                        alignmentLines.getValue(childLine),
+                        linePositionInContainer
+                    )
+                } else {
+                    linePositionInContainer
+                }
+            }
+        }
+        alignmentLines += layoutNode.providedAlignmentLines
+        if (previousAlignmentLines != alignmentLines) {
+            layoutNode.onAlignmentsChanged()
+        }
+    }
+
+    /**
+     * Returns the alignment line value for a given alignment line without affecting whether
+     * the flag for whether the alignment line was read.
+     */
+    private fun getAlignmentLine(alignmentLine: AlignmentLine): Int? {
+        val linePos = alignmentLines[alignmentLine] ?: return null
+        var pos = Offset(linePos.toFloat(), linePos.toFloat())
+        var wrapper = layoutNode.innerLayoutNodeWrapper
+        while (wrapper != layoutNode.outerLayoutNodeWrapper) {
+            pos = wrapper.toParentPosition(pos)
+            wrapper = wrapper.wrappedBy!!
+        }
+        pos = wrapper.toParentPosition(pos)
+        return if (alignmentLine is HorizontalAlignmentLine) {
+            pos.y.roundToInt()
+        } else {
+            pos.x.roundToInt()
+        }
+    }
+}

compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/OuterMeasurablePlaceable.kt

diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/OuterMeasurablePlaceable.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/OuterMeasurablePlaceable.kt
index 4f2e9c5..eadbc1c 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/OuterMeasurablePlaceable.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/OuterMeasurablePlaceable.kt
@@ -38,7 +38,7 @@
     }
     private var lastPosition: IntOffset = IntOffset.Zero
     private var lastLayerBlock: (GraphicsLayerScope.() -> Unit)? = null
-    private val lastProvidedAlignmentLines = mutableMapOf<AlignmentLine, Int>()
+    private var lastProvidedAlignmentLines: MutableMap<AlignmentLine, Int>? = null
     private var lastZIndex: Float = 0f
 
     /**
@@ -90,16 +90,12 @@
             measuredOnce = true
             layoutNode.layoutState = LayoutState.Measuring
             measurementConstraints = constraints
-            lastProvidedAlignmentLines.clear()
-            lastProvidedAlignmentLines.putAll(layoutNode.providedAlignmentLines)
             val outerWrapperPreviousMeasuredSize = outerWrapper.size
             owner.snapshotObserver.observeMeasureSnapshotReads(layoutNode) {
                 outerWrapper.measure(constraints)
             }
             layoutNode.layoutState = LayoutState.NeedsRelayout
-            if (layoutNode.providedAlignmentLines != lastProvidedAlignmentLines) {
-                layoutNode.onAlignmentsChanged()
-            }
+            notifyAlignmentChanges()
             val sizeChanged = outerWrapper.size != outerWrapperPreviousMeasuredSize ||
                 outerWrapper.width != width ||
                 outerWrapper.height != height
@@ -110,6 +106,26 @@
         return false
     }
 
+    private fun notifyAlignmentChanges() {
+        // optimized to only create a lastProvidedAlignmentLines when we do have non empty map
+        if (layoutNode.providedAlignmentLines.isNotEmpty()) {
+            val previous = lastProvidedAlignmentLines ?: mutableMapOf<AlignmentLine, Int>().also {
+                lastProvidedAlignmentLines = it
+            }
+            if (layoutNode.providedAlignmentLines != previous) {
+                previous.clear()
+                previous.putAll(layoutNode.providedAlignmentLines)
+                layoutNode.onAlignmentsChanged()
+            }
+        } else {
+            val previous = lastProvidedAlignmentLines
+            if (previous != null && previous.isNotEmpty()) {
+                previous.clear()
+                layoutNode.onAlignmentsChanged()
+            }
+        }
+    }
+
     // We are setting our measuredSize to match the coerced outerWrapper size, to prevent
     // double offseting for layout cooperation. However, this means that here we need
     // to override these getters to make the measured values correct in Measured.

compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/LocalSoftwareKeyboardController.kt

diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/LocalSoftwareKeyboardController.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/LocalSoftwareKeyboardController.kt
index 312783f..dbcc400 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/LocalSoftwareKeyboardController.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/LocalSoftwareKeyboardController.kt
@@ -17,6 +17,8 @@
 package androidx.compose.ui.platform
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ProvidedValue
+import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.text.input.TextInputService
@@ -24,31 +26,51 @@
 @ExperimentalComposeUiApi
 public object LocalSoftwareKeyboardController {
 
+    private val LocalSoftwareKeyboardController =
+        compositionLocalOf<SoftwareKeyboardController?> { null }
+
     /**
-     * Return a [SoftwareKeyboardController] that delegates to the current [LocalTextInputService].
+     * Return a [SoftwareKeyboardController] that can control the current software keyboard.
      *
-     * Returns null if there is no [LocalTextInputService] and the software keyboard cannot be
-     * controlled.
+     * If it is not provided, the default implementation will delegate to [LocalTextInputService].
+     *
+     * Returns null if the software keyboard cannot be controlled.
      */
     @ExperimentalComposeUiApi
     public val current: SoftwareKeyboardController?
         @Composable get() {
-            val textInputService = LocalTextInputService.current ?: return null
-            return remember(textInputService) {
-                DelegatingSotwareKeyboardController(textInputService)
-            }
+            return LocalSoftwareKeyboardController.current ?: delegatingController()
         }
+
+    @Composable
+    private fun delegatingController(): SoftwareKeyboardController? {
+        val textInputService = LocalTextInputService.current ?: return null
+        return remember(textInputService) {
+            DelegatingSoftwareKeyboardController(textInputService)
+        }
+    }
+
+    /**
+     * Set the key [LocalSoftwareKeyboardController] in [CompositionLocalProvider].
+     */
+    public infix fun provides(
+        softwareKeyboardController: SoftwareKeyboardController
+    ): ProvidedValue<SoftwareKeyboardController?> {
+        return LocalSoftwareKeyboardController.provides(softwareKeyboardController)
+    }
 }
 
 @ExperimentalComposeUiApi
-private class DelegatingSotwareKeyboardController(
-    val textInputService: TextInputService?
+private class DelegatingSoftwareKeyboardController(
+    val textInputService: TextInputService
 ) : SoftwareKeyboardController {
-    override fun showSoftwareKeyboard() {
-        textInputService?.showSoftwareKeyboard()
+    override fun show() {
+        @Suppress("DEPRECATION")
+        textInputService.showSoftwareKeyboard()
     }
 
-    override fun hideSoftwareKeyboard() {
-        textInputService?.hideSoftwareKeyboard()
+    override fun hide() {
+        @Suppress("DEPRECATION")
+        textInputService.hideSoftwareKeyboard()
     }
 }
\ No newline at end of file

compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/SoftwareKeyboardController.kt

diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/SoftwareKeyboardController.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/SoftwareKeyboardController.kt
index 5150781..339684b 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/SoftwareKeyboardController.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/SoftwareKeyboardController.kt
@@ -16,12 +16,14 @@
 
 package androidx.compose.ui.platform
 
+import androidx.compose.runtime.Stable
 import androidx.compose.ui.ExperimentalComposeUiApi
 
 /**
  * Provide software keyboard control.
  */
 @ExperimentalComposeUiApi
+@Stable
 interface SoftwareKeyboardController {
     /**
      * Request that the system show a software keyboard.
@@ -37,13 +39,22 @@
      *
      * @sample androidx.compose.ui.samples.SoftwareKeyboardControllerSample
      *
-     * You do not need to call this function unless you also call [hideSoftwareKeyboard], as the
+     * You do not need to call this function unless you also call [hide], as the
      * keyboard is automatically shown and hidden by focus events in the BasicTextField.
      *
      * Calling this function is considered a side-effect and should not be called directly from
      * recomposition.
      */
-    fun showSoftwareKeyboard()
+    fun show()
+
+    /**
+     * @see show
+     */
+    @Deprecated(
+        "Use show instead.",
+        ReplaceWith("show()")
+    )
+    fun showSoftwareKeyboard() = show()
 
     /**
      * Hide the software keyboard.
@@ -56,5 +67,14 @@
      * Calling this function is considered a side-effect and should not be called directly from
      * recomposition.
      */
-    fun hideSoftwareKeyboard()
+    fun hide()
+
+    /**
+     * @see hide
+     */
+    @Deprecated(
+        "Use hide instead.",
+        ReplaceWith("hide()")
+    )
+    fun hideSoftwareKeyboard() = hide()
 }
\ No newline at end of file

compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/semantics/SemanticsProperties.kt

diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/semantics/SemanticsProperties.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/semantics/SemanticsProperties.kt
index 3e404c8..b4c10ad 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/semantics/SemanticsProperties.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/semantics/SemanticsProperties.kt
@@ -38,13 +38,7 @@
      */
     val ContentDescription = SemanticsPropertyKey<String>(
         name = "ContentDescription",
-        mergePolicy = { parentValue, childValue ->
-            if (parentValue == null) {
-                childValue
-            } else {
-                "$parentValue, $childValue"
-            }
-        }
+        mergePolicy = { parentValue, _ -> parentValue }
     )
 
     /**
@@ -74,8 +68,6 @@
     val SelectableGroup = SemanticsPropertyKey<Unit>("SelectableGroup")
 
     /**
-     * The node is marked as heading for accessibility.
-     *
      * @see SemanticsPropertyReceiver.heading
      */
     val Heading = SemanticsPropertyKey<Unit>("Heading")
@@ -86,6 +78,11 @@
     val Disabled = SemanticsPropertyKey<Unit>("Disabled")
 
     /**
+     * @see SemanticsPropertyReceiver.liveRegion
+     */
+    val LiveRegion = SemanticsPropertyKey<LiveRegionMode>("LiveRegion")
+
+    /**
      * @see SemanticsPropertyReceiver.focused
      */
     val Focused = SemanticsPropertyKey<Boolean>("Focused")
@@ -531,6 +528,24 @@
 }
 
 /**
+ * The mode of live region. Live region indicates to accessibility services they should
+ * automatically notify the user about changes to the node's content description or text, or to
+ * the content descriptions or text of the node's children (where applicable).
+ */
+enum class LiveRegionMode {
+    /**
+     * Live region mode specifying that accessibility services should announce
+     * changes to this node.
+     */
+    Polite,
+    /**
+     * Live region mode specifying that accessibility services should interrupt
+     * ongoing speech to immediately announce changes to this node.
+     */
+    Assertive
+}
+
+/**
  * SemanticsPropertyReceiver is the scope provided by semantics {} blocks, letting you set
  * key/value pairs primarily via extension functions.
  */
@@ -593,9 +608,23 @@
 }
 
 /**
- * Whether this semantics node is focused.
+ * This node is marked as live region for accessibility. This indicates to accessibility services
+ * they should automatically notify the user about changes to the node's content description or
+ * text, or to the content descriptions or text of the node's children (where applicable). It
+ * should be used with caution, especially with assertive mode which immediately stops the
+ * current audio and the user does not hear the rest of the content. An example of proper use is
+ * a Snackbar which is marked as [LiveRegionMode.Polite].
  *
- * @See SemanticsProperties.Focused
+ * @see SemanticsProperties.LiveRegion
+ * @see LiveRegionMode
+ */
+var SemanticsPropertyReceiver.liveRegion by SemanticsProperties.LiveRegion
+
+/**
+ * Whether this semantics node is focused. The presence of this property indicates this node is
+ * focusable
+ *
+ * @see SemanticsProperties.Focused
  */
 var SemanticsPropertyReceiver.focused by SemanticsProperties.Focused
 

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/desktop/ComposeLayer.desktop.kt

diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/desktop/ComposeLayer.desktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/desktop/ComposeLayer.desktop.kt
index 6f3e90e..25b5672 100644
--- a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/desktop/ComposeLayer.desktop.kt
+++ b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/desktop/ComposeLayer.desktop.kt
@@ -32,7 +32,6 @@
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.swing.Swing
 import org.jetbrains.skija.Canvas
-import org.jetbrains.skiko.HardwareLayer
 import org.jetbrains.skiko.SkiaLayer
 import org.jetbrains.skiko.SkiaRenderer
 import java.awt.Point
@@ -113,7 +112,7 @@
             get() = this@ComposeLayer.density
     }
 
-    val component: HardwareLayer
+    val component: SkiaLayer
         get() = wrapped
 
     init {

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/desktop/ComposeWindow.desktop.kt

diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/desktop/ComposeWindow.desktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/desktop/ComposeWindow.desktop.kt
index 08be312..4092541 100644
--- a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/desktop/ComposeWindow.desktop.kt
+++ b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/desktop/ComposeWindow.desktop.kt
@@ -18,6 +18,7 @@
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionContext
 import org.jetbrains.skiko.ClipComponent
+import org.jetbrains.skiko.GraphicsApi
 import java.awt.Component
 import javax.swing.JFrame
 import javax.swing.JLayeredPane
@@ -86,4 +87,18 @@
             layer.component.requestFocus()
         }
     }
+
+    /**
+     * Retrieve underlying platform-specific operating system handle for the window where ComposeWindow is rendered.
+     * Currently returns HWND on Windows, Drawable on X11 and 0 on macOS.
+     */
+    val windowHandle: Long
+        get() = layer.component.windowHandle
+
+    /**
+     * Returns low level rendering API used for rendering in this ComposeWindow. API is automatically selected based on
+     * operating system, graphical hardware and `SKIKO_RENDER_API` environment variable.
+     */
+    val renderApi: GraphicsApi
+        get() = layer.component.renderApi
 }

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/res/DesktopSvgResources.desktop.kt

diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/res/DesktopSvgResources.desktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/res/DesktopSvgResources.desktop.kt
index 3aca662..7bf3dd9 100644
--- a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/res/DesktopSvgResources.desktop.kt
+++ b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/res/DesktopSvgResources.desktop.kt
@@ -31,7 +31,7 @@
 import androidx.compose.ui.unit.IntSize
 import org.jetbrains.skija.Data
 import org.jetbrains.skija.Point
-import org.jetbrains.skija.svg.DOM
+import org.jetbrains.skija.svg.SVGDOM
 import java.io.InputStream
 import kotlin.math.ceil
 
@@ -62,15 +62,15 @@
  */
 fun loadSvgResource(inputStream: InputStream, density: Density): Painter {
     val data = Data.makeFromBytes(inputStream.readAllBytes())
-    return SVGPainter(DOM(data), density)
+    return SVGPainter(SVGDOM(data), density)
 }
 
 private class SVGPainter(
-    private val dom: DOM,
+    private val SVGDOM: SVGDOM,
     private val density: Density
 ) : Painter() {
     private val defaultSizePx: Size = run {
-        val containerSize = dom.containerSize
+        val containerSize = SVGDOM.containerSize
         if (containerSize.x == 0f && containerSize.y == 0f) {
             Size.Unspecified
         } else {
@@ -119,8 +119,8 @@
 
     private fun DrawScope.drawSvg(size: Size) {
         drawIntoCanvas {
-            dom.containerSize = Point(size.width, size.height)
-            dom.render(it.nativeCanvas)
+            SVGDOM.containerSize = Point(size.width, size.height)
+            SVGDOM.render(it.nativeCanvas)
         }
     }
 }
\ No newline at end of file

core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/ShortcutInfoChangeListenerImpl.java

diff --git a/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/ShortcutInfoChangeListenerImpl.java b/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/ShortcutInfoChangeListenerImpl.java
index a128c92..506441c 100644
--- a/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/ShortcutInfoChangeListenerImpl.java
+++ b/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/ShortcutInfoChangeListenerImpl.java
@@ -18,6 +18,7 @@
 
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
+import static androidx.core.google.shortcuts.ShortcutUtils.CAPABILITY_PARAM_SEPARATOR;
 import static androidx.core.google.shortcuts.ShortcutUtils.SHORTCUT_DESCRIPTION_KEY;
 import static androidx.core.google.shortcuts.ShortcutUtils.SHORTCUT_LABEL_KEY;
 import static androidx.core.google.shortcuts.ShortcutUtils.SHORTCUT_URL_KEY;
@@ -180,13 +181,14 @@
                 }
 
                 if (shortcut.getExtras() == null
-                        || shortcut.getExtras().getStringArray(capability) == null) {
-                    // Shortcut has a capability binding without parameters.
+                        || shortcut.getExtras().getStringArray(capability) == null
+                        || shortcut.getExtras().getStringArray(capability).length == 0) {
+                    // Shortcut has a capability binding without any parameter binding.
                     partOfList.add(buildPartOfIndexable(capability, null));
                 } else {
                     String[] params = shortcut.getExtras().getStringArray(capability);
                     for (String param : params) {
-                        String capabilityParam = capability + "/" + param;
+                        String capabilityParam = capability + CAPABILITY_PARAM_SEPARATOR + param;
                         partOfList.add(buildPartOfIndexable(capabilityParam,
                                 shortcut.getExtras().getStringArray(capabilityParam)));
                     }

core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/ShortcutUtils.java

diff --git a/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/ShortcutUtils.java b/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/ShortcutUtils.java
index 6977b7b..503deb2 100644
--- a/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/ShortcutUtils.java
+++ b/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/ShortcutUtils.java
@@ -35,6 +35,7 @@
     public static final String SHORTCUT_DESCRIPTION_KEY = "shortcutDescription";
     public static final String SHORTCUT_URL_KEY = "shortcutUrl";
     public static final String ID_KEY = "id";
+    public static final String CAPABILITY_PARAM_SEPARATOR = "/";
 
     private static final String APP_ACTION_CAPABILITY_PREFIX = "actions.intent.";
 
@@ -69,8 +70,8 @@
         return shortcutIntent.toUri(0);
     }
 
-    public static boolean isAppActionCapability(String category) {
-        return category.startsWith(APP_ACTION_CAPABILITY_PREFIX);
+    public static boolean isAppActionCapability(@NonNull final String capability) {
+        return capability.startsWith(APP_ACTION_CAPABILITY_PREFIX);
     }
 
     private ShortcutUtils() {}

development/auto-version-updater/README.md

diff --git a/development/auto-version-updater/README.md b/development/auto-version-updater/README.md
new file mode 100644
index 0000000..f4a7d8d
--- /dev/null
+++ b/development/auto-version-updater/README.md
@@ -0,0 +1,26 @@
+# Auto Version Updater
+
+This script will update versions in LibraryVersions.kt based on Jetpad.
+
+It automatically runs `updateApi` and `repo upload . --cbr --label Presubmit-Ready+1`.
+
+### Using the script
+
+```bash
+./update_versions_for_release.py 1234
+```
+
+Where 1234 is the Jetpad release id.
+
+To use it without creating a commit and uploading a comment, run:
+
+```bash
+./update_versions_for_release.py 1234 --no-commit
+```
+
+### Testing the script
+
+Script test suite
+```bash
+./test_update_versions_for_release.py
+```
\ No newline at end of file

development/auto-version-updater/test_update_versions_for_release.py

diff --git a/development/auto-version-updater/test_update_versions_for_release.py b/development/auto-version-updater/test_update_versions_for_release.py
new file mode 100755
index 0000000..aa3648a
--- /dev/null
+++ b/development/auto-version-updater/test_update_versions_for_release.py
@@ -0,0 +1,91 @@
+#!/usr/bin/python3
+#
+# Copyright (C) 2020 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import unittest
+import os
+from update_versions_for_release import *
+
+class TestVersionUpdates(unittest.TestCase):
+
+    def test_increment_version(self):
+        new_version = increment_version("1.0.0-alpha01")
+        self.assertEqual("1.0.0-alpha02", new_version)
+
+        new_version = increment_version("1.1.0-alpha01")
+        self.assertEqual("1.1.0-alpha02", new_version)
+
+        new_version = increment_version("1.0.0-alpha19")
+        self.assertEqual("1.0.0-alpha20", new_version)
+
+        new_version = increment_version("1.0.0-rc01")
+        self.assertEqual("1.1.0-alpha01", new_version)
+
+        new_version = increment_version("1.3.0-beta02")
+        self.assertEqual("1.3.0-beta03", new_version)
+
+        new_version = increment_version("1.0.1")
+        self.assertEqual("1.1.0-alpha01", new_version)
+
+    def test_get_higher_version(self):
+        higher_version = get_higher_version("1.0.0-alpha01", "1.0.0-alpha02")
+        self.assertEqual("1.0.0-alpha02", higher_version)
+
+        higher_version = get_higher_version("1.0.0-alpha02", "1.0.0-alpha01")
+        self.assertEqual("1.0.0-alpha02", higher_version)
+
+        higher_version = get_higher_version("1.0.0-alpha02", "1.0.0-alpha02")
+        self.assertEqual("1.0.0-alpha02", higher_version)
+
+        higher_version = get_higher_version("1.1.0-alpha01", "1.0.0-alpha02")
+        self.assertEqual("1.1.0-alpha01", higher_version)
+
+        higher_version = get_higher_version("1.0.0-rc05", "1.2.0-beta02")
+        self.assertEqual("1.2.0-beta02", higher_version)
+
+        higher_version = get_higher_version("1.3.0-beta01", "1.5.0-beta01")
+        self.assertEqual("1.5.0-beta01", higher_version)
+
+        higher_version = get_higher_version("3.0.0-alpha01", "1.0.0-alpha02")
+        self.assertEqual("3.0.0-alpha01", higher_version)
+
+        higher_version = get_higher_version("1.0.0-beta01", "1.0.0-rc01")
+        self.assertEqual("1.0.0-rc01", higher_version)
+
+        higher_version = get_higher_version("1.4.0-beta01", "1.0.2")
+        self.assertEqual("1.4.0-beta01", higher_version)
+
+        higher_version = get_higher_version("1.4.0-beta01", "1.4.2")
+        self.assertEqual("1.4.2", higher_version)
+
+        higher_version = get_higher_version("1.4.0", "1.4.2")
+        self.assertEqual("1.4.2", higher_version)
+
+    def test_should_update_version_in_library_versions_kt(self):
+        generic_line = "    val CONTENTPAGER = Version(\"1.1.0-alpha01\")"
+        compose_line = "    val COMPOSE = Version(System.getenv(\"COMPOSE_CUSTOM_VERSION\") ?: \"1.0.0-beta04\")"
+        self.assertTrue(should_update_version_in_library_versions_kt(generic_line, "1.1.0-alpha02"))
+        self.assertTrue(should_update_version_in_library_versions_kt(generic_line, "1.3.0-alpha01"))
+        self.assertFalse(should_update_version_in_library_versions_kt(generic_line, "1.0.0-alpha01"))
+
+        self.assertTrue(should_update_version_in_library_versions_kt(compose_line, "1.1.0-alpha02"))
+        self.assertTrue(should_update_version_in_library_versions_kt(compose_line, "1.3.0-alpha01"))
+        self.assertFalse(should_update_version_in_library_versions_kt(compose_line, "1.0.0-alpha01"))
+
+
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file

development/auto-version-updater/update_versions_for_release.py

diff --git a/development/auto-version-updater/update_versions_for_release.py b/development/auto-version-updater/update_versions_for_release.py
new file mode 100755
index 0000000..7c6f190
--- /dev/null
+++ b/development/auto-version-updater/update_versions_for_release.py
@@ -0,0 +1,324 @@
+#!/usr/bin/python3
+#
+# Copyright (C) 2020 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+import sys
+import os
+import argparse
+from datetime import date
+import subprocess
+from shutil import rmtree
+from shutil import copyfile
+from distutils.dir_util import copy_tree
+from distutils.dir_util import DistutilsFileError
+
+# Import the JetpadClient from the parent directory
+sys.path.append("..")
+from JetpadClient import *
+
+# cd into directory of script
+os.chdir(os.path.dirname(os.path.abspath(__file__)))
+
+FRAMEWORKS_SUPPORT_FP = os.path.abspath(os.path.join(os.getcwd(), '..', '..'))
+LIBRARY_VERSIONS_REL = './buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt'
+LIBRARY_VERSIONS_FP = os.path.join(FRAMEWORKS_SUPPORT_FP, LIBRARY_VERSIONS_REL)
+
+# Set up input arguments
+parser = argparse.ArgumentParser(
+    description=("""Updates androidx library versions for a given release date.
+        This script takes in a the release date as millisecond since the epoch,
+        which is the unique id for the release in Jetpad.  It queries the
+        Jetpad db, then creates an output json file with the release information.
+        Finally, updates LibraryVersions.kt and runs updateApi."""))
+parser.add_argument(
+    'date',
+    help='Milliseconds since epoch')
+parser.add_argument(
+    '--no-commit', action="store_true",
+    help='If specified, this script will not commit the changes')
+
+def print_e(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
+
+
+def ask_yes_or_no(question):
+    """Primpts a yes or no question to the user.
+
+    Args:
+        question: the question to asked.
+
+    Returns:
+        boolean representing yes or no.
+    """
+    while(True):
+        reply = str(input(question+' (y/n): ')).lower().strip()
+        if reply:
+            if reply[0] == 'y': return True
+            if reply[0] == 'n': return False
+        print("Please respond with y/n")
+
+
+def run_update_api():
+    """Runs updateApi from the frameworks/support root.
+    """
+    gradle_cmd = "cd " + FRAMEWORKS_SUPPORT_FP + " && ./gradlew updateApi"
+    try:
+        subprocess.check_output(gradle_cmd, stderr=subprocess.STDOUT, shell=True)
+    except subprocess.CalledProcessError:
+        print_e('FAIL: Unable run updateApi with command: %s' % gradle_cmd)
+        return None
+    return True
+
+
+def convert_prerelease_type_to_num(prerelease_type):
+    """" Convert a prerelease suffix type to its numeric equivalent.
+
+    Args:
+        prerelease_type: the androidx SemVer version prerelease suffix.
+
+    Returns:
+        An int representing that suffix.
+    """
+    if prerelease_type == 'alpha':
+        return 0
+    if prerelease_type == 'beta':
+        return 1
+    if prerelease_type == 'rc':
+        return 2
+    # Stable defaults to 9
+    return 9
+
+
+def parse_version(version):
+    """Converts a SemVer androidx version string into a list of ints.
+
+    Accepts a SemVer androidx version string, such as "1.2.0-alpha02" and
+    returns a list of integers representing the version in the following format:
+    [<major>,<minor>,<bugfix>,<prerelease-suffix>,<prerelease-suffix-revision>]
+    For example 1.2.0-alpha02" returns [1,2,0,0,2]
+
+    Args:
+        version: the androidx version string.
+
+    Returns:
+        a list of integers representing the version.
+    """
+    version_elements = version.split('-')[0].split('.')
+    version_list = []
+    for element in version_elements:
+        version_list.append(int(element))
+    # Check if version contains prerelease suffix
+    version_prerelease_suffix = version.split('-')[-1]
+    # Account for suffixes with only 1 suffix number, i.e. "1.1.0-alphaX"
+    version_prerelease_suffix_rev = version_prerelease_suffix[-2:]
+    version_prerelease_suffix_type = version_prerelease_suffix[:-2]
+    if not version_prerelease_suffix_rev.isnumeric():
+        version_prerelease_suffix_rev = version_prerelease_suffix[-1:]
+        version_prerelease_suffix_type = version_prerelease_suffix[:-1]
+    version_list.append(convert_prerelease_type_to_num(version_prerelease_suffix_type))
+    if version.find("-") == -1:
+        # Version contains no prerelease suffix
+        version_list.append(99)
+    else:
+        version_list.append(int(version_prerelease_suffix_rev))
+    return version_list
+
+
+def get_higher_version(version_a, version_b):
+    """Given two androidx SemVer versions, returns the greater one.
+
+    Args:
+        version_a: first version to be compared.
+        version_b: second version to be compared.
+
+    Returns:
+        The greater of version_a and version_b.
+    """
+    version_a_list = parse_version(version_a)
+    version_b_list = parse_version(version_b)
+    for i in range(len(version_a_list)):
+        if version_a_list[i] > version_b_list[i]:
+            return version_a
+        if version_a_list[i] < version_b_list[i]:
+            return version_b
+    return version_a
+
+
+def should_update_version_in_library_versions_kt(line, new_version):
+    """Returns true if the new_version is greater than the version in line.
+
+    Args:
+        line: a line in LibraryVersions.kt file.
+        new_version: the version to check again.
+
+    Returns:
+        True if should update version, false otherwise.
+    """
+    if 'Version(' not in line:
+        return False
+    # Find the first piece with a numeric first character.
+    split_current_line = line.split('"')
+    i = 1
+    while (not split_current_line[i][0].isnumeric() and
+           i < len(split_current_line)):
+        i += 1
+    if i == len(split_current_line):
+        return False
+    version = split_current_line[i]
+    return new_version == get_higher_version(version, new_version)
+
+
+def increment_version(version):
+    """Increments an androidx SemVer version.
+
+    If the version is alpha or beta, the suffix is simply incremented.
+    Otherwise, it chooses the next minor version.
+
+    Args:
+        version: the version to be incremented.
+
+    Returns:
+        The incremented version.
+    """
+    if "alpha" in version or "beta" in version:
+        version_prerelease_suffix = version[-2:]
+        new_version_prerelease_suffix = int(version_prerelease_suffix) + 1
+        new_version = version[:-2] + "%02d" % (new_version_prerelease_suffix,)
+    else:
+        version_minor = version.split(".")[1]
+        new_version_minor = str(int(version_minor) + 1)
+        new_version = version.split(".")[0] + "." + new_version_minor + ".0-alpha01"
+    return new_version
+
+
+def update_versions_in_library_versions_kt(group_id, artifact_id, old_version):
+    """Updates the versions in the LibrarVersions.kt file.
+
+    This will take the old_version and increment it to find the appropriate
+    new version.
+
+    Args:
+        group_id: group_id of the existing library
+        artifact_id: artifact_id of the existing library
+        old_version: old version of the existing library
+
+    Returns:
+        True if the version was updated, false otherwise.
+    """
+    group_id_variable_name = group_id.replace("androidx.","").replace(".","_").upper()
+    artifact_id_variable_name = artifact_id.replace("androidx.","").replace("-","_").upper()
+    new_version = increment_version(old_version)
+    # Special case Compose because it uses the same version variable.
+    if group_id_variable_name.startswith("COMPOSE"):
+        group_id_variable_name = "COMPOSE"
+
+    # Open file for reading and get all lines
+    with open(LIBRARY_VERSIONS_FP, 'r') as f:
+        library_versions_lines = f.readlines()
+    num_lines = len(library_versions_lines)
+    updated_version = False
+
+    # First check any artifact ids with unique versions.
+    for i in range(num_lines):
+        cur_line = library_versions_lines[i]
+        # Skip any line that doesn't declare a version
+        if 'Version(' not in cur_line: continue
+        version_variable_name = cur_line.split('val ')[1].split(' =')[0]
+        if artifact_id_variable_name == version_variable_name:
+            if not should_update_version_in_library_versions_kt(cur_line, new_version):
+                break
+            # Found the correct variable to modify
+            if version_variable_name == "COMPOSE":
+                new_version_line = ("    val COMPOSE = Version("
+                                    "System.getenv(\"COMPOSE_CUSTOM_VERSION\") "
+                                    "?: \"" + new_version + "\")\n")
+            else:
+                new_version_line = "    val " + version_variable_name + \
+                                   " = Version(\"" + new_version + "\")\n"
+            library_versions_lines[i] = new_version_line
+            updated_version = True
+            break
+
+    if not updated_version:
+        # Then check any group ids.
+        for i in range(num_lines):
+            cur_line = library_versions_lines[i]
+            # Skip any line that doesn't declare a version
+            if 'Version(' not in cur_line: continue
+            version_variable_name = cur_line.split('val ')[1].split(' =')[0]
+            if group_id_variable_name == version_variable_name:
+                if not should_update_version_in_library_versions_kt(cur_line, new_version):
+                    break
+                # Found the correct variable to modify
+                if version_variable_name == "COMPOSE":
+                    new_version_line = ("    val COMPOSE = Version("
+                                        "System.getenv(\"COMPOSE_CUSTOM_VERSION\") "
+                                        "?: \"" + new_version + "\")\n")
+                else:
+                    new_version_line = "    val " + version_variable_name + \
+                                       " = Version(\"" + new_version + "\")\n"
+                library_versions_lines[i] = new_version_line
+                updated_version = True
+                break
+
+    # Open file for writing and update all lines
+    with open(LIBRARY_VERSIONS_FP, 'w') as f:
+        f.writelines(library_versions_lines)
+    return updated_version
+
+
+def commit_updates(release_date):
+    subprocess.check_call(['git', 'add', '.'])
+    # ensure that we've actually made a change:
+    staged_changes = subprocess.check_output('git diff --cached', stderr=subprocess.STDOUT, shell=True)
+    if not staged_changes:
+        return
+    msg = "Update versions for release id %s\n\nThis commit was generated from the command:\n%s\n\n%s" % (release_date, " ".join(sys.argv), 'Test: ./gradlew checkApi')
+    subprocess.check_call(['git', 'commit', '-m', msg])
+    subprocess.check_call(['repo', 'upload', '--cbr', '--label', 'Presubmit-Ready+1'])
+
+
+def main(args):
+    # Parse arguments and check for existence of build ID or file
+    args = parser.parse_args()
+    if not args.date:
+        parser.error("You must specify a release date in Milliseconds since epoch")
+        sys.exit(1)
+    release_json_object = getJetpadRelease(args.date, False)
+    non_updated_libraries = []
+    for group_id in release_json_object["modules"]:
+        for artifact in release_json_object["modules"][group_id]:
+            updated = update_versions_in_library_versions_kt(group_id,
+                artifact["artifactId"], artifact["version"])
+            if not updated:
+                non_updated_libraries.append("%s:%s:%s" % (group_id,
+                                             artifact["artifactId"],
+                                             artifact["version"]))
+    if non_updated_libraries:
+        print("The following libraries were not updated:")
+        for library in non_updated_libraries:
+            print("\t", library)
+    print("Updated library versions. \nRunning updateApi for the new "
+          "versions, this may take a minute...", end='')
+    if run_update_api():
+        print("done.")
+    else:
+        print_e("failed.  Please investigate manually.")
+    if not args.no_commit:
+        commit_updates(args.date)
+
+
+if __name__ == '__main__':
+    main(sys.argv)

development/build_log_simplifier/messages.ignore

diff --git a/development/build_log_simplifier/messages.ignore b/development/build_log_simplifier/messages.ignore
index 4c612db..32a9a9f 100644
--- a/development/build_log_simplifier/messages.ignore
+++ b/development/build_log_simplifier/messages.ignore
@@ -215,6 +215,7 @@
 DIST_DIR=\$DIST_DIR
 CHECKOUT=\$CHECKOUT
 GRADLE_USER_HOME=\$GRADLE_USER_HOME
+Starting a Gradle Daemon \(subsequent builds will be faster\)
 Downloading file\:\$SUPPORT\/gradle\/wrapper\/\.\.\/\.\.\/\.\.\/\.\.\/tools\/external\/gradle\/gradle\-[0-9]+\.[0-9]+\.[0-9]+\-bin\.zip
 \.\.\.\.\.\.\.\.\.\.[0-9]+%\.\.\.\.\.\.\.\.\.\.[0-9]+%\.\.\.\.\.\.\.\.\.\.[0-9]+%\.\.\.\.\.\.\.\.\.\.\.[0-9]+%\.\.\.\.\.\.\.\.\.\.[0-9]+%\.\.\.\.\.\.\.\.\.\.[0-9]+%\.\.\.\.\.\.\.\.\.\.[0-9]+%\.\.\.\.\.\.\.\.\.\.\.[0-9]+%\.\.\.\.\.\.\.\.\.\.[0-9]+%\.\.\.\.\.\.\.\.\.\.[0-9]+%
 Welcome to Gradle [0-9]+\.[0-9]+\.[0-9]+\!
@@ -553,6 +554,7 @@
 java\.lang\.Object androidx\.compose\.foundation\.gestures\.DragGestureDetectorKt\.awaitHorizontalTouchSlopOrCancellation\-jO[0-9]+t[0-9]+\(androidx\.compose\.ui\.input\.pointer\.AwaitPointerEventScope, long, kotlin\.jvm\.functions\.Function[0-9]+, kotlin\.coroutines\.Continuation\)
 java\.lang\.Object androidx\.compose\.foundation\.gestures\.TransformGestureDetectorKt\$detectTransformGestures\$[0-9]+\$[0-9]+\.invokeSuspend\(java\.lang\.Object\)
 Type information in locals\-table is inconsistent\. Cannot constrain type: INT for value: v[0-9]+\(index\$iv\$iv\) by constraint FLOAT\.
+java\.lang\.Object androidx\.compose\.foundation\.gestures\.TapGestureDetectorKt\.translatePointerEventsToChannel\(androidx\.compose\.ui\.input\.pointer\.AwaitPointerEventScope, kotlinx\.coroutines\.CoroutineScope, kotlinx\.coroutines\.channels\.SendChannel, androidx\.compose\.runtime\.State, androidx\.compose\.runtime\.MutableState, kotlin\.coroutines\.Continuation\)
 java\.lang\.Object androidx\.compose\.foundation\.gestures\.TapGestureDetectorKt\.waitForUpOrCancellation\(androidx\.compose\.ui\.input\.pointer\.AwaitPointerEventScope, kotlin\.coroutines\.Continuation\)
 # > Task :preference:preference:compileDebugAndroidTestKotlin
 w\: \$SUPPORT\/preference\/preference\/src\/androidTest\/java\/androidx\/preference\/tests\/PreferenceDialogFragmentCompatTest\.kt\: \([0-9]+\, [0-9]+\)\: \'setTargetFragment\(Fragment\?\, Int\)\: Unit\' is deprecated\. Deprecated in Java
@@ -608,4 +610,4 @@
 # > Task :compose:animation:animation-core:animation-core-benchmark:processReleaseAndroidTestManifest
 \$OUT_DIR\/androidx\/compose\/animation\/animation\-core\/animation\-core\-benchmark\/build\/intermediates\/tmp\/manifest\/androidTest\/release\/manifestMerger[0-9]+\.xml\:[0-9]+\:[0-9]+\-[0-9]+\:[0-9]+ Warning\:
 # > Task :compose:ui:ui-graphics:ui-graphics-benchmark:processReleaseAndroidTestManifest
-\$OUT_DIR\/androidx\/compose\/ui\/ui\-graphics\/ui\-graphics\-benchmark\/build\/intermediates\/tmp\/manifest\/androidTest\/release\/manifestMerger[0-9]+\.xml\:[0-9]+\:[0-9]+\-[0-9]+\:[0-9]+ Warning\:
+\$OUT_DIR\/androidx\/compose\/ui\/ui\-graphics\/ui\-graphics\-benchmark\/build\/intermediates\/tmp\/manifest\/androidTest\/release\/manifestMerger[0-9]+\.xml\:[0-9]+\:[0-9]+\-[0-9]+\:[0-9]+ Warning\:
\ No newline at end of file

docs-public/build.gradle

diff --git a/docs-public/build.gradle b/docs-public/build.gradle
index 94ebd87..ca3554e 100644
--- a/docs-public/build.gradle
+++ b/docs-public/build.gradle
@@ -4,13 +4,13 @@
 }
 
 dependencies {
-    docs("androidx.activity:activity:1.3.0-alpha04")
-    docs("androidx.activity:activity-compose:1.3.0-alpha04")
-    samples("androidx.activity:activity-compose-samples:1.3.0-alpha04")
-    docs("androidx.activity:activity-ktx:1.3.0-alpha04")
+    docs("androidx.activity:activity:1.3.0-alpha05")
+    docs("androidx.activity:activity-compose:1.3.0-alpha05")
+    samples("androidx.activity:activity-compose-samples:1.3.0-alpha05")
+    docs("androidx.activity:activity-ktx:1.3.0-alpha05")
     docs("androidx.ads:ads-identifier:1.0.0-alpha04")
     docs("androidx.ads:ads-identifier-provider:1.0.0-alpha04")
-    docs("androidx.annotation:annotation:1.2.0")
+    docs("androidx.annotation:annotation:1.3.0-alpha01")
     docs("androidx.annotation:annotation-experimental:1.1.0-rc02")
     docs("androidx.appcompat:appcompat:1.3.0-rc01")
     docs("androidx.appcompat:appcompat-resources:1.3.0-rc01")
@@ -18,64 +18,65 @@
     docs("androidx.arch.core:core-runtime:2.1.0")
     docs("androidx.arch.core:core-testing:2.1.0")
     docs("androidx.asynclayoutinflater:asynclayoutinflater:1.0.0")
-    docs("androidx.autofill:autofill:1.1.0")
+    docs("androidx.autofill:autofill:1.2.0-alpha01")
     docs("androidx.benchmark:benchmark-common:1.1.0-alpha01")
     docs("androidx.benchmark:benchmark-junit4:1.1.0-alpha01")
     docs("androidx.biometric:biometric:1.2.0-alpha03")
     docs("androidx.biometric:biometric-ktx:1.2.0-alpha03")
     samples("androidx.biometric:biometric-ktx-samples:1.2.0-alpha03")
     docs("androidx.browser:browser:1.3.0")
-    docs("androidx.camera:camera-camera2:1.1.0-alpha02")
-    docs("androidx.camera:camera-core:1.1.0-alpha02")
-    docs("androidx.camera:camera-extensions:1.0.0-alpha22")
+    docs("androidx.camera:camera-camera2:1.1.0-alpha03")
+    docs("androidx.camera:camera-core:1.1.0-alpha03")
+    docs("androidx.camera:camera-extensions:1.0.0-alpha23")
     stubs(fileTree(dir: "../camera/camera-extensions-stub", include: ["camera-extensions-stub.jar"]))
-    docs("androidx.camera:camera-lifecycle:1.1.0-alpha02")
-    docs("androidx.camera:camera-view:1.0.0-alpha22")
-    docs("androidx.car.app:app:1.0.0-beta01")
+    docs("androidx.camera:camera-lifecycle:1.1.0-alpha03")
+    docs("androidx.camera:camera-view:1.0.0-alpha23")
+    docs("androidx.car.app:app:1.0.0-rc01")
+    docs("androidx.car.app:app-testing:1.0.0-alpha01")
     docs("androidx.cardview:cardview:1.0.0")
     docs("androidx.collection:collection:1.2.0-alpha01")
     docs("androidx.collection:collection-ktx:1.2.0-alpha01")
-    docs("androidx.compose.animation:animation:1.0.0-beta02")
-    docs("androidx.compose.animation:animation-core:1.0.0-beta02")
-    samples("androidx.compose.animation:animation-samples:1.0.0-beta02")
-    samples("androidx.compose.animation:animation-core-samples:1.0.0-beta02")
-    docs("androidx.compose.foundation:foundation:1.0.0-beta02")
-    docs("androidx.compose.foundation:foundation-layout:1.0.0-beta02")
-    samples("androidx.compose.foundation:foundation-layout-samples:1.0.0-beta02")
-    samples("androidx.compose.foundation:foundation-samples:1.0.0-beta02")
-    docs("androidx.compose.material:material:1.0.0-beta02")
-    docs("androidx.compose.material:material-icons-core:1.0.0-beta02")
-    samples("androidx.compose.material:material-icons-core-samples:1.0.0-beta02")
-    docs("androidx.compose.material:material-icons-extended:1.0.0-beta02")
-    docs("androidx.compose.material:material-ripple:1.0.0-beta02")
-    samples("androidx.compose.material:material-samples:1.0.0-beta02")
-    docs("androidx.compose.runtime:runtime:1.0.0-beta02")
-    docs("androidx.compose.runtime:runtime-livedata:1.0.0-beta02")
-    samples("androidx.compose.runtime:runtime-livedata-samples:1.0.0-beta02")
-    docs("androidx.compose.runtime:runtime-rxjava2:1.0.0-beta02")
-    samples("androidx.compose.runtime:runtime-rxjava2-samples:1.0.0-beta02")
-    docs("androidx.compose.runtime:runtime-rxjava3:1.0.0-beta02")
-    samples("androidx.compose.runtime:runtime-rxjava3-samples:1.0.0-beta02")
-    docs("androidx.compose.runtime:runtime-saveable:1.0.0-beta02")
-    samples("androidx.compose.runtime:runtime-saveable-samples:1.0.0-beta02")
-    samples("androidx.compose.runtime:runtime-samples:1.0.0-beta02")
-    docs("androidx.compose.ui:ui:1.0.0-beta02")
-    docs("androidx.compose.ui:ui-geometry:1.0.0-beta02")
-    docs("androidx.compose.ui:ui-graphics:1.0.0-beta02")
-    samples("androidx.compose.ui:ui-graphics-samples:1.0.0-beta02")
-    docs("androidx.compose.ui:ui-test:1.0.0-beta02")
-    docs("androidx.compose.ui:ui-test-junit4:1.0.0-beta02")
-    docs("androidx.compose.ui:ui-text:1.0.0-beta02")
+    docs("androidx.compose.animation:animation:1.0.0-beta03")
+    docs("androidx.compose.animation:animation-core:1.0.0-beta03")
+    samples("androidx.compose.animation:animation-samples:1.0.0-beta03")
+    samples("androidx.compose.animation:animation-core-samples:1.0.0-beta03")
+    docs("androidx.compose.foundation:foundation:1.0.0-beta03")
+    docs("androidx.compose.foundation:foundation-layout:1.0.0-beta03")
+    samples("androidx.compose.foundation:foundation-layout-samples:1.0.0-beta03")
+    samples("androidx.compose.foundation:foundation-samples:1.0.0-beta03")
+    docs("androidx.compose.material:material:1.0.0-beta03")
+    docs("androidx.compose.material:material-icons-core:1.0.0-beta03")
+    samples("androidx.compose.material:material-icons-core-samples:1.0.0-beta03")
+    docs("androidx.compose.material:material-icons-extended:1.0.0-beta03")
+    docs("androidx.compose.material:material-ripple:1.0.0-beta03")
+    samples("androidx.compose.material:material-samples:1.0.0-beta03")
+    docs("androidx.compose.runtime:runtime:1.0.0-beta03")
+    docs("androidx.compose.runtime:runtime-livedata:1.0.0-beta03")
+    samples("androidx.compose.runtime:runtime-livedata-samples:1.0.0-beta03")
+    docs("androidx.compose.runtime:runtime-rxjava2:1.0.0-beta03")
+    samples("androidx.compose.runtime:runtime-rxjava2-samples:1.0.0-beta03")
+    docs("androidx.compose.runtime:runtime-rxjava3:1.0.0-beta03")
+    samples("androidx.compose.runtime:runtime-rxjava3-samples:1.0.0-beta03")
+    docs("androidx.compose.runtime:runtime-saveable:1.0.0-beta03")
+    samples("androidx.compose.runtime:runtime-saveable-samples:1.0.0-beta03")
+    samples("androidx.compose.runtime:runtime-samples:1.0.0-beta03")
+    docs("androidx.compose.ui:ui:1.0.0-beta03")
+    docs("androidx.compose.ui:ui-geometry:1.0.0-beta03")
+    docs("androidx.compose.ui:ui-graphics:1.0.0-beta03")
+    samples("androidx.compose.ui:ui-graphics-samples:1.0.0-beta03")
+    docs("androidx.compose.ui:ui-test:1.0.0-beta03")
+    docs("androidx.compose.ui:ui-test-junit4:1.0.0-beta03")
+    docs("androidx.compose.ui:ui-text:1.0.0-beta03")
     docs("androidx.compose.ui:ui-text-android:1.0.0-alpha06")
-    samples("androidx.compose.ui:ui-text-samples:1.0.0-beta02")
-    docs("androidx.compose.ui:ui-tooling:1.0.0-beta02")
-    docs("androidx.compose.ui:ui-tooling-data:1.0.0-beta02")
-    docs("androidx.compose.ui:ui-unit:1.0.0-beta02")
-    samples("androidx.compose.ui:ui-unit-samples:1.0.0-beta02")
-    docs("androidx.compose.ui:ui-util:1.0.0-beta02")
-    docs("androidx.compose.ui:ui-viewbinding:1.0.0-beta02")
-    samples("androidx.compose.ui:ui-viewbinding-samples:1.0.0-beta02")
-    samples("androidx.compose.ui:ui-samples:1.0.0-beta02")
+    samples("androidx.compose.ui:ui-text-samples:1.0.0-beta03")
+    docs("androidx.compose.ui:ui-tooling:1.0.0-beta03")
+    docs("androidx.compose.ui:ui-tooling-data:1.0.0-beta03")
+    docs("androidx.compose.ui:ui-unit:1.0.0-beta03")
+    samples("androidx.compose.ui:ui-unit-samples:1.0.0-beta03")
+    docs("androidx.compose.ui:ui-util:1.0.0-beta03")
+    docs("androidx.compose.ui:ui-viewbinding:1.0.0-beta03")
+    samples("androidx.compose.ui:ui-viewbinding-samples:1.0.0-beta03")
+    samples("androidx.compose.ui:ui-samples:1.0.0-beta03")
     docs("androidx.concurrent:concurrent-futures:1.1.0")
     docs("androidx.concurrent:concurrent-futures-ktx:1.1.0")
     docs("androidx.contentpager:contentpager:1.0.0")
@@ -83,8 +84,8 @@
     docs("androidx.core:core-role:1.1.0-alpha02")
     docs("androidx.core:core-animation:1.0.0-alpha02")
     docs("androidx.core:core-animation-testing:1.0.0-alpha02")
-    docs("androidx.core:core:1.5.0-rc01")
-    docs("androidx.core:core-ktx:1.5.0-rc01")
+    docs("androidx.core:core:1.6.0-alpha01")
+    docs("androidx.core:core-ktx:1.6.0-alpha01")
     docs("androidx.cursoradapter:cursoradapter:1.0.0")
     docs("androidx.customview:customview:1.1.0")
     docs("androidx.datastore:datastore:1.0.0-alpha08")
@@ -121,31 +122,31 @@
     docs("androidx.leanback:leanback-paging:1.1.0-alpha07")
     docs("androidx.leanback:leanback-preference:1.1.0-beta01")
     docs("androidx.leanback:leanback-tab:1.1.0-beta01")
-    docs("androidx.lifecycle:lifecycle-common:2.3.1")
-    docs("androidx.lifecycle:lifecycle-common-java8:2.3.1")
+    docs("androidx.lifecycle:lifecycle-common:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-common-java8:2.4.0-alpha01")
     docs("androidx.lifecycle:lifecycle-extensions:2.2.0")
-    docs("androidx.lifecycle:lifecycle-livedata:2.3.1")
-    docs("androidx.lifecycle:lifecycle-livedata-core:2.3.1")
-    docs("androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.1")
-    docs("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
-    docs("androidx.lifecycle:lifecycle-process:2.3.1")
-    docs("androidx.lifecycle:lifecycle-reactivestreams:2.3.1")
-    docs("androidx.lifecycle:lifecycle-reactivestreams-ktx:2.3.1")
-    docs("androidx.lifecycle:lifecycle-runtime:2.3.1")
-    docs("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1")
-    docs("androidx.lifecycle:lifecycle-runtime-testing:2.3.1")
-    docs("androidx.lifecycle:lifecycle-service:2.3.1")
-    docs("androidx.lifecycle:lifecycle-viewmodel:2.3.1")
+    docs("androidx.lifecycle:lifecycle-livedata:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-livedata-core:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-livedata-core-ktx:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-process:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-reactivestreams:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-reactivestreams-ktx:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-runtime:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-runtime-testing:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-service:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-viewmodel:2.4.0-alpha01")
     docs("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03")
-    docs("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
-    docs("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1")
+    docs("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0-alpha01")
+    docs("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0-alpha01")
     docs("androidx.loader:loader:1.1.0")
     docs("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0-alpha01")
     docs("androidx.media2:media2-common:1.1.2")
     docs("androidx.media2:media2-player:1.1.2")
     docs("androidx.media2:media2-session:1.1.2")
     docs("androidx.media2:media2-widget:1.1.2")
-    docs("androidx.media:media:1.3.0-rc01")
+    docs("androidx.media:media:1.3.0-rc02")
     docs("androidx.mediarouter:mediarouter:1.2.2")
     docs("androidx.navigation:navigation-common:2.3.4")
     docs("androidx.navigation:navigation-common-ktx:2.3.4")
@@ -160,16 +161,16 @@
     docs("androidx.navigation:navigation-testing:2.3.4")
     docs("androidx.navigation:navigation-ui:2.3.4")
     docs("androidx.navigation:navigation-ui-ktx:2.3.4")
-    docs("androidx.paging:paging-common:3.0.0-beta02")
-    docs("androidx.paging:paging-common-ktx:3.0.0-beta02")
+    docs("androidx.paging:paging-common:3.0.0-beta03")
+    docs("androidx.paging:paging-common-ktx:3.0.0-beta03")
     docs("androidx.paging:paging-compose:1.0.0-alpha08")
     samples("androidx.paging:paging-compose-samples:3.0.0-alpha08")
-    docs("androidx.paging:paging-guava:3.0.0-beta02")
-    docs("androidx.paging:paging-runtime:3.0.0-beta02")
-    docs("androidx.paging:paging-runtime-ktx:3.0.0-beta02")
-    docs("androidx.paging:paging-rxjava2:3.0.0-beta02")
-    docs("androidx.paging:paging-rxjava2-ktx:3.0.0-beta02")
-    docs("androidx.paging:paging-rxjava3:3.0.0-beta02")
+    docs("androidx.paging:paging-guava:3.0.0-beta03")
+    docs("androidx.paging:paging-runtime:3.0.0-beta03")
+    docs("androidx.paging:paging-runtime-ktx:3.0.0-beta03")
+    docs("androidx.paging:paging-rxjava2:3.0.0-beta03")
+    docs("androidx.paging:paging-rxjava2-ktx:3.0.0-beta03")
+    docs("androidx.paging:paging-rxjava3:3.0.0-beta03")
     samples("androidx.paging:paging-samples:3.0.0-beta01")
     docs("androidx.palette:palette:1.0.0")
     docs("androidx.palette:palette-ktx:1.0.0")
@@ -178,17 +179,18 @@
     docs("androidx.preference:preference-ktx:1.1.1")
     docs("androidx.print:print:1.1.0-beta01")
     docs("androidx.recommendation:recommendation:1.0.0")
-    docs("androidx.recyclerview:recyclerview:1.2.0-beta02")
+    docs("androidx.recyclerview:recyclerview:1.2.0-rc01")
     docs("androidx.recyclerview:recyclerview-selection:2.0.0-alpha01")
     docs("androidx.remotecallback:remotecallback:1.0.0-alpha02")
-    docs("androidx.room:room-common:2.3.0-beta03")
-    docs("androidx.room:room-guava:2.3.0-beta03")
-    docs("androidx.room:room-ktx:2.3.0-beta03")
-    docs("androidx.room:room-migration:2.3.0-beta03")
-    docs("androidx.room:room-runtime:2.3.0-beta03")
-    docs("androidx.room:room-rxjava2:2.3.0-beta03")
-    docs("androidx.room:room-rxjava3:2.3.0-beta03")
-    docs("androidx.room:room-testing:2.3.0-beta03")
+    docs("androidx.resourceinspection:resourceinspection-annotation:1.0.0-alpha01")
+    docs("androidx.room:room-common:2.3.0-rc01")
+    docs("androidx.room:room-guava:2.3.0-rc01")
+    docs("androidx.room:room-ktx:2.3.0-rc01")
+    docs("androidx.room:room-migration:2.3.0-rc01")
+    docs("androidx.room:room-runtime:2.3.0-rc01")
+    docs("androidx.room:room-rxjava2:2.3.0-rc01")
+    docs("androidx.room:room-rxjava3:2.3.0-rc01")
+    docs("androidx.room:room-testing:2.3.0-rc01")
     docs("androidx.savedstate:savedstate:1.1.0")
     docs("androidx.savedstate:savedstate-ktx:1.1.0")
     docs("androidx.security:security-crypto:1.1.0-alpha03")
@@ -199,7 +201,7 @@
     docs("androidx.slice:slice-builders-ktx:1.0.0-alpha08")
     docs("androidx.slice:slice-core:1.1.0-alpha02")
     docs("androidx.slice:slice-view:1.1.0-alpha02")
-    docs("androidx.slidingpanelayout:slidingpanelayout:1.1.0")
+    docs("androidx.slidingpanelayout:slidingpanelayout:1.2.0-alpha01")
     docs("androidx.sqlite:sqlite:2.1.0")
     docs("androidx.sqlite:sqlite-framework:2.1.0")
     docs("androidx.sqlite:sqlite-ktx:2.1.0")
@@ -218,29 +220,29 @@
     docs("androidx.versionedparcelable:versionedparcelable:1.1.1")
     docs("androidx.viewpager2:viewpager2:1.1.0-alpha01")
     docs("androidx.viewpager:viewpager:1.0.0")
-    docs("androidx.wear:wear:1.2.0-alpha06")
+    docs("androidx.wear:wear:1.2.0-alpha07")
     stubs(fileTree(dir: "../wear/wear_stubs/", include: ["com.google.android.wearable-stubs.jar"]))
-    docs("androidx.wear:wear-complications-data:1.0.0-alpha09")
-    docs("androidx.wear:wear-complications-provider:1.0.0-alpha09")
+    docs("androidx.wear:wear-complications-data:1.0.0-alpha10")
+    docs("androidx.wear:wear-complications-provider:1.0.0-alpha10")
     docs("androidx.wear:wear-ongoing:1.0.0-alpha03")
     docs("androidx.wear:wear-phone-interactions:1.0.0-alpha03")
     docs("androidx.wear:wear-remote-interactions:1.0.0-alpha02")
     docs("androidx.wear:wear-tiles:1.0.0-alpha01")
     docs("androidx.wear:wear-tiles-renderer:1.0.0-alpha01")
-    docs("androidx.wear:wear-watchface:1.0.0-alpha09")
-    docs("androidx.wear:wear-watchface-client:1.0.0-alpha09")
-    docs("androidx.wear:wear-watchface-client-guava:1.0.0-alpha09")
-    docs("androidx.wear:wear-watchface-complications-rendering:1.0.0-alpha09")
-    docs("androidx.wear:wear-watchface-data:1.0.0-alpha09")
-    docs("androidx.wear:wear-watchface-editor:1.0.0-alpha09")
-    docs("androidx.wear:wear-watchface-editor-guava:1.0.0-alpha09")
-    docs("androidx.wear:wear-watchface-guava:1.0.0-alpha09")
+    docs("androidx.wear:wear-watchface:1.0.0-alpha10")
+    docs("androidx.wear:wear-watchface-client:1.0.0-alpha10")
+    docs("androidx.wear:wear-watchface-client-guava:1.0.0-alpha10")
+    docs("androidx.wear:wear-watchface-complications-rendering:1.0.0-alpha10")
+    docs("androidx.wear:wear-watchface-data:1.0.0-alpha10")
+    docs("androidx.wear:wear-watchface-editor:1.0.0-alpha10")
+    docs("androidx.wear:wear-watchface-editor-guava:1.0.0-alpha10")
+    docs("androidx.wear:wear-watchface-guava:1.0.0-alpha10")
     samples("androidx.wear:wear-watchface-samples:1.0.0-alpha02")
-    docs("androidx.wear:wear-watchface-style:1.0.0-alpha09")
+    docs("androidx.wear:wear-watchface-style:1.0.0-alpha10")
     docs("androidx.wear:wear-input:1.1.0-alpha01")
     docs("androidx.wear:wear-input-testing:1.1.0-alpha01")
     docs("androidx.webkit:webkit:1.4.0")
-    docs("androidx.window:window:1.0.0-alpha04")
+    docs("androidx.window:window:1.0.0-alpha05")
     stubs(fileTree(dir: "../window/stubs/", include: ["window-sidecar-release-0.1.0-alpha01.aar"]))
     stubs(project(":window:window-extensions"))
     docs("androidx.work:work-gcm:2.7.0-alpha01")

docs-tip-of-tree/build.gradle

diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index 9be8054..9111882 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -123,8 +123,6 @@
     docs(project(":hilt:hilt-navigation-fragment"))
     docs(project(":hilt:hilt-work"))
     docs(project(":interpolator:interpolator"))
-    docs(project(":ipc:ipc-annotations"))
-    docs(project(":ipc:ipc-runtime"))
     docs(project(":leanback:leanback"))
     docs(project(":leanback:leanback-paging"))
     docs(project(":leanback:leanback-preference"))
@@ -205,11 +203,6 @@
     docs(project(":security:security-crypto"))
     docs(project(":security:security-crypto-ktx"))
     docs(project(":security:security-identity-credential"))
-    docs(project(":serialization:serialization"))
-    docs(project(":serialization:serialization-annotation"))
-    docs(project(":serialization:serialization-runtime"))
-    docs(project(":serialization:serialization-runtime-parcel"))
-    docs(project(":serialization:serialization-runtime-proto"))
     docs(project(":sharetarget:sharetarget"))
     docs(project(":slice-builders"))
     docs(project(":slice-builders-ktx"))
@@ -244,9 +237,9 @@
     docs(project(":wear:wear-ongoing"))
     docs(project(":wear:wear-phone-interactions"))
     docs(project(":wear:wear-remote-interactions"))
-    docs(project(":wear:wear-tiles"))
-    docs(project(":wear:wear-tiles-proto"))
-    docs(project(":wear:wear-tiles-renderer"))
+    docs(project(":wear:tiles:tiles"))
+    docs(project(":wear:tiles:tiles-proto"))
+    docs(project(":wear:tiles:tiles-renderer"))
     docs(project(":wear:wear-watchface"))
     docs(project(":wear:wear-watchface-complications-rendering"))
     docs(project(":wear:wear-watchface-client"))

emoji/bundled/build.gradle

diff --git a/emoji/bundled/build.gradle b/emoji/bundled/build.gradle
index e32ae51..6629e8d 100644
--- a/emoji/bundled/build.gradle
+++ b/emoji/bundled/build.gradle
@@ -8,7 +8,7 @@
 }
 
 ext {
-    fontDir = project(":noto-emoji-compat").projectDir
+    fontDir = project(":noto-emoji-compat-font").projectDir
 }
 
 android {

emoji/core/build.gradle

diff --git a/emoji/core/build.gradle b/emoji/core/build.gradle
index d412212..2c54100 100644
--- a/emoji/core/build.gradle
+++ b/emoji/core/build.gradle
@@ -12,7 +12,7 @@
 }
 
 ext {
-    fontDir = project(":noto-emoji-compat").projectDir
+    fontDir = project(":noto-emoji-compat-font").projectDir
 }
 
 BundleInsideHelper.forInsideAar(
@@ -22,7 +22,7 @@
 )
 
 dependencies {
-    bundleInside(project(":noto-emoji-compat"))
+    bundleInside(project(":noto-emoji-compat-flatbuffers"))
 
     api("androidx.core:core:1.3.0-rc01")
     implementation("androidx.collection:collection:1.1.0")

emoji2/emoji2-bundled/build.gradle

diff --git a/emoji2/emoji2-bundled/build.gradle b/emoji2/emoji2-bundled/build.gradle
index 3c06a08..9d49183 100644
--- a/emoji2/emoji2-bundled/build.gradle
+++ b/emoji2/emoji2-bundled/build.gradle
@@ -9,7 +9,7 @@
 }
 
 ext {
-    fontDir = project(':noto-emoji-compat').projectDir
+    fontDir = project(':noto-emoji-compat-font').projectDir
 }
 
 android {

emoji2/emoji2/build.gradle

diff --git a/emoji2/emoji2/build.gradle b/emoji2/emoji2/build.gradle
index b85383f..2882681 100644
--- a/emoji2/emoji2/build.gradle
+++ b/emoji2/emoji2/build.gradle
@@ -13,7 +13,7 @@
 }
 
 ext {
-    fontDir = project(':noto-emoji-compat').projectDir
+    fontDir = project(':noto-emoji-compat-font').projectDir
 }
 
 BundleInsideHelper.forInsideAar(
@@ -23,7 +23,7 @@
 )
 
 dependencies {
-    bundleInside(project(":noto-emoji-compat"))
+    bundleInside(project(":noto-emoji-compat-flatbuffers"))
 
     api("androidx.core:core:1.3.0-rc01")
     implementation("androidx.collection:collection:1.1.0")

fragment/fragment/api/public_plus_experimental_current.txt

diff --git a/fragment/fragment/api/public_plus_experimental_current.txt b/fragment/fragment/api/public_plus_experimental_current.txt
index 39da942..d979806 100644
--- a/fragment/fragment/api/public_plus_experimental_current.txt
+++ b/fragment/fragment/api/public_plus_experimental_current.txt
@@ -459,9 +459,17 @@
 
 package androidx.fragment.app.strictmode {
 
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class FragmentReuseViolation extends androidx.fragment.app.strictmode.Violation {
+    ctor public FragmentReuseViolation();
+  }
+
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class FragmentStrictMode {
     method public static androidx.fragment.app.strictmode.FragmentStrictMode.Policy getDefaultPolicy();
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static void onFragmentReuse(androidx.fragment.app.Fragment);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static void onFragmentTagUsage(androidx.fragment.app.Fragment);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static void onRetainInstanceUsage(androidx.fragment.app.Fragment);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static void onSetUserVisibleHint(androidx.fragment.app.Fragment);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static void onTargetFragmentUsage(androidx.fragment.app.Fragment);
     method public static void setDefaultPolicy(androidx.fragment.app.strictmode.FragmentStrictMode.Policy);
   }
 
@@ -476,16 +484,32 @@
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static final class FragmentStrictMode.Policy.Builder {
     ctor public FragmentStrictMode.Policy.Builder();
     method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy build();
+    method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder detectFragmentReuse();
+    method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder detectFragmentTagUsage();
+    method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder detectRetainInstanceUsage();
     method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder detectSetUserVisibleHint();
+    method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder detectTargetFragmentUsage();
     method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder penaltyDeath();
     method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder penaltyListener(androidx.fragment.app.strictmode.FragmentStrictMode.OnViolationListener);
     method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder penaltyLog();
   }
 
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class FragmentTagUsageViolation extends androidx.fragment.app.strictmode.Violation {
+    ctor public FragmentTagUsageViolation();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class RetainInstanceUsageViolation extends androidx.fragment.app.strictmode.Violation {
+    ctor public RetainInstanceUsageViolation();
+  }
+
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class SetUserVisibleHintViolation extends androidx.fragment.app.strictmode.Violation {
     ctor public SetUserVisibleHintViolation();
   }
 
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class TargetFragmentUsageViolation extends androidx.fragment.app.strictmode.Violation {
+    ctor public TargetFragmentUsageViolation();
+  }
+
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public abstract class Violation extends java.lang.RuntimeException {
     ctor public Violation();
   }

fragment/fragment/api/restricted_current.txt

diff --git a/fragment/fragment/api/restricted_current.txt b/fragment/fragment/api/restricted_current.txt
index 889d15a..da99593 100644
--- a/fragment/fragment/api/restricted_current.txt
+++ b/fragment/fragment/api/restricted_current.txt
@@ -485,9 +485,17 @@
 
 package androidx.fragment.app.strictmode {
 
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class FragmentReuseViolation extends androidx.fragment.app.strictmode.Violation {
+    ctor public FragmentReuseViolation();
+  }
+
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class FragmentStrictMode {
     method public static androidx.fragment.app.strictmode.FragmentStrictMode.Policy getDefaultPolicy();
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static void onFragmentReuse(androidx.fragment.app.Fragment);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static void onFragmentTagUsage(androidx.fragment.app.Fragment);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static void onRetainInstanceUsage(androidx.fragment.app.Fragment);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static void onSetUserVisibleHint(androidx.fragment.app.Fragment);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static void onTargetFragmentUsage(androidx.fragment.app.Fragment);
     method public static void setDefaultPolicy(androidx.fragment.app.strictmode.FragmentStrictMode.Policy);
   }
 
@@ -502,16 +510,32 @@
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public static final class FragmentStrictMode.Policy.Builder {
     ctor public FragmentStrictMode.Policy.Builder();
     method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy build();
+    method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder detectFragmentReuse();
+    method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder detectFragmentTagUsage();
+    method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder detectRetainInstanceUsage();
     method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder detectSetUserVisibleHint();
+    method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder detectTargetFragmentUsage();
     method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder penaltyDeath();
     method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder penaltyListener(androidx.fragment.app.strictmode.FragmentStrictMode.OnViolationListener);
     method public androidx.fragment.app.strictmode.FragmentStrictMode.Policy.Builder penaltyLog();
   }
 
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class FragmentTagUsageViolation extends androidx.fragment.app.strictmode.Violation {
+    ctor public FragmentTagUsageViolation();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class RetainInstanceUsageViolation extends androidx.fragment.app.strictmode.Violation {
+    ctor public RetainInstanceUsageViolation();
+  }
+
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class SetUserVisibleHintViolation extends androidx.fragment.app.strictmode.Violation {
     ctor public SetUserVisibleHintViolation();
   }
 
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public final class TargetFragmentUsageViolation extends androidx.fragment.app.strictmode.Violation {
+    ctor public TargetFragmentUsageViolation();
+  }
+
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public abstract class Violation extends java.lang.RuntimeException {
     ctor public Violation();
   }

fragment/fragment/build.gradle

diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle
index 05dc225..115e903 100644
--- a/fragment/fragment/build.gradle
+++ b/fragment/fragment/build.gradle
@@ -29,6 +29,10 @@
     buildTypes.all {
         consumerProguardFiles "proguard-rules.pro"
     }
+
+    defaultConfig {
+        multiDexEnabled true
+    }
 }
 
 dependencies {
@@ -57,6 +61,7 @@
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
     androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+    androidTestImplementation(MULTIDEX)
     androidTestImplementation(project(":internal-testutils-runtime"), {
         exclude group: "androidx.fragment", module: "fragment"
     })

fragment/fragment/src/androidTest/java/androidx/fragment/app/strictmode/FragmentStrictModeTest.kt

diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/strictmode/FragmentStrictModeTest.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/strictmode/FragmentStrictModeTest.kt
index 0e0b17b..669e9f8d 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/strictmode/FragmentStrictModeTest.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/strictmode/FragmentStrictModeTest.kt
@@ -20,6 +20,7 @@
 import androidx.fragment.app.StrictFragment
 import androidx.fragment.app.executePendingTransactions
 import androidx.fragment.app.test.FragmentTestActivity
+import androidx.fragment.test.R
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
@@ -129,6 +130,106 @@
     }
 
     @Test
+    public fun detectFragmentReuse() {
+        var violation: Violation? = null
+        val policy = FragmentStrictMode.Policy.Builder()
+            .detectFragmentReuse()
+            .penaltyListener { violation = it }
+            .build()
+        FragmentStrictMode.setDefaultPolicy(policy)
+
+        with(ActivityScenario.launch(FragmentTestActivity::class.java)) {
+            val fragmentManager = withActivity { supportFragmentManager }
+            val fragment = StrictFragment()
+
+            fragmentManager.beginTransaction()
+                .add(fragment, null)
+                .commit()
+            executePendingTransactions()
+
+            fragmentManager.beginTransaction()
+                .remove(fragment)
+                .commit()
+            executePendingTransactions()
+
+            fragmentManager.beginTransaction()
+                .add(fragment, null)
+                .commit()
+            executePendingTransactions()
+
+            InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+            assertThat(violation).isInstanceOf(FragmentReuseViolation::class.java)
+        }
+    }
+
+    @Test
+    public fun detectFragmentReuseInFlightTransaction() {
+        var violation: Violation? = null
+        val policy = FragmentStrictMode.Policy.Builder()
+            .detectFragmentReuse()
+            .penaltyListener { violation = it }
+            .build()
+        FragmentStrictMode.setDefaultPolicy(policy)
+
+        with(ActivityScenario.launch(FragmentTestActivity::class.java)) {
+            val fragmentManager = withActivity { supportFragmentManager }
+            val fragment = StrictFragment()
+
+            fragmentManager.beginTransaction()
+                .add(fragment, null)
+                .commit()
+            executePendingTransactions()
+
+            fragmentManager.beginTransaction()
+                .remove(fragment)
+                .commit()
+            // Don't execute transaction here, keep it in-flight
+
+            fragmentManager.beginTransaction()
+                .add(fragment, null)
+                .commit()
+            executePendingTransactions()
+
+            InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+            assertThat(violation).isInstanceOf(FragmentReuseViolation::class.java)
+        }
+    }
+
+    @Test
+    public fun detectFragmentTagUsage() {
+        var violation: Violation? = null
+        val policy = FragmentStrictMode.Policy.Builder()
+            .detectFragmentTagUsage()
+            .penaltyListener { violation = it }
+            .build()
+        FragmentStrictMode.setDefaultPolicy(policy)
+
+        with(ActivityScenario.launch(FragmentTestActivity::class.java)) {
+            withActivity { setContentView(R.layout.activity_inflated_fragment) }
+            assertThat(violation).isInstanceOf(FragmentTagUsageViolation::class.java)
+        }
+    }
+
+    @Test
+    public fun detectRetainInstanceUsage() {
+        var violation: Violation? = null
+        val policy = FragmentStrictMode.Policy.Builder()
+            .detectRetainInstanceUsage()
+            .penaltyListener { violation = it }
+            .build()
+        FragmentStrictMode.setDefaultPolicy(policy)
+
+        @Suppress("DEPRECATION")
+        StrictFragment().retainInstance = true
+        assertThat(violation).isInstanceOf(RetainInstanceUsageViolation::class.java)
+
+        violation = null
+        @Suppress("DEPRECATION")
+        StrictFragment().retainInstance
+        assertThat(violation).isInstanceOf(RetainInstanceUsageViolation::class.java)
+    }
+
+    @Test
     public fun detectSetUserVisibleHint() {
         var violation: Violation? = null
         val policy = FragmentStrictMode.Policy.Builder()
@@ -141,4 +242,28 @@
         StrictFragment().userVisibleHint = true
         assertThat(violation).isInstanceOf(SetUserVisibleHintViolation::class.java)
     }
+
+    @Test
+    public fun detectTargetFragmentUsage() {
+        var violation: Violation? = null
+        val policy = FragmentStrictMode.Policy.Builder()
+            .detectTargetFragmentUsage()
+            .penaltyListener { violation = it }
+            .build()
+        FragmentStrictMode.setDefaultPolicy(policy)
+
+        @Suppress("DEPRECATION")
+        StrictFragment().setTargetFragment(StrictFragment(), 1)
+        assertThat(violation).isInstanceOf(TargetFragmentUsageViolation::class.java)
+
+        violation = null
+        @Suppress("DEPRECATION")
+        StrictFragment().targetFragment
+        assertThat(violation).isInstanceOf(TargetFragmentUsageViolation::class.java)
+
+        violation = null
+        @Suppress("DEPRECATION")
+        StrictFragment().targetRequestCode
+        assertThat(violation).isInstanceOf(TargetFragmentUsageViolation::class.java)
+    }
 }

fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java

diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java b/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
index 593dc2a..1dace46 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
@@ -283,6 +283,10 @@
     // track it separately.
     boolean mIsCreated;
 
+    // True if the fragment was already added to a FragmentManager, but has since been removed
+    // again.
+    boolean mRemoved;
+
     // Max Lifecycle state this Fragment can achieve.
     Lifecycle.State mMaxState = Lifecycle.State.RESUMED;
 
@@ -806,6 +810,7 @@
     @SuppressWarnings("ReferenceEquality, deprecation")
     @Deprecated
     public void setTargetFragment(@Nullable Fragment fragment, int requestCode) {
+        FragmentStrictMode.onTargetFragmentUsage(this);
         // Don't allow a caller to set a target fragment in another FragmentManager,
         // but there's a snag: people do set target fragments before fragments get added.
         // We'll have the FragmentManager check that for validity when we move
@@ -853,6 +858,7 @@
     @Nullable
     @Deprecated
     final public Fragment getTargetFragment() {
+        FragmentStrictMode.onTargetFragmentUsage(this);
         if (mTarget != null) {
             // Ensure that any Fragment set with setTargetFragment is immediately
             // available here
@@ -875,6 +881,7 @@
      */
     @Deprecated
     final public int getTargetRequestCode() {
+        FragmentStrictMode.onTargetFragmentUsage(this);
         return mTargetRequestCode;
     }
 
@@ -1233,6 +1240,7 @@
      */
     @Deprecated
     public void setRetainInstance(boolean retain) {
+        FragmentStrictMode.onRetainInstanceUsage(this);
         mRetainInstance = retain;
         if (mFragmentManager != null) {
             if (retain) {
@@ -1259,6 +1267,7 @@
      */
     @Deprecated
     final public boolean getRetainInstance() {
+        FragmentStrictMode.onRetainInstanceUsage(this);
         return mRetainInstance;
     }
 
@@ -2179,6 +2188,7 @@
         mTag = null;
         mHidden = false;
         mDetached = false;
+        mRemoved = true;
     }
 
     /**

fragment/fragment/src/main/java/androidx/fragment/app/FragmentLayoutInflaterFactory.java

diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentLayoutInflaterFactory.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentLayoutInflaterFactory.java
index d1702ac..7826175 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentLayoutInflaterFactory.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentLayoutInflaterFactory.java
@@ -27,6 +27,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.R;
+import androidx.fragment.app.strictmode.FragmentStrictMode;
 
 class FragmentLayoutInflaterFactory implements LayoutInflater.Factory2 {
     private static final String TAG = FragmentManager.TAG;
@@ -130,6 +131,7 @@
                         + "re-attached via the <fragment> tag: id=0x" + Integer.toHexString(id));
             }
         }
+        FragmentStrictMode.onFragmentTagUsage(fragment);
 
         // Explicitly set the container for the fragment as we already know
         // the parent that the fragment will be added to by the LayoutInflater

fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java

diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
index 6484fae..2bd831c 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
@@ -1728,6 +1728,9 @@
     }
 
     FragmentStateManager addFragment(@NonNull Fragment fragment) {
+        if (fragment.mRemoved) {
+            FragmentStrictMode.onFragmentReuse(fragment);
+        }
         if (isLoggingEnabled(Log.VERBOSE)) Log.v(TAG, "add: " + fragment);
         FragmentStateManager fragmentStateManager = createOrGetFragmentStateManager(fragment);
         fragment.mFragmentManager = this;

fragment/fragment/src/main/java/androidx/fragment/app/FragmentTransaction.java

diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentTransaction.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentTransaction.java
index d6a2636..f8a11fb 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentTransaction.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentTransaction.java
@@ -32,6 +32,7 @@
 import androidx.annotation.StringRes;
 import androidx.annotation.StyleRes;
 import androidx.core.view.ViewCompat;
+import androidx.fragment.app.strictmode.FragmentStrictMode;
 import androidx.lifecycle.Lifecycle;
 
 import java.lang.annotation.Retention;
@@ -253,6 +254,9 @@
     }
 
     void doAddOp(int containerViewId, Fragment fragment, @Nullable String tag, int opcmd) {
+        if (fragment.mRemoved) {
+            FragmentStrictMode.onFragmentReuse(fragment);
+        }
         final Class<?> fragmentClass = fragment.getClass();
         final int modifiers = fragmentClass.getModifiers();
         if (fragmentClass.isAnonymousClass() || !Modifier.isPublic(modifiers)

fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentReuseViolation.java

diff --git a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl b/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentReuseViolation.java
similarity index 65%
copy from car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
copy to fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentReuseViolation.java
index e022dc3..f209c61 100644
--- a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentReuseViolation.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package androidx.car.app.model.signin;
+package androidx.fragment.app.strictmode;
 
-import androidx.car.app.IOnDoneCallback;
+import androidx.annotation.RestrictTo;
 
-/** @hide */
-oneway interface IOnInputCompletedListener {
-  void onInputCompleted(String value, IOnDoneCallback callback) = 1;
+/** See #{@link FragmentStrictMode.Policy.Builder#detectFragmentReuse()}. */
+@RestrictTo(RestrictTo.Scope.LIBRARY) // TODO: Make API public as soon as we have a few checks
+public final class FragmentReuseViolation extends Violation {
 }

fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentStrictMode.java

diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentStrictMode.java b/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentStrictMode.java
index 659a6af..1a554d7 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentStrictMode.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentStrictMode.java
@@ -51,7 +51,11 @@
         PENALTY_LOG,
         PENALTY_DEATH,
 
-        DETECT_SET_USER_VISIBLE_HINT
+        DETECT_FRAGMENT_REUSE,
+        DETECT_FRAGMENT_TAG_USAGE,
+        DETECT_RETAIN_INSTANCE_USAGE,
+        DETECT_SET_USER_VISIBLE_HINT,
+        DETECT_TARGET_FRAGMENT_USAGE,
     }
 
     private FragmentStrictMode() {}
@@ -142,6 +146,36 @@
                 return this;
             }
 
+            /**
+             * Detects cases, where a #{@link Fragment} instance is reused, after it was previously
+             * removed from a #{@link FragmentManager}.
+             */
+            @NonNull
+            @SuppressLint("BuilderSetStyle")
+            public Builder detectFragmentReuse() {
+                flags.add(Flag.DETECT_FRAGMENT_REUSE);
+                return this;
+            }
+
+            /** Detects usage of the <fragment> tag inside XML layouts. */
+            @NonNull
+            @SuppressLint("BuilderSetStyle")
+            public Builder detectFragmentTagUsage() {
+                flags.add(Flag.DETECT_FRAGMENT_TAG_USAGE);
+                return this;
+            }
+
+            /**
+             * Detects calls to #{@link Fragment#setRetainInstance} and
+             * #{@link Fragment#getRetainInstance()}.
+             */
+            @NonNull
+            @SuppressLint("BuilderSetStyle")
+            public Builder detectRetainInstanceUsage() {
+                flags.add(Flag.DETECT_RETAIN_INSTANCE_USAGE);
+                return this;
+            }
+
             /** Detects calls to #{@link Fragment#setUserVisibleHint}. */
             @NonNull
             @SuppressLint("BuilderSetStyle")
@@ -151,6 +185,17 @@
             }
 
             /**
+             * Detects calls to #{@link Fragment#setTargetFragment},
+             * #{@link Fragment#getTargetFragment()} and #{@link Fragment#getTargetRequestCode()}.
+             */
+            @NonNull
+            @SuppressLint("BuilderSetStyle")
+            public Builder detectTargetFragmentUsage() {
+                flags.add(Flag.DETECT_TARGET_FRAGMENT_USAGE);
+                return this;
+            }
+
+            /**
              * Construct the Policy instance.
              *
              * <p>Note: if no penalties are enabled before calling <code>build</code>, {@link
@@ -196,6 +241,30 @@
     }
 
     @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public static void onFragmentReuse(@NonNull Fragment fragment) {
+        Policy policy = getNearestPolicy(fragment);
+        if (policy.flags.contains(Flag.DETECT_FRAGMENT_REUSE)) {
+            handlePolicyViolation(fragment, policy, new FragmentReuseViolation());
+        }
+    }
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public static void onFragmentTagUsage(@NonNull Fragment fragment) {
+        Policy policy = getNearestPolicy(fragment);
+        if (policy.flags.contains(Flag.DETECT_FRAGMENT_TAG_USAGE)) {
+            handlePolicyViolation(fragment, policy, new FragmentTagUsageViolation());
+        }
+    }
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public static void onRetainInstanceUsage(@NonNull Fragment fragment) {
+        Policy policy = getNearestPolicy(fragment);
+        if (policy.flags.contains(Flag.DETECT_RETAIN_INSTANCE_USAGE)) {
+            handlePolicyViolation(fragment, policy, new RetainInstanceUsageViolation());
+        }
+    }
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
     public static void onSetUserVisibleHint(@NonNull Fragment fragment) {
         Policy policy = getNearestPolicy(fragment);
         if (policy.flags.contains(Flag.DETECT_SET_USER_VISIBLE_HINT)) {
@@ -203,6 +272,14 @@
         }
     }
 
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public static void onTargetFragmentUsage(@NonNull Fragment fragment) {
+        Policy policy = getNearestPolicy(fragment);
+        if (policy.flags.contains(Flag.DETECT_TARGET_FRAGMENT_USAGE)) {
+            handlePolicyViolation(fragment, policy, new TargetFragmentUsageViolation());
+        }
+    }
+
     @VisibleForTesting
     static void onPolicyViolation(@NonNull Fragment fragment, @NonNull Violation violation) {
         Policy policy = getNearestPolicy(fragment);

fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentTagUsageViolation.java

diff --git a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl b/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentTagUsageViolation.java
similarity index 65%
copy from car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
copy to fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentTagUsageViolation.java
index e022dc3..0084e18 100644
--- a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/FragmentTagUsageViolation.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package androidx.car.app.model.signin;
+package androidx.fragment.app.strictmode;
 
-import androidx.car.app.IOnDoneCallback;
+import androidx.annotation.RestrictTo;
 
-/** @hide */
-oneway interface IOnInputCompletedListener {
-  void onInputCompleted(String value, IOnDoneCallback callback) = 1;
+/** See #{@link FragmentStrictMode.Policy.Builder#detectFragmentTagUsage()}. */
+@RestrictTo(RestrictTo.Scope.LIBRARY) // TODO: Make API public as soon as we have a few checks
+public final class FragmentTagUsageViolation extends Violation {
 }

fragment/fragment/src/main/java/androidx/fragment/app/strictmode/RetainInstanceUsageViolation.java

diff --git a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl b/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/RetainInstanceUsageViolation.java
similarity index 64%
copy from car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
copy to fragment/fragment/src/main/java/androidx/fragment/app/strictmode/RetainInstanceUsageViolation.java
index e022dc3..973bbfb 100644
--- a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/RetainInstanceUsageViolation.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package androidx.car.app.model.signin;
+package androidx.fragment.app.strictmode;
 
-import androidx.car.app.IOnDoneCallback;
+import androidx.annotation.RestrictTo;
 
-/** @hide */
-oneway interface IOnInputCompletedListener {
-  void onInputCompleted(String value, IOnDoneCallback callback) = 1;
+/** See #{@link FragmentStrictMode.Policy.Builder#detectRetainInstanceUsage()}. */
+@RestrictTo(RestrictTo.Scope.LIBRARY) // TODO: Make API public as soon as we have a few checks
+public final class RetainInstanceUsageViolation extends Violation {
 }

fragment/fragment/src/main/java/androidx/fragment/app/strictmode/TargetFragmentUsageViolation.java

diff --git a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl b/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/TargetFragmentUsageViolation.java
similarity index 64%
copy from car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
copy to fragment/fragment/src/main/java/androidx/fragment/app/strictmode/TargetFragmentUsageViolation.java
index e022dc3..768093e 100644
--- a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/strictmode/TargetFragmentUsageViolation.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package androidx.car.app.model.signin;
+package androidx.fragment.app.strictmode;
 
-import androidx.car.app.IOnDoneCallback;
+import androidx.annotation.RestrictTo;
 
-/** @hide */
-oneway interface IOnInputCompletedListener {
-  void onInputCompleted(String value, IOnDoneCallback callback) = 1;
+/** See #{@link FragmentStrictMode.Policy.Builder#detectTargetFragmentUsage()}. */
+@RestrictTo(RestrictTo.Scope.LIBRARY) // TODO: Make API public as soon as we have a few checks
+public final class TargetFragmentUsageViolation extends Violation {
 }

ipc/OWNERS

diff --git a/ipc/OWNERS b/ipc/OWNERS
deleted file mode 100644
index 4ef2f3e..0000000
--- a/ipc/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-emberrose@google.com
\ No newline at end of file

ipc/ipc-annotations/api/public_plus_experimental_current.txt

diff --git a/ipc/ipc-annotations/api/public_plus_experimental_current.txt b/ipc/ipc-annotations/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/ipc/ipc-annotations/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

ipc/ipc-annotations/api/restricted_current.txt

diff --git a/ipc/ipc-annotations/api/restricted_current.txt b/ipc/ipc-annotations/api/restricted_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/ipc/ipc-annotations/api/restricted_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

ipc/ipc-annotations/build.gradle

diff --git a/ipc/ipc-annotations/build.gradle b/ipc/ipc-annotations/build.gradle
deleted file mode 100644
index 71d4c8e..0000000
--- a/ipc/ipc-annotations/build.gradle
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import androidx.build.LibraryGroups
-import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import androidx.build.Publish
-
-plugins {
-    id("AndroidXPlugin")
-    id("java-library")
-}
-
-targetCompatibility = JavaVersion.VERSION_1_7
-sourceCompatibility = JavaVersion.VERSION_1_7
-
-androidx {
-    name = "AndroidX IPC - Annotations"
-    type = LibraryType.PUBLISHED_LIBRARY
-    publish = Publish.NONE
-    mavenVersion = LibraryVersions.IPC
-    mavenGroup = LibraryGroups.IPC
-    inceptionYear = "2020"
-    description = "Annotations for AndroidX AndroidX Inter Process Communication Tools"
-}

ipc/ipc-annotations/lint-baseline.xml

diff --git a/ipc/ipc-annotations/lint-baseline.xml b/ipc/ipc-annotations/lint-baseline.xml
deleted file mode 100644
index 297ae16..0000000
--- a/ipc/ipc-annotations/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta02" client="gradle" version="4.2.0-beta02">
-
-</issues>

ipc/ipc-compiler/build.gradle

diff --git a/ipc/ipc-compiler/build.gradle b/ipc/ipc-compiler/build.gradle
deleted file mode 100644
index 067a335..0000000
--- a/ipc/ipc-compiler/build.gradle
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import androidx.build.LibraryGroups
-import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-
-import static androidx.build.dependencies.DependenciesKt.*
-
-plugins {
-    id("AndroidXPlugin")
-    id("kotlin")
-    id("kotlin-kapt")
-}
-
-targetCompatibility = JavaVersion.VERSION_1_7
-sourceCompatibility = JavaVersion.VERSION_1_7
-
-dependencies {
-    implementation(project(":ipc:ipc-annotations"))
-
-    implementation(AUTO_COMMON)
-    implementation(GUAVA)
-    implementation(JAVAPOET)
-    implementation(KOTLIN_STDLIB)
-
-    compileOnly(AUTO_SERVICE_ANNOTATIONS)
-    kapt(AUTO_SERVICE_PROCESSOR)
-
-    compileOnly(GRADLE_INCAP_HELPER)
-    kapt(GRADLE_INCAP_HELPER_PROCESSOR)
-
-    testImplementation(GOOGLE_COMPILE_TESTING)
-    testImplementation(JSR250)
-    testImplementation(JUNIT)
-    testImplementation(TRUTH)
-}
-
-androidx {
-    name = "AndroidX IPC - Compiler"
-    type = LibraryType.ANNOTATION_PROCESSOR
-    mavenVersion = LibraryVersions.IPC
-    mavenGroup = LibraryGroups.IPC
-    inceptionYear = "2020"
-    description = "Annotation processor for AndroidX Inter Process Communication Tools"
-}

ipc/ipc-compiler/lint-baseline.xml

diff --git a/ipc/ipc-compiler/lint-baseline.xml b/ipc/ipc-compiler/lint-baseline.xml
deleted file mode 100644
index 297ae16..0000000
--- a/ipc/ipc-compiler/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta02" client="gradle" version="4.2.0-beta02">
-
-</issues>

ipc/ipc-runtime/api/current.txt

diff --git a/ipc/ipc-runtime/api/current.txt b/ipc/ipc-runtime/api/current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/ipc/ipc-runtime/api/current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

ipc/ipc-runtime/api/public_plus_experimental_current.txt

diff --git a/ipc/ipc-runtime/api/public_plus_experimental_current.txt b/ipc/ipc-runtime/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/ipc/ipc-runtime/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

ipc/ipc-runtime/api/restricted_current.txt

diff --git a/ipc/ipc-runtime/api/restricted_current.txt b/ipc/ipc-runtime/api/restricted_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/ipc/ipc-runtime/api/restricted_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

ipc/ipc-runtime/build.gradle

diff --git a/ipc/ipc-runtime/build.gradle b/ipc/ipc-runtime/build.gradle
deleted file mode 100644
index 5c5d73c..0000000
--- a/ipc/ipc-runtime/build.gradle
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
-import androidx.build.Publish
-
-import static androidx.build.dependencies.DependenciesKt.JUNIT
-import static androidx.build.dependencies.DependenciesKt.TRUTH
-
-plugins {
-    id("AndroidXPlugin")
-    id("com.android.library")
-}
-
-dependencies {
-    api(project(":ipc:ipc-annotations"))
-    api("androidx.annotation:annotation:1.0.0")
-
-    testImplementation(JUNIT)
-    testImplementation(TRUTH)
-}
-
-android {
-    defaultConfig {
-        minSdkVersion 14
-    }
-
-    targetCompatibility = JavaVersion.VERSION_1_7
-    sourceCompatibility = JavaVersion.VERSION_1_7
-}
-
-androidx {
-    name = "AndroidX IPC - Runtime"
-    publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenVersion = LibraryVersions.IPC
-    mavenGroup = LibraryGroups.IPC
-    inceptionYear = "2020"
-    description = "Runtime for AndroidX Inter Process Communication Tools"
-}

ipc/ipc-runtime/lint-baseline.xml

diff --git a/ipc/ipc-runtime/lint-baseline.xml b/ipc/ipc-runtime/lint-baseline.xml
deleted file mode 100644
index 8f1aa4b..0000000
--- a/ipc/ipc-runtime/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta02" client="gradle" variant="debug" version="4.2.0-beta02">
-
-</issues>

ipc/ipc-runtime/src/main/AndroidManifest.xml

diff --git a/ipc/ipc-runtime/src/main/AndroidManifest.xml b/ipc/ipc-runtime/src/main/AndroidManifest.xml
deleted file mode 100644
index 088817f..0000000
--- a/ipc/ipc-runtime/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2020 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<manifest package="androidx.ipc.runtime">
-</manifest>
\ No newline at end of file

leanback/leanback-preference/build.gradle

diff --git a/leanback/leanback-preference/build.gradle b/leanback/leanback-preference/build.gradle
index 5214770..3559967 100644
--- a/leanback/leanback-preference/build.gradle
+++ b/leanback/leanback-preference/build.gradle
@@ -13,7 +13,7 @@
     api("androidx.appcompat:appcompat:1.0.0")
     api("androidx.recyclerview:recyclerview:1.0.0")
     api("androidx.preference:preference:1.1.0")
-    api("androidx.leanback:leanback:1.1.0-beta01")
+    api(project(":leanback:leanback"))
 }
 
 android {

leanback/leanback/build.gradle

diff --git a/leanback/leanback/build.gradle b/leanback/leanback/build.gradle
index 25216be..e0f38fa 100644
--- a/leanback/leanback/build.gradle
+++ b/leanback/leanback/build.gradle
@@ -15,7 +15,7 @@
     implementation("androidx.collection:collection:1.0.0")
     api("androidx.media:media:1.0.0")
     api("androidx.fragment:fragment:1.0.0")
-    api("androidx.recyclerview:recyclerview:1.2.0-beta01")
+    api("androidx.recyclerview:recyclerview:1.2.0-rc01")
     api("androidx.appcompat:appcompat:1.0.0")
 
     androidTestImplementation(KOTLIN_STDLIB)

leanback/leanback/src/main/java/androidx/leanback/widget/GridLayoutManager.java

diff --git a/leanback/leanback/src/main/java/androidx/leanback/widget/GridLayoutManager.java b/leanback/leanback/src/main/java/androidx/leanback/widget/GridLayoutManager.java
index dc1a66a..e71696c 100644
--- a/leanback/leanback/src/main/java/androidx/leanback/widget/GridLayoutManager.java
+++ b/leanback/leanback/src/main/java/androidx/leanback/widget/GridLayoutManager.java
@@ -40,6 +40,8 @@
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.AccelerateDecelerateInterpolator;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.collection.CircularIntArray;
 import androidx.core.os.TraceCompat;
@@ -713,7 +715,7 @@
      */
     private FacetProviderAdapter mFacetProviderAdapter;
 
-    public GridLayoutManager(BaseGridView baseGridView) {
+    GridLayoutManager(@NonNull BaseGridView baseGridView) {
         mBaseGridView = baseGridView;
         mChildVisibility = -1;
         // disable prefetch by default, prefetch causes regression on low power chipset
@@ -733,7 +735,7 @@
         mFlag |= PF_FORCE_FULL_LAYOUT;
     }
 
-    public void onRtlPropertiesChanged(int layoutDirection) {
+    void onRtlPropertiesChanged(int layoutDirection) {
         final int flags;
         if (mOrientation == HORIZONTAL) {
             flags = layoutDirection == View.LAYOUT_DIRECTION_RTL ? PF_REVERSE_FLOW_PRIMARY : 0;
@@ -748,87 +750,87 @@
         mWindowAlignment.horizontal.setReversedFlow(layoutDirection == View.LAYOUT_DIRECTION_RTL);
     }
 
-    public int getFocusScrollStrategy() {
+    int getFocusScrollStrategy() {
         return mFocusScrollStrategy;
     }
 
-    public void setFocusScrollStrategy(int focusScrollStrategy) {
+    void setFocusScrollStrategy(int focusScrollStrategy) {
         mFocusScrollStrategy = focusScrollStrategy;
     }
 
-    public void setWindowAlignment(int windowAlignment) {
+    void setWindowAlignment(int windowAlignment) {
         mWindowAlignment.mainAxis().setWindowAlignment(windowAlignment);
     }
 
-    public int getWindowAlignment() {
+    int getWindowAlignment() {
         return mWindowAlignment.mainAxis().getWindowAlignment();
     }
 
-    public void setWindowAlignmentOffset(int alignmentOffset) {
+    void setWindowAlignmentOffset(int alignmentOffset) {
         mWindowAlignment.mainAxis().setWindowAlignmentOffset(alignmentOffset);
     }
 
-    public int getWindowAlignmentOffset() {
+    int getWindowAlignmentOffset() {
         return mWindowAlignment.mainAxis().getWindowAlignmentOffset();
     }
 
-    public void setWindowAlignmentOffsetPercent(float offsetPercent) {
+    void setWindowAlignmentOffsetPercent(float offsetPercent) {
         mWindowAlignment.mainAxis().setWindowAlignmentOffsetPercent(offsetPercent);
     }
 
-    public float getWindowAlignmentOffsetPercent() {
+    float getWindowAlignmentOffsetPercent() {
         return mWindowAlignment.mainAxis().getWindowAlignmentOffsetPercent();
     }
 
-    public void setItemAlignmentOffset(int alignmentOffset) {
+    void setItemAlignmentOffset(int alignmentOffset) {
         mItemAlignment.mainAxis().setItemAlignmentOffset(alignmentOffset);
         updateChildAlignments();
     }
 
-    public int getItemAlignmentOffset() {
+    int getItemAlignmentOffset() {
         return mItemAlignment.mainAxis().getItemAlignmentOffset();
     }
 
-    public void setItemAlignmentOffsetWithPadding(boolean withPadding) {
+    void setItemAlignmentOffsetWithPadding(boolean withPadding) {
         mItemAlignment.mainAxis().setItemAlignmentOffsetWithPadding(withPadding);
         updateChildAlignments();
     }
 
-    public boolean isItemAlignmentOffsetWithPadding() {
+    boolean isItemAlignmentOffsetWithPadding() {
         return mItemAlignment.mainAxis().isItemAlignmentOffsetWithPadding();
     }
 
-    public void setItemAlignmentOffsetPercent(float offsetPercent) {
+    void setItemAlignmentOffsetPercent(float offsetPercent) {
         mItemAlignment.mainAxis().setItemAlignmentOffsetPercent(offsetPercent);
         updateChildAlignments();
     }
 
-    public float getItemAlignmentOffsetPercent() {
+    float getItemAlignmentOffsetPercent() {
         return mItemAlignment.mainAxis().getItemAlignmentOffsetPercent();
     }
 
-    public void setItemAlignmentViewId(int viewId) {
+    void setItemAlignmentViewId(int viewId) {
         mItemAlignment.mainAxis().setItemAlignmentViewId(viewId);
         updateChildAlignments();
     }
 
-    public int getItemAlignmentViewId() {
+    int getItemAlignmentViewId() {
         return mItemAlignment.mainAxis().getItemAlignmentViewId();
     }
 
-    public void setFocusOutAllowed(boolean throughFront, boolean throughEnd) {
+    void setFocusOutAllowed(boolean throughFront, boolean throughEnd) {
         mFlag = (mFlag & ~PF_FOCUS_OUT_MASKS)
                 | (throughFront ? PF_FOCUS_OUT_FRONT : 0)
                 | (throughEnd ? PF_FOCUS_OUT_END : 0);
     }
 
-    public void setFocusOutSideAllowed(boolean throughStart, boolean throughEnd) {
+    void setFocusOutSideAllowed(boolean throughStart, boolean throughEnd) {
         mFlag = (mFlag & ~PF_FOCUS_OUT_SIDE_MASKS)
                 | (throughStart ? PF_FOCUS_OUT_SIDE_START : 0)
                 | (throughEnd ? PF_FOCUS_OUT_SIDE_END : 0);
     }
 
-    public void setNumRows(int numRows) {
+    void setNumRows(int numRows) {
         if (numRows < 0) throw new IllegalArgumentException();
         mNumRowsRequested = numRows;
     }
@@ -836,7 +838,7 @@
     /**
      * Set the row height. May be WRAP_CONTENT, or a size in pixels.
      */
-    public void setRowHeight(int height) {
+    void setRowHeight(int height) {
         if (height >= 0 || height == ViewGroup.LayoutParams.WRAP_CONTENT) {
             mRowSizeSecondaryRequested = height;
         } else {
@@ -844,12 +846,12 @@
         }
     }
 
-    public void setItemSpacing(int space) {
+    void setItemSpacing(int space) {
         mVerticalSpacing = mHorizontalSpacing = space;
         mSpacingPrimary = mSpacingSecondary = space;
     }
 
-    public void setVerticalSpacing(int space) {
+    void setVerticalSpacing(int space) {
         if (mOrientation == VERTICAL) {
             mSpacingPrimary = mVerticalSpacing = space;
         } else {
@@ -857,7 +859,7 @@
         }
     }
 
-    public void setHorizontalSpacing(int space) {
+    void setHorizontalSpacing(int space) {
         if (mOrientation == HORIZONTAL) {
             mSpacingPrimary = mHorizontalSpacing = space;
         } else {
@@ -865,27 +867,27 @@
         }
     }
 
-    public int getVerticalSpacing() {
+    int getVerticalSpacing() {
         return mVerticalSpacing;
     }
 
-    public int getHorizontalSpacing() {
+    int getHorizontalSpacing() {
         return mHorizontalSpacing;
     }
 
-    public void setGravity(int gravity) {
+    void setGravity(int gravity) {
         mGravity = gravity;
     }
 
-    protected boolean hasDoneFirstLayout() {
+    boolean hasDoneFirstLayout() {
         return mGrid != null;
     }
 
-    public void setOnChildSelectedListener(OnChildSelectedListener listener) {
+    void setOnChildSelectedListener(OnChildSelectedListener listener) {
         mChildSelectedListener = listener;
     }
 
-    public void setOnChildViewHolderSelectedListener(OnChildViewHolderSelectedListener listener) {
+    void setOnChildViewHolderSelectedListener(OnChildViewHolderSelectedListener listener) {
         if (listener == null) {
             mChildViewHolderSelectedListeners = null;
             return;
@@ -898,14 +900,14 @@
         mChildViewHolderSelectedListeners.add(listener);
     }
 
-    public void addOnChildViewHolderSelectedListener(OnChildViewHolderSelectedListener listener) {
+    void addOnChildViewHolderSelectedListener(OnChildViewHolderSelectedListener listener) {
         if (mChildViewHolderSelectedListeners == null) {
             mChildViewHolderSelectedListeners = new ArrayList<OnChildViewHolderSelectedListener>();
         }
         mChildViewHolderSelectedListeners.add(listener);
     }
 
-    public void removeOnChildViewHolderSelectedListener(OnChildViewHolderSelectedListener
+    void removeOnChildViewHolderSelectedListener(OnChildViewHolderSelectedListener
             listener) {
         if (mChildViewHolderSelectedListeners != null) {
             mChildViewHolderSelectedListeners.remove(listener);
@@ -939,14 +941,14 @@
         }
     }
 
-    public void addOnLayoutCompletedListener(BaseGridView.OnLayoutCompletedListener listener) {
+    void addOnLayoutCompletedListener(BaseGridView.OnLayoutCompletedListener listener) {
         if (mOnLayoutCompletedListeners == null) {
             mOnLayoutCompletedListeners = new ArrayList<>();
         }
         mOnLayoutCompletedListeners.add(listener);
     }
 
-    public void removeOnLayoutCompletedListener(BaseGridView.OnLayoutCompletedListener listener) {
+    void removeOnLayoutCompletedListener(BaseGridView.OnLayoutCompletedListener listener) {
         if (mOnLayoutCompletedListeners != null) {
             mOnLayoutCompletedListeners.remove(listener);
         }
@@ -1075,19 +1077,32 @@
         return mOrientation == VERTICAL || mNumRows > 1;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @NonNull
     @Override
     public RecyclerView.LayoutParams generateDefaultLayoutParams() {
         return new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @NonNull
     @Override
-    public RecyclerView.LayoutParams generateLayoutParams(Context context, AttributeSet attrs) {
+    public RecyclerView.LayoutParams generateLayoutParams(@NonNull Context context,
+            @NonNull AttributeSet attrs) {
         return new LayoutParams(context, attrs);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @NonNull
     @Override
-    public RecyclerView.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {
+    public RecyclerView.LayoutParams generateLayoutParams(@NonNull ViewGroup.LayoutParams lp) {
         if (lp instanceof LayoutParams) {
             return new LayoutParams((LayoutParams) lp);
         } else if (lp instanceof RecyclerView.LayoutParams) {
@@ -1099,7 +1114,7 @@
         }
     }
 
-    protected View getViewForPosition(int position) {
+    View getViewForPosition(int position) {
         View v = mRecycler.getViewForPosition(position);
         LayoutParams lp = (LayoutParams) v.getLayoutParams();
         RecyclerView.ViewHolder vh = mBaseGridView.getChildViewHolder(v);
@@ -1124,29 +1139,29 @@
     }
 
     @Override
-    public int getDecoratedLeft(View child) {
+    public int getDecoratedLeft(@NonNull View child) {
         return super.getDecoratedLeft(child) + ((LayoutParams) child.getLayoutParams()).mLeftInset;
     }
 
     @Override
-    public int getDecoratedTop(View child) {
+    public int getDecoratedTop(@NonNull View child) {
         return super.getDecoratedTop(child) + ((LayoutParams) child.getLayoutParams()).mTopInset;
     }
 
     @Override
-    public int getDecoratedRight(View child) {
+    public int getDecoratedRight(@NonNull View child) {
         return super.getDecoratedRight(child)
                 - ((LayoutParams) child.getLayoutParams()).mRightInset;
     }
 
     @Override
-    public int getDecoratedBottom(View child) {
+    public int getDecoratedBottom(@NonNull View child) {
         return super.getDecoratedBottom(child)
                 - ((LayoutParams) child.getLayoutParams()).mBottomInset;
     }
 
     @Override
-    public void getDecoratedBoundsWithMargins(View view, Rect outBounds) {
+    public void getDecoratedBoundsWithMargins(@NonNull View view, @NonNull Rect outBounds) {
         super.getDecoratedBoundsWithMargins(view, outBounds);
         LayoutParams params = ((LayoutParams) view.getLayoutParams());
         outBounds.left += params.mLeftInset;
@@ -1452,7 +1467,8 @@
 
     @Override
     @SuppressWarnings("ObjectToString")
-    public void onMeasure(Recycler recycler, State state, int widthSpec, int heightSpec) {
+    public void onMeasure(@NonNull Recycler recycler, @NonNull State state,
+            int widthSpec, int heightSpec) {
         saveContext(recycler, state);
 
         int sizePrimary, sizeSecondary, modeSecondary, paddingSecondary;
@@ -2043,7 +2059,7 @@
     }
 
     @Override
-    public void removeAndRecycleAllViews(RecyclerView.Recycler recycler) {
+    public void removeAndRecycleAllViews(@NonNull RecyclerView.Recycler recycler) {
         if (TRACE) TraceCompat.beginSection("removeAndRecycleAllViews");
         if (DEBUG) Log.v(TAG, "removeAndRecycleAllViews " + getChildCount());
         for (int i = getChildCount() - 1; i >= 0; i--) {
@@ -2082,7 +2098,7 @@
     }
 
     @Override
-    public void onLayoutCompleted(State state) {
+    public void onLayoutCompleted(@NonNull State state) {
         if (mOnLayoutCompletedListeners != null) {
             for (int i = mOnLayoutCompletedListeners.size() - 1; i >= 0; i--) {
                 mOnLayoutCompletedListeners.get(i).onLayoutCompleted(state);
@@ -2158,7 +2174,8 @@
 
     // Lays out items based on the current scroll position
     @Override
-    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+    public void onLayoutChildren(@NonNull RecyclerView.Recycler recycler,
+            @NonNull RecyclerView.State state) {
         if (DEBUG) {
             Log.v(getTag(), "layoutChildren start numRows " + mNumRows
                     + " inPreLayout " + state.isPreLayout()
@@ -2385,7 +2402,8 @@
     }
 
     @Override
-    public int scrollHorizontallyBy(int dx, Recycler recycler, RecyclerView.State state) {
+    public int scrollHorizontallyBy(int dx, @NonNull Recycler recycler,
+            @NonNull RecyclerView.State state) {
         if (DEBUG) Log.v(getTag(), "scrollHorizontallyBy " + dx);
         if ((mFlag & PF_LAYOUT_ENABLED) == 0 || !hasDoneFirstLayout()) {
             return 0;
@@ -2404,7 +2422,8 @@
     }
 
     @Override
-    public int scrollVerticallyBy(int dy, Recycler recycler, RecyclerView.State state) {
+    public int scrollVerticallyBy(int dy, @NonNull Recycler recycler,
+            @NonNull RecyclerView.State state) {
         if (DEBUG) Log.v(getTag(), "scrollVerticallyBy " + dy);
         if ((mFlag & PF_LAYOUT_ENABLED) == 0 || !hasDoneFirstLayout()) {
             return 0;
@@ -2500,8 +2519,8 @@
     }
 
     @Override
-    public void collectAdjacentPrefetchPositions(int dx, int dy, State state,
-            LayoutPrefetchRegistry layoutPrefetchRegistry) {
+    public void collectAdjacentPrefetchPositions(int dx, int dy, @NonNull State state,
+            @NonNull LayoutPrefetchRegistry layoutPrefetchRegistry) {
         try {
             saveContext(null, state);
             int da = (mOrientation == HORIZONTAL) ? dx : dy;
@@ -2521,7 +2540,7 @@
 
     @Override
     public void collectInitialPrefetchPositions(int adapterItemCount,
-            LayoutPrefetchRegistry layoutPrefetchRegistry) {
+            @NonNull LayoutPrefetchRegistry layoutPrefetchRegistry) {
         int numToPrefetch = mBaseGridView.mInitialPrefetchItemCount;
         if (adapterItemCount != 0 && numToPrefetch != 0) {
             // prefetch items centered around mFocusPosition
@@ -2630,38 +2649,38 @@
     }
 
     @Override
-    public void smoothScrollToPosition(RecyclerView recyclerView, State state,
+    public void smoothScrollToPosition(@NonNull RecyclerView recyclerView, @NonNull State state,
             int position) {
         setSelection(position, 0, true, 0);
     }
 
-    public void setSelection(int position,
+    void setSelection(int position,
             int primaryScrollExtra) {
         setSelection(position, 0, false, primaryScrollExtra);
     }
 
-    public void setSelectionSmooth(int position) {
+    void setSelectionSmooth(int position) {
         setSelection(position, 0, true, 0);
     }
 
-    public void setSelectionWithSub(int position, int subposition,
+    void setSelectionWithSub(int position, int subposition,
             int primaryScrollExtra) {
         setSelection(position, subposition, false, primaryScrollExtra);
     }
 
-    public void setSelectionSmoothWithSub(int position, int subposition) {
+    void setSelectionSmoothWithSub(int position, int subposition) {
         setSelection(position, subposition, true, 0);
     }
 
-    public int getSelection() {
+    int getSelection() {
         return mFocusPosition;
     }
 
-    public int getSubSelection() {
+    int getSubSelection() {
         return mSubFocusPosition;
     }
 
-    public void setSelection(int position, int subposition, boolean smooth,
+    void setSelection(int position, int subposition, boolean smooth,
             int primaryScrollExtra) {
         if ((mFocusPosition != position && position != NO_POSITION)
                 || subposition != mSubFocusPosition || primaryScrollExtra != mPrimaryScrollExtra) {
@@ -2769,7 +2788,7 @@
     }
 
     @Override
-    public void startSmoothScroll(RecyclerView.SmoothScroller smoothScroller) {
+    public void startSmoothScroll(@NonNull RecyclerView.SmoothScroller smoothScroller) {
         skipSmoothScrollerOnStopInternal();
         super.startSmoothScroll(smoothScroller);
         if (smoothScroller.isRunning() && smoothScroller instanceof GridLinearSmoothScroller) {
@@ -2804,7 +2823,8 @@
     }
 
     @Override
-    public void onItemsAdded(RecyclerView recyclerView, int positionStart, int itemCount) {
+    public void onItemsAdded(@NonNull RecyclerView recyclerView, int positionStart,
+            int itemCount) {
         if (DEBUG) Log.v(getTag(), "onItemsAdded positionStart "
                 + positionStart + " itemCount " + itemCount);
         if (mFocusPosition != NO_POSITION && mGrid != null && mGrid.getFirstVisibleIndex() >= 0
@@ -2818,14 +2838,15 @@
     }
 
     @Override
-    public void onItemsChanged(RecyclerView recyclerView) {
+    public void onItemsChanged(@NonNull RecyclerView recyclerView) {
         if (DEBUG) Log.v(getTag(), "onItemsChanged");
         mFocusPositionOffset = 0;
         mChildrenStates.clear();
     }
 
     @Override
-    public void onItemsRemoved(RecyclerView recyclerView, int positionStart, int itemCount) {
+    public void onItemsRemoved(@NonNull RecyclerView recyclerView,
+            int positionStart, int itemCount) {
         if (DEBUG) Log.v(getTag(), "onItemsRemoved positionStart "
                 + positionStart + " itemCount " + itemCount);
         if (mFocusPosition != NO_POSITION  && mGrid != null && mGrid.getFirstVisibleIndex() >= 0
@@ -2846,8 +2867,8 @@
     }
 
     @Override
-    public void onItemsMoved(RecyclerView recyclerView, int fromPosition, int toPosition,
-            int itemCount) {
+    public void onItemsMoved(@NonNull RecyclerView recyclerView,
+            int fromPosition, int toPosition, int itemCount) {
         if (DEBUG) Log.v(getTag(), "onItemsMoved fromPosition "
                 + fromPosition + " toPosition " + toPosition);
         if (mFocusPosition != NO_POSITION && mFocusPositionOffset != Integer.MIN_VALUE) {
@@ -2867,7 +2888,8 @@
     }
 
     @Override
-    public void onItemsUpdated(RecyclerView recyclerView, int positionStart, int itemCount) {
+    public void onItemsUpdated(@NonNull RecyclerView recyclerView,
+            int positionStart, int itemCount) {
         if (DEBUG) Log.v(getTag(), "onItemsUpdated positionStart "
                 + positionStart + " itemCount " + itemCount);
         for (int i = positionStart, end = positionStart + itemCount; i < end; i++) {
@@ -2876,7 +2898,8 @@
     }
 
     @Override
-    public boolean onRequestChildFocus(RecyclerView parent, View child, View focused) {
+    public boolean onRequestChildFocus(@NonNull RecyclerView parent, @NonNull View child,
+            @NonNull View focused) {
         if ((mFlag & PF_FOCUS_SEARCH_DISABLED) != 0) {
             return true;
         }
@@ -2891,13 +2914,13 @@
     }
 
     @Override
-    public boolean requestChildRectangleOnScreen(RecyclerView parent, View view, Rect rect,
-            boolean immediate) {
+    public boolean requestChildRectangleOnScreen(@NonNull RecyclerView parent,
+            @NonNull View view, @NonNull Rect rect, boolean immediate) {
         if (DEBUG) Log.v(getTag(), "requestChildRectangleOnScreen " + view + " " + rect);
         return false;
     }
 
-    public void getViewSelectedOffsets(View view, int[] offsets) {
+    void getViewSelectedOffsets(View view, int[] offsets) {
         if (mOrientation == HORIZONTAL) {
             offsets[0] = getPrimaryAlignedScrollDistance(view);
             offsets[1] = getSecondaryScrollDistance(view);
@@ -3117,7 +3140,7 @@
         }
     }
 
-    public void setPruneChild(boolean pruneChild) {
+    void setPruneChild(boolean pruneChild) {
         if (((mFlag & PF_PRUNE_CHILD) != 0) != pruneChild) {
             mFlag = (mFlag & ~PF_PRUNE_CHILD) | (pruneChild ? PF_PRUNE_CHILD : 0);
             if (pruneChild) {
@@ -3126,11 +3149,11 @@
         }
     }
 
-    public boolean getPruneChild() {
+    boolean getPruneChild() {
         return (mFlag & PF_PRUNE_CHILD) != 0;
     }
 
-    public void setScrollEnabled(boolean scrollEnabled) {
+    void setScrollEnabled(boolean scrollEnabled) {
         if (((mFlag & PF_SCROLL_ENABLED) != 0) != scrollEnabled) {
             mFlag = (mFlag & ~PF_SCROLL_ENABLED) | (scrollEnabled ? PF_SCROLL_ENABLED : 0);
             if (((mFlag & PF_SCROLL_ENABLED) != 0)
@@ -3142,7 +3165,7 @@
         }
     }
 
-    public boolean isScrollEnabled() {
+    boolean isScrollEnabled() {
         return (mFlag & PF_SCROLL_ENABLED) != 0;
     }
 
@@ -3184,8 +3207,9 @@
         return (mFlag & PF_FOCUS_SEARCH_DISABLED) != 0;
     }
 
+    @Nullable
     @Override
-    public View onInterceptFocusSearch(View focused, int direction) {
+    public View onInterceptFocusSearch(@NonNull View focused, int direction) {
         if ((mFlag & PF_FOCUS_SEARCH_DISABLED) != 0) {
             return focused;
         }
@@ -3278,8 +3302,8 @@
     }
 
     @Override
-    public boolean onAddFocusables(RecyclerView recyclerView,
-            ArrayList<View> views, int direction, int focusableMode) {
+    public boolean onAddFocusables(@NonNull RecyclerView recyclerView,
+            @NonNull ArrayList<View> views, int direction, int focusableMode) {
         if ((mFlag & PF_FOCUS_SEARCH_DISABLED) != 0) {
             return true;
         }
@@ -3563,8 +3587,8 @@
     }
 
     @Override
-    public void onAdapterChanged(RecyclerView.Adapter oldAdapter,
-            RecyclerView.Adapter newAdapter) {
+    public void onAdapterChanged(@Nullable RecyclerView.Adapter oldAdapter,
+            @Nullable RecyclerView.Adapter newAdapter) {
         if (DEBUG) Log.v(getTag(), "onAdapterChanged to " + newAdapter);
         if (oldAdapter != null) {
             discardLayoutInfo();
@@ -3586,7 +3610,7 @@
         mFlag &= ~PF_ROW_SECONDARY_SIZE_REFRESH;
     }
 
-    public void setLayoutEnabled(boolean layoutEnabled) {
+    void setLayoutEnabled(boolean layoutEnabled) {
         if (((mFlag & PF_LAYOUT_ENABLED) != 0) != layoutEnabled) {
             mFlag = (mFlag & ~PF_LAYOUT_ENABLED) | (layoutEnabled ? PF_LAYOUT_ENABLED : 0);
             requestLayout();
@@ -3643,6 +3667,7 @@
         }
     }
 
+    @NonNull
     @Override
     public Parcelable onSaveInstanceState() {
         if (DEBUG) Log.v(getTag(), "onSaveInstanceState getSelection() " + getSelection());
@@ -3671,7 +3696,7 @@
     }
 
     @Override
-    public void onRestoreInstanceState(Parcelable state) {
+    public void onRestoreInstanceState(@Nullable Parcelable state) {
         if (!(state instanceof SavedState)) {
             return;
         }
@@ -3685,8 +3710,8 @@
     }
 
     @Override
-    public int getRowCountForAccessibility(RecyclerView.Recycler recycler,
-            RecyclerView.State state) {
+    public int getRowCountForAccessibility(@NonNull RecyclerView.Recycler recycler,
+            @NonNull RecyclerView.State state) {
         if (mOrientation == HORIZONTAL && mGrid != null) {
             return mGrid.getNumRows();
         }
@@ -3694,8 +3719,8 @@
     }
 
     @Override
-    public int getColumnCountForAccessibility(RecyclerView.Recycler recycler,
-            RecyclerView.State state) {
+    public int getColumnCountForAccessibility(@NonNull RecyclerView.Recycler recycler,
+            @NonNull RecyclerView.State state) {
         if (mOrientation == VERTICAL && mGrid != null) {
             return mGrid.getNumRows();
         }
@@ -3703,8 +3728,9 @@
     }
 
     @Override
-    public void onInitializeAccessibilityNodeInfoForItem(RecyclerView.Recycler recycler,
-            RecyclerView.State state, View host, AccessibilityNodeInfoCompat info) {
+    public void onInitializeAccessibilityNodeInfoForItem(@NonNull RecyclerView.Recycler recycler,
+            @NonNull RecyclerView.State state, @NonNull View host,
+            @NonNull AccessibilityNodeInfoCompat info) {
         ViewGroup.LayoutParams lp = host.getLayoutParams();
         if (mGrid == null || !(lp instanceof LayoutParams)) {
             return;
@@ -3730,8 +3756,8 @@
      * by selection change.
      */
     @Override
-    public boolean performAccessibilityAction(Recycler recycler, State state, int action,
-            Bundle args) {
+    public boolean performAccessibilityAction(@NonNull Recycler recycler, @NonNull State state,
+            int action, @Nullable Bundle args) {
         if (!isScrollEnabled()) {
             // eat action request so that talkback wont focus out of RV
             return true;
@@ -3889,8 +3915,8 @@
     }
 
     @Override
-    public void onInitializeAccessibilityNodeInfo(Recycler recycler, State state,
-            AccessibilityNodeInfoCompat info) {
+    public void onInitializeAccessibilityNodeInfo(@NonNull Recycler recycler,
+            @NonNull State state, @NonNull AccessibilityNodeInfoCompat info) {
         saveContext(recycler, state);
         int count = state.getItemCount();
         // reverseFlowPrimary is whether we are in LTR/RTL mode.

lifecycle/lifecycle-process/api/current.txt

diff --git a/lifecycle/lifecycle-process/api/current.txt b/lifecycle/lifecycle-process/api/current.txt
index 29e1211..429b2b2 100644
--- a/lifecycle/lifecycle-process/api/current.txt
+++ b/lifecycle/lifecycle-process/api/current.txt
@@ -1,6 +1,12 @@
 // Signature format: 4.0
 package androidx.lifecycle {
 
+  public final class ProcessLifecycleInitializer implements androidx.startup.Initializer<androidx.lifecycle.LifecycleOwner> {
+    ctor public ProcessLifecycleInitializer();
+    method public androidx.lifecycle.LifecycleOwner create(android.content.Context);
+    method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();
+  }
+
   public class ProcessLifecycleOwner implements androidx.lifecycle.LifecycleOwner {
     method public static androidx.lifecycle.LifecycleOwner get();
     method public androidx.lifecycle.Lifecycle getLifecycle();

lifecycle/lifecycle-process/api/public_plus_experimental_current.txt

diff --git a/lifecycle/lifecycle-process/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-process/api/public_plus_experimental_current.txt
index 29e1211..429b2b2 100644
--- a/lifecycle/lifecycle-process/api/public_plus_experimental_current.txt
+++ b/lifecycle/lifecycle-process/api/public_plus_experimental_current.txt
@@ -1,6 +1,12 @@
 // Signature format: 4.0
 package androidx.lifecycle {
 
+  public final class ProcessLifecycleInitializer implements androidx.startup.Initializer<androidx.lifecycle.LifecycleOwner> {
+    ctor public ProcessLifecycleInitializer();
+    method public androidx.lifecycle.LifecycleOwner create(android.content.Context);
+    method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();
+  }
+
   public class ProcessLifecycleOwner implements androidx.lifecycle.LifecycleOwner {
     method public static androidx.lifecycle.LifecycleOwner get();
     method public androidx.lifecycle.Lifecycle getLifecycle();

lifecycle/lifecycle-process/api/restricted_current.txt

diff --git a/lifecycle/lifecycle-process/api/restricted_current.txt b/lifecycle/lifecycle-process/api/restricted_current.txt
index 25bd0dd0..429b2b2 100644
--- a/lifecycle/lifecycle-process/api/restricted_current.txt
+++ b/lifecycle/lifecycle-process/api/restricted_current.txt
@@ -1,7 +1,7 @@
 // Signature format: 4.0
 package androidx.lifecycle {
 
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ProcessLifecycleInitializer implements androidx.startup.Initializer<androidx.lifecycle.LifecycleOwner> {
+  public final class ProcessLifecycleInitializer implements androidx.startup.Initializer<androidx.lifecycle.LifecycleOwner> {
     ctor public ProcessLifecycleInitializer();
     method public androidx.lifecycle.LifecycleOwner create(android.content.Context);
     method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();

lifecycle/lifecycle-process/src/main/java/androidx/lifecycle/ProcessLifecycleInitializer.java

diff --git a/lifecycle/lifecycle-process/src/main/java/androidx/lifecycle/ProcessLifecycleInitializer.java b/lifecycle/lifecycle-process/src/main/java/androidx/lifecycle/ProcessLifecycleInitializer.java
index 9fad75d..03e32bf 100644
--- a/lifecycle/lifecycle-process/src/main/java/androidx/lifecycle/ProcessLifecycleInitializer.java
+++ b/lifecycle/lifecycle-process/src/main/java/androidx/lifecycle/ProcessLifecycleInitializer.java
@@ -19,19 +19,15 @@
 import android.content.Context;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.RestrictTo;
 import androidx.startup.Initializer;
 
 import java.util.Collections;
 import java.util.List;
 
 /**
- * Internal class to initialize Lifecycles.
- *
- * @hide
+ * Initializes {@link ProcessLifecycleOwner} using {@code androidx.startup}.
  */
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class ProcessLifecycleInitializer implements Initializer<LifecycleOwner> {
+public final class ProcessLifecycleInitializer implements Initializer<LifecycleOwner> {
 
     @NonNull
     @Override

navigation/navigation-common/src/androidTest/java/androidx/navigation/AddInDefaultArgsTest.kt

diff --git a/navigation/navigation-common/src/androidTest/java/androidx/navigation/AddInDefaultArgsTest.kt b/navigation/navigation-common/src/androidTest/java/androidx/navigation/AddInDefaultArgsTest.kt
index a084bc3..78d1f94 100644
--- a/navigation/navigation-common/src/androidTest/java/androidx/navigation/AddInDefaultArgsTest.kt
+++ b/navigation/navigation-common/src/androidTest/java/androidx/navigation/AddInDefaultArgsTest.kt
@@ -17,7 +17,10 @@
 package androidx.navigation
 
 import android.os.Bundle
+import androidx.navigation.test.floatArgument
 import androidx.navigation.test.intArgument
+import androidx.navigation.test.longArgument
+import androidx.navigation.test.referenceArgument
 import androidx.navigation.test.stringArgument
 import androidx.test.filters.SmallTest
 import com.google.common.truth.Truth.assertThat
@@ -29,6 +32,9 @@
 private val stringArgumentWithoutDefault = "stringArg" to stringArgument(true)
 private val stringArgumentWithDefault = "stringArg" to stringArgument("aaa")
 private val intArgumentWithDefault = "intArg" to intArgument(123)
+private val longArgumentWithDefault = "longArg" to longArgument(123L)
+private val floatArgumentWithDefault = "floatArg" to floatArgument(123f)
+private val referenceArgumentWithDefault = "referenceArg" to referenceArgument(123)
 
 @SmallTest
 @RunWith(Parameterized::class)
@@ -47,8 +53,15 @@
                 mapOf(stringArgumentWithoutDefault),
                 // Test with arguments where only some have default values
                 mapOf(stringArgumentWithoutDefault, intArgumentWithDefault),
-                // Test with arguments that have default values
-                mapOf(stringArgumentWithDefault, intArgumentWithDefault)
+                // Test with arguments that have default values (int)
+                mapOf(stringArgumentWithDefault, intArgumentWithDefault),
+                // Test with arguments that have default values (float)
+                mapOf(stringArgumentWithDefault, longArgumentWithDefault),
+                // Test with arguments that have default values (long)
+                mapOf(stringArgumentWithDefault, floatArgumentWithDefault),
+                // Test with arguments that have default values (reference)
+                mapOf(stringArgumentWithDefault, referenceArgumentWithDefault)
+
             ).forEach { arguments: Map<String, NavArgument> ->
                 // Run with a null Bundle
                 add(arrayOf(arguments, Bundle.EMPTY))

navigation/navigation-common/src/androidTest/java/androidx/navigation/test/NavArgument.kt

diff --git a/navigation/navigation-common/src/androidTest/java/androidx/navigation/test/NavArgument.kt b/navigation/navigation-common/src/androidTest/java/androidx/navigation/test/NavArgument.kt
index c87dad5..71a36750 100644
--- a/navigation/navigation-common/src/androidTest/java/androidx/navigation/test/NavArgument.kt
+++ b/navigation/navigation-common/src/androidTest/java/androidx/navigation/test/NavArgument.kt
@@ -17,7 +17,10 @@
 package androidx.navigation.test
 
 import androidx.navigation.NavArgument
+import androidx.navigation.NavType.Companion.FloatType
 import androidx.navigation.NavType.Companion.IntType
+import androidx.navigation.NavType.Companion.LongType
+import androidx.navigation.NavType.Companion.ReferenceType
 import androidx.navigation.NavType.Companion.StringType
 
 // region IntType
@@ -30,6 +33,36 @@
     .build()
 // endregion
 
+// region LongType
+fun longArgument() = NavArgument.Builder().setType(LongType).build()
+
+fun longArgument(
+    defaultValue: Long
+) = NavArgument.Builder().setType(LongType)
+    .setDefaultValue(defaultValue)
+    .build()
+// endregion
+
+// region FloatType
+fun floatArgument() = NavArgument.Builder().setType(FloatType).build()
+
+fun floatArgument(
+    defaultValue: Float
+) = NavArgument.Builder().setType(FloatType)
+    .setDefaultValue(defaultValue)
+    .build()
+// endregion
+
+// region FloatType
+fun referenceArgument() = NavArgument.Builder().setType(ReferenceType).build()
+
+fun referenceArgument(
+    defaultValue: Int
+) = NavArgument.Builder().setType(ReferenceType)
+    .setDefaultValue(defaultValue)
+    .build()
+// endregion
+
 // region StringType
 fun stringArgument(
     isNullable: Boolean = false

navigation/navigation-common/src/main/java/androidx/navigation/NavAction.kt

diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/NavAction.kt b/navigation/navigation-common/src/main/java/androidx/navigation/NavAction.kt
index 9bf2dc9..06c2482 100644
--- a/navigation/navigation-common/src/main/java/androidx/navigation/NavAction.kt
+++ b/navigation/navigation-common/src/main/java/androidx/navigation/NavAction.kt
@@ -63,7 +63,7 @@
     /**
      * Sets the argument bundle to be used by default when navigating to this action.
      *
-     * @param defaultArgs argument bundle that should be used by default
+     * @param defaultArguments argument bundle that should be used by default
      */
     public var defaultArguments: Bundle? = null
 )
\ No newline at end of file

navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.kt

diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.kt b/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.kt
index 97c9bcf..3d2eca2 100644
--- a/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.kt
+++ b/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.kt
@@ -195,9 +195,9 @@
      *
      * @param deepLink to the destination reachable from the current NavGraph
      * @return True if the deepLink exists for the destination.
-     * @see .addDeepLink
+     * @see NavDestination.addDeepLink
      * @see NavController.navigate
-     * @see .hasDeepLink
+     * @see NavDestination.hasDeepLink
      */
     public open fun hasDeepLink(deepLink: Uri): Boolean {
         return hasDeepLink(NavDeepLinkRequest(deepLink, null, null))
@@ -214,7 +214,7 @@
      *
      * @param deepLinkRequest to the destination reachable from the current NavGraph
      * @return True if the deepLink exists for the destination.
-     * @see .addDeepLink
+     * @see NavDestination.addDeepLink
      * @see NavController.navigate
      */
     public open fun hasDeepLink(deepLinkRequest: NavDeepLinkRequest): Boolean {
@@ -249,7 +249,7 @@
      * @param uriPattern The uri pattern to add as a deep link
      * @see NavController.handleDeepLink
      * @see NavController.navigate
-     * @see .addDeepLink
+     * @see NavDestination.addDeepLink
      */
     public fun addDeepLink(uriPattern: String) {
         addDeepLink(NavDeepLink.Builder().setUriPattern(uriPattern).build())
@@ -367,7 +367,7 @@
 
     /**
      * @return Whether this NavDestination supports outgoing actions
-     * @see .putAction
+     * @see NavDestination.putAction
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     public open fun supportsActions(): Boolean {
@@ -463,7 +463,7 @@
         if (args != null) {
             defaultArgs.putAll(args)
             for ((key, value) in _arguments) {
-                require(value.verify(key, args)) {
+                require(value.verify(key, defaultArgs)) {
                     "Wrong argument type for '$key' in argument bundle. ${value.type.name} " +
                         "expected."
                 }

navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.kt

diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.kt b/navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.kt
index d21e3be..091afc1 100644
--- a/navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.kt
+++ b/navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.kt
@@ -78,7 +78,7 @@
      * Whether the destination set in [.getPopUpTo] should be popped from the back stack.
      * @see Builder.setPopUpTo
      *
-     * @see .getPopUpTo
+     * @see NavOptions.getPopUpTo
      */
     public fun isPopUpToInclusive(): Boolean {
         return popUpToInclusive

navigation/navigation-common/src/main/java/androidx/navigation/NavType.kt

diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/NavType.kt b/navigation/navigation-common/src/main/java/androidx/navigation/NavType.kt
index 126c7b04..7b11712 100644
--- a/navigation/navigation-common/src/main/java/androidx/navigation/NavType.kt
+++ b/navigation/navigation-common/src/main/java/androidx/navigation/NavType.kt
@@ -257,8 +257,8 @@
                 bundle.putInt(key, value)
             }
 
-            override fun get(bundle: Bundle, key: String): Int? {
-                return bundle[key] as Int?
+            override fun get(bundle: Bundle, key: String): Int {
+                return bundle[key] as Int
             }
 
             override fun parseValue(value: String): Int {

navigation/navigation-common/src/main/java/androidx/navigation/NavigatorProvider.kt

diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/NavigatorProvider.kt b/navigation/navigation-common/src/main/java/androidx/navigation/NavigatorProvider.kt
index 40858ec..3051250 100644
--- a/navigation/navigation-common/src/main/java/androidx/navigation/NavigatorProvider.kt
+++ b/navigation/navigation-common/src/main/java/androidx/navigation/NavigatorProvider.kt
@@ -41,7 +41,7 @@
      * [Navigator.Name annotation][Navigator.Name]
      * @throws IllegalStateException if the Navigator has not been added
      *
-     * @see .addNavigator
+     * @see NavigatorProvider.addNavigator
      */
     public fun <T : Navigator<*>> getNavigator(navigatorClass: Class<T>): T {
         val name = getNameForNavigator(navigatorClass)
@@ -56,7 +56,7 @@
      *
      * @throws IllegalStateException if the Navigator has not been added
      *
-     * @see .addNavigator
+     * @see NavigatorProvider.addNavigator
      */
     @Suppress("UNCHECKED_CAST")
     @CallSuper

navigation/navigation-compose/build.gradle

diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index d384453..ad1a40c 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -37,7 +37,7 @@
     api(projectOrArtifact(":compose:runtime:runtime-saveable"))
     api(projectOrArtifact(":compose:ui:ui"))
     api(projectOrArtifact(":lifecycle:lifecycle-viewmodel-compose"))
-    api(prebuiltOrSnapshot("androidx.navigation:navigation-runtime-ktx:2.3.4"))
+    api("androidx.navigation:navigation-runtime-ktx:2.3.4")
 
     androidTestImplementation(projectOrArtifact(":compose:material:material"))
     androidTestImplementation("androidx.navigation:navigation-testing:2.3.1")

navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerTest.kt

diff --git a/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerTest.kt b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerTest.kt
index 8412469..7c9a26b 100644
--- a/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerTest.kt
+++ b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerTest.kt
@@ -25,6 +25,8 @@
 import android.os.Parcelable
 import android.view.View
 import androidx.activity.ComponentActivity
+import androidx.activity.OnBackPressedDispatcher
+import androidx.activity.addCallback
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.testing.TestLifecycleOwner
@@ -323,6 +325,10 @@
         navController.navigate(deepLink)
         assertThat(navController.currentDestination?.id ?: 0).isEqualTo(R.id.second_test)
         assertThat(navigator.backStack.size).isEqualTo(2)
+        val intent = navigator.current.second?.getParcelable<Intent>(
+            NavController.KEY_DEEP_LINK_INTENT
+        )
+        assertThat(intent?.data).isEqualTo(deepLink)
     }
 
     @UiThreadTest
@@ -348,11 +354,16 @@
         val navController = createNavController()
         navController.setGraph(R.navigation.nav_simple)
         val navigator = navController.navigatorProvider.getNavigator(TestNavigator::class.java)
-        val deepLink = NavDeepLinkRequest(null, "test.action", null)
+        val action = "test.action"
+        val deepLink = NavDeepLinkRequest(null, action, null)
 
         navController.navigate(deepLink)
         assertThat(navController.currentDestination?.id ?: 0).isEqualTo(R.id.second_test)
         assertThat(navigator.backStack.size).isEqualTo(2)
+        val intent = navigator.current.second?.getParcelable<Intent>(
+            NavController.KEY_DEEP_LINK_INTENT
+        )
+        assertThat(intent?.action).isEqualTo(action)
     }
 
     @UiThreadTest
@@ -387,11 +398,16 @@
         val navController = createNavController()
         navController.setGraph(R.navigation.nav_deeplink)
         val navigator = navController.navigatorProvider.getNavigator(TestNavigator::class.java)
-        val deepLink = NavDeepLinkRequest(null, null, "type/test")
+        val mimeType = "type/test"
+        val deepLink = NavDeepLinkRequest(null, null, mimeType)
 
         navController.navigate(deepLink)
         assertThat(navController.currentDestination?.id ?: 0).isEqualTo(R.id.forth_test)
         assertThat(navigator.backStack.size).isEqualTo(2)
+        val intent = navigator.current.second?.getParcelable<Intent>(
+            NavController.KEY_DEEP_LINK_INTENT
+        )
+        assertThat(intent?.type).isEqualTo(mimeType)
     }
 
     @UiThreadTest
@@ -1580,6 +1596,35 @@
             .that(collectedDestinationIds).hasSize(1)
     }
 
+    @UiThreadTest
+    @Test
+    fun testSetOnBackPressedDispatcherOnNavBackStackEntry() {
+        var backPressedIntercepted = false
+        val navController = createNavController()
+        val lifecycleOwner = TestLifecycleOwner()
+        val dispatcher = OnBackPressedDispatcher()
+
+        navController.setLifecycleOwner(lifecycleOwner)
+        navController.setOnBackPressedDispatcher(dispatcher)
+
+        navController.setGraph(R.navigation.nav_simple)
+        navController.navigate(R.id.second_test)
+        assertEquals(R.id.start_test, navController.previousBackStackEntry?.destination?.id ?: 0)
+
+        dispatcher.addCallback(navController.currentBackStackEntry!!) {
+            backPressedIntercepted = true
+        }
+
+        // Move to STOPPED
+        lifecycleOwner.currentState = Lifecycle.State.CREATED
+        // Move back up to RESUMED
+        lifecycleOwner.currentState = Lifecycle.State.RESUMED
+
+        dispatcher.onBackPressed()
+
+        assertThat(backPressedIntercepted).isTrue()
+    }
+
     private fun createNavController(): NavController {
         val navController = NavController(ApplicationProvider.getApplicationContext())
         val navigator = TestNavigator()

navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavigator.kt

diff --git a/navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavigator.kt b/navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavigator.kt
index b8d2ea9..532a73a 100644
--- a/navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavigator.kt
+++ b/navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavigator.kt
@@ -235,7 +235,7 @@
          * @param dataPattern A URI pattern with segments in the form of `{argName}` that
          * will be replaced with URI encoded versions of the Strings in the
          * arguments Bundle.
-         * @see .setData
+         * @see Destination.setData
          *
          * @return this [Destination]
          */
@@ -371,7 +371,7 @@
          * present.
          *
          * @param data A static URI that should always be used.
-         * @see .setDataPattern
+         * @see Destination.setDataPattern
          * @return this [Destination]
          */
         public fun setData(data: Uri?): Destination {

navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt

diff --git a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
index c4d6a9e..1eabbd2 100644
--- a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
+++ b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
@@ -65,7 +65,7 @@
         /**
          * Gets the topmost navigation graph associated with this NavController.
          *
-         * @see .setGraph
+         * @see NavController.setGraph
          * @throws IllegalStateException if called before `setGraph()`.
          */
         get() {
@@ -80,8 +80,8 @@
          * The graph can be retrieved later via [.getGraph].
          *
          * @param graph graph to set
-         * @see .setGraph
-         * @see .getGraph
+         * @see NavController.setGraph
+         * @see NavController.getGraph
          */
         @CallSuper
         set(graph) {
@@ -500,9 +500,9 @@
      *
      * @param graphResId resource id of the navigation graph to inflate
      *
-     * @see .getNavInflater
-     * @see .setGraph
-     * @see .getGraph
+     * @see NavController.getNavInflater
+     * @see NavController.setGraph
+     * @see NavController.getGraph
      */
     @CallSuper
     public open fun setGraph(@NavigationRes graphResId: Int) {
@@ -518,9 +518,9 @@
      * @param graphResId resource id of the navigation graph to inflate
      * @param startDestinationArgs arguments to send to the start destination of the graph
      *
-     * @see .getNavInflater
-     * @see .setGraph
-     * @see .getGraph
+     * @see NavController.getNavInflater
+     * @see NavController.setGraph
+     * @see NavController.getGraph
      */
     @CallSuper
     public open fun setGraph(@NavigationRes graphResId: Int, startDestinationArgs: Bundle?) {
@@ -534,8 +534,8 @@
      * The graph can be retrieved later via [.getGraph].
      *
      * @param graph graph to set
-     * @see .setGraph
-     * @see .getGraph
+     * @see NavController.setGraph
+     * @see NavController.getGraph
      */
     @CallSuper
     public open fun setGraph(graph: NavGraph, startDestinationArgs: Bundle?) {
@@ -940,7 +940,7 @@
      * thrown.
      *
      * @param deepLink deepLink to the destination reachable from the current NavGraph
-     * @see .navigate
+     * @see NavController.navigate
      */
     public open fun navigate(deepLink: Uri) {
         navigate(NavDeepLinkRequest(deepLink, null, null))
@@ -955,7 +955,7 @@
      *
      * @param deepLink deepLink to the destination reachable from the current NavGraph
      * @param navOptions special options for this navigation operation
-     * @see .navigate
+     * @see NavController.navigate
      */
     public open fun navigate(deepLink: Uri, navOptions: NavOptions?) {
         navigate(NavDeepLinkRequest(deepLink, null, null), navOptions, null)
@@ -971,7 +971,7 @@
      * @param deepLink deepLink to the destination reachable from the current NavGraph
      * @param navOptions special options for this navigation operation
      * @param navigatorExtras extras to pass to the Navigator
-     * @see .navigate
+     * @see NavController.navigate
      */
     public open fun navigate(
         deepLink: Uri,
@@ -1033,8 +1033,13 @@
         val deepLinkMatch = _graph!!.matchDeepLink(request)
         if (deepLinkMatch != null) {
             val destination = deepLinkMatch.destination
-            val args = destination.addInDefaultArgs(deepLinkMatch.matchingArgs)
+            val args = destination.addInDefaultArgs(deepLinkMatch.matchingArgs) ?: Bundle()
             val node = deepLinkMatch.destination
+            val intent = Intent().apply {
+                setDataAndType(request.uri, request.mimeType)
+                action = request.action
+            }
+            args.putParcelable(KEY_DEEP_LINK_INTENT, intent)
             navigate(node, args, navOptions, navigatorExtras)
         } else {
             throw IllegalArgumentException(
@@ -1275,6 +1280,13 @@
         onBackPressedCallback.remove()
         // Then add it to the new dispatcher
         dispatcher.addCallback(lifecycleOwner!!, onBackPressedCallback)
+
+        // Make sure that listener for updating the NavBackStackEntry lifecycles comes after
+        // the dispatcher
+        lifecycleOwner!!.lifecycle.apply {
+            removeObserver(lifecycleObserver)
+            addObserver(lifecycleObserver)
+        }
     }
 
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)

navigation/navigation-runtime/src/main/java/androidx/navigation/NavDeepLinkBuilder.kt

diff --git a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavDeepLinkBuilder.kt b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavDeepLinkBuilder.kt
index 10af220..2b65a53 100644
--- a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavDeepLinkBuilder.kt
+++ b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavDeepLinkBuilder.kt
@@ -52,7 +52,7 @@
  * default activity to launch, if available.
  *
  * @param context Context used to create deep links
- * @see .setComponentName
+ * @see NavDeepLinkBuilder.setComponentName
  */
 constructor(private val context: Context) {
     private class DeepLinkDestination constructor(

navigation/navigation-runtime/src/main/java/androidx/navigation/NavHostController.kt

diff --git a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavHostController.kt b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavHostController.kt
index 4edde8c..db850b7 100644
--- a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavHostController.kt
+++ b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavHostController.kt
@@ -69,7 +69,7 @@
      * [NavHost].
      * @throws IllegalStateException if you have not called
      * [.setLifecycleOwner] before calling this method.
-     * @see .setLifecycleOwner
+     * @see NavHostController.setLifecycleOwner
      */
     public final override fun setOnBackPressedDispatcher(dispatcher: OnBackPressedDispatcher) {
         super.setOnBackPressedDispatcher(dispatcher)

navigation/navigation-ui/src/main/java/androidx/navigation/ui/NavigationUI.kt

diff --git a/navigation/navigation-ui/src/main/java/androidx/navigation/ui/NavigationUI.kt b/navigation/navigation-ui/src/main/java/androidx/navigation/ui/NavigationUI.kt
index 55b453f..f929423 100644
--- a/navigation/navigation-ui/src/main/java/androidx/navigation/ui/NavigationUI.kt
+++ b/navigation/navigation-ui/src/main/java/androidx/navigation/ui/NavigationUI.kt
@@ -168,7 +168,7 @@
      * @param navController The NavController whose navigation actions will be reflected
      * in the title of the action bar.
      * @param openableLayout The Openable layout that should be toggled from the home button
-     * @see .setupActionBarWithNavController
+     * @see NavigationUI.setupActionBarWithNavController
      */
     @JvmStatic
     public fun setupActionBarWithNavController(

paging/integration-tests/testapp/src/main/java/androidx/paging/integration/testapp/custom/PagedListSampleActivity.kt

diff --git a/paging/integration-tests/testapp/src/main/java/androidx/paging/integration/testapp/custom/PagedListSampleActivity.kt b/paging/integration-tests/testapp/src/main/java/androidx/paging/integration/testapp/custom/PagedListSampleActivity.kt
index c9634cb..775f65b 100644
--- a/paging/integration-tests/testapp/src/main/java/androidx/paging/integration/testapp/custom/PagedListSampleActivity.kt
+++ b/paging/integration-tests/testapp/src/main/java/androidx/paging/integration/testapp/custom/PagedListSampleActivity.kt
@@ -20,13 +20,11 @@
 import android.widget.Button
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.Observer
 import androidx.paging.LoadState
 import androidx.paging.LoadState.Error
-import androidx.paging.LoadState.NotLoading
 import androidx.paging.LoadState.Loading
+import androidx.paging.LoadState.NotLoading
 import androidx.paging.LoadType
-import androidx.paging.PagedList
 import androidx.paging.integration.testapp.R
 import androidx.paging.integration.testapp.v3.StateItemAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -48,10 +46,9 @@
         )
 
         @Suppress("DEPRECATION")
-        viewModel.livePagedList.observe(
-            this,
-            Observer<PagedList<Item>> { pagingAdapter.submitList(it) }
-        )
+        viewModel.livePagedList.observe(this) { pagedList ->
+            pagingAdapter.submitList(pagedList)
+        }
 
         setupLoadStateButtons(viewModel, pagingAdapter)
 
@@ -79,7 +76,7 @@
                     button.text = if (state.endOfPaginationReached) "Refresh" else "Done"
                     button.isEnabled = state.endOfPaginationReached
                 }
-                is Loading -> {
+                Loading -> {
                     button.text = "Loading"
                     button.isEnabled = false
                 }

paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt

diff --git a/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt
index b9b3d3d..e07551d 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt
@@ -19,7 +19,6 @@
 import androidx.arch.core.executor.ArchTaskExecutor
 import androidx.arch.core.executor.TaskExecutor
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.Observer
 import androidx.lifecycle.testing.TestLifecycleOwner
 import androidx.paging.LoadState.Error
 import androidx.paging.LoadState.Loading
@@ -42,6 +41,7 @@
 import org.junit.runner.RunWith
 
 @SmallTest
+@Suppress("DEPRECATION")
 @RunWith(AndroidJUnit4::class)
 class LivePagedListBuilderTest {
     private val backgroundExecutor = TestExecutor()
@@ -78,7 +78,7 @@
         ArchTaskExecutor.getInstance().setDelegate(null)
     }
 
-    class MockDataSourceFactory {
+    class MockPagingSourceFactory {
         fun create(): PagingSource<Int, String> {
             return MockPagingSource()
         }
@@ -136,8 +136,7 @@
         // represent the common case when writing tests.
         ArchTaskExecutor.getInstance().setDelegate(null)
 
-        @Suppress("DEPRECATION")
-        LivePagedListBuilder(MockDataSourceFactory()::create, 2)
+        LivePagedListBuilder(MockPagingSourceFactory()::create, 2)
             .build()
     }
 
@@ -145,21 +144,15 @@
     fun executorBehavior() {
         // specify a background dispatcher via builder, and verify it gets used for all loads,
         // overriding default IO dispatcher
-        @Suppress("DEPRECATION")
-        val livePagedList = LivePagedListBuilder(MockDataSourceFactory()::create, 2)
+        val livePagedList = LivePagedListBuilder(MockPagingSourceFactory()::create, 2)
             .setFetchExecutor(backgroundExecutor)
             .build()
 
-        @Suppress("DEPRECATION")
         val pagedListHolder: Array<PagedList<String>?> = arrayOfNulls(1)
 
-        @Suppress("DEPRECATION")
-        livePagedList.observe(
-            lifecycleOwner,
-            Observer<PagedList<String>> { newList ->
-                pagedListHolder[0] = newList
-            }
-        )
+        livePagedList.observe(lifecycleOwner) { newList ->
+            pagedListHolder[0] = newList
+        }
 
         // initially, immediately get passed empty initial list
         assertNotNull(pagedListHolder[0])
@@ -181,24 +174,18 @@
 
     @Test
     fun failedLoad() {
-        val factory = MockDataSourceFactory()
+        val factory = MockPagingSourceFactory()
         factory.enqueueError()
 
-        @Suppress("DEPRECATION")
         val livePagedList = LivePagedListBuilder(factory::create, 2)
             .setFetchExecutor(backgroundExecutor)
             .build()
 
-        @Suppress("DEPRECATION")
         val pagedListHolder: Array<PagedList<String>?> = arrayOfNulls(1)
 
-        @Suppress("DEPRECATION")
-        livePagedList.observe(
-            lifecycleOwner,
-            Observer<PagedList<String>> { newList ->
-                pagedListHolder[0] = newList
-            }
-        )
+        livePagedList.observe(lifecycleOwner) { newList ->
+            pagedListHolder[0] = newList
+        }
 
         val loadStates = mutableListOf<LoadStateEvent>()
 

paging/runtime/src/main/java/androidx/paging/LivePagedListBuilder.kt

diff --git a/paging/runtime/src/main/java/androidx/paging/LivePagedListBuilder.kt b/paging/runtime/src/main/java/androidx/paging/LivePagedListBuilder.kt
index 26e7cd5..907a45a 100644
--- a/paging/runtime/src/main/java/androidx/paging/LivePagedListBuilder.kt
+++ b/paging/runtime/src/main/java/androidx/paging/LivePagedListBuilder.kt
@@ -274,8 +274,8 @@
     /**
      * Constructs the `LiveData<PagedList>`.
      *
-     * No work (such as loading) is done immediately, the creation of the first PagedList is is
-     * deferred until the LiveData is observed.
+     * No work (such as loading) is done immediately, the creation of the first [PagedList] is
+     * deferred until the [LiveData] is observed.
      *
      * @return The [LiveData] of [PagedList]s
      */

recyclerview/OWNERS

diff --git a/recyclerview/OWNERS b/recyclerview/OWNERS
index 9927700..bcc9f1e 100644
--- a/recyclerview/OWNERS
+++ b/recyclerview/OWNERS
@@ -1,3 +1,2 @@
 ryanmentley@google.com
-shepshapard@google.com
 yboyar@google.com
\ No newline at end of file

resourceinspection/resourceinspection-processor/build.gradle

diff --git a/resourceinspection/resourceinspection-processor/build.gradle b/resourceinspection/resourceinspection-processor/build.gradle
index 4b3a931..7e881ef9 100644
--- a/resourceinspection/resourceinspection-processor/build.gradle
+++ b/resourceinspection/resourceinspection-processor/build.gradle
@@ -31,7 +31,8 @@
     implementation(project(":resourceinspection:resourceinspection-annotation"))
     implementation(project(":annotation:annotation"))
 
-    implementation(AUTO_COMMON)
+    // TODO(183520738): Upgrade auto-common dependency to newest version 0.11.
+    implementation("com.google.auto:auto-common:0.10")
     implementation(AUTO_SERVICE_ANNOTATIONS)
     implementation(GRADLE_INCAP_HELPER)
     implementation(GUAVA)

room/compiler-processing-testing/src/main/java/androidx/room/compiler/processing/util/KotlinCompilationUtil.kt

diff --git a/room/compiler-processing-testing/src/main/java/androidx/room/compiler/processing/util/KotlinCompilationUtil.kt b/room/compiler-processing-testing/src/main/java/androidx/room/compiler/processing/util/KotlinCompilationUtil.kt
index 5bc1d03..4263bda 100644
--- a/room/compiler-processing-testing/src/main/java/androidx/room/compiler/processing/util/KotlinCompilationUtil.kt
+++ b/room/compiler-processing-testing/src/main/java/androidx/room/compiler/processing/util/KotlinCompilationUtil.kt
@@ -17,6 +17,7 @@
 package androidx.room.compiler.processing.util
 
 import com.tschuchort.compiletesting.KotlinCompilation
+import org.jetbrains.kotlin.config.JvmTarget
 import java.io.File
 import java.io.OutputStream
 import java.net.URLClassLoader
@@ -43,7 +44,7 @@
         // workaround for https://github.com/tschuchortdev/kotlin-compile-testing/issues/105
         compilation.kotlincArguments += "-Xjava-source-roots=${javaSrcRoot.absolutePath}"
         compilation.jvmDefault = "enable"
-        compilation.jvmTarget = "1.8"
+        compilation.jvmTarget = JvmTarget.JVM_1_8.description
         compilation.inheritClassPath = false
         compilation.verbose = false
         compilation.classpaths = Classpaths.inheritedClasspath + classpaths

room/compiler-processing/src/main/java/androidx/room/compiler/processing/InternalXAnnotated.kt

diff --git a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/InternalXAnnotated.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/InternalXAnnotated.kt
new file mode 100644
index 0000000..815df3f
--- /dev/null
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/InternalXAnnotated.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.room.compiler.processing
+
+import kotlin.reflect.KClass
+
+/**
+ * Internal API for [XAnnotated] that handles repeated annotations.
+ */
+internal interface InternalXAnnotated : XAnnotated {
+    /**
+     * Repeated annotations show up differently between source and .class files.
+     *
+     * To avoid that inconsistency, [XAnnotated] only provides [XAnnotated.getAnnotations] and in
+     * this internal wrapper, we handle that inconsistency by finding the container class and
+     * asking implementers to implement the 2 arg version instead.
+     *
+     * see: https://github.com/google/ksp/issues/356
+     * see: https://github.com/google/ksp/issues/358
+     * see: https://youtrack.jetbrains.com/issue/KT-12794
+     *
+     * @param annotation The annotation to query
+     * @param containerAnnotation The container annotation of the [annotation] if it is a repeatable
+     * annotation.
+     *
+     * @see hasAnnotation
+     */
+    fun <T : Annotation> getAnnotations(
+        annotation: KClass<T>,
+        containerAnnotation: KClass<out Annotation>? = annotation.containerAnnotation
+    ): List<XAnnotationBox<T>>
+
+    override fun <T : Annotation> getAnnotations(annotation: KClass<T>) = getAnnotations(
+        annotation = annotation,
+        containerAnnotation = annotation.containerAnnotation
+    )
+
+    override fun hasAnnotation(annotation: KClass<out Annotation>) = hasAnnotation(
+        annotation = annotation,
+        containerAnnotation = annotation.containerAnnotation
+    )
+
+    /**
+     * Returns `true` if this element is annotated with the given [annotation].
+     *
+     * Note that this method should check for both [annotation] and [containerAnnotation] to
+     * support repeated annotations.
+     *
+     * @param annotation The annotation to query
+     * @param containerAnnotation The container annotation of the [annotation] if it is a repeatable
+     * annotation.
+     *
+     * @see [toAnnotationBox]
+     * @see [hasAnyOf]
+     */
+    fun hasAnnotation(
+        annotation: KClass<out Annotation>,
+        containerAnnotation: KClass<out Annotation>? = annotation.containerAnnotation
+    ): Boolean
+}
\ No newline at end of file

room/compiler-processing/src/main/java/androidx/room/compiler/processing/KClassExt.kt

diff --git a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/KClassExt.kt
similarity index 61%
copy from car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
copy to room/compiler-processing/src/main/java/androidx/room/compiler/processing/KClassExt.kt
index e022dc3..02207f2 100644
--- a/car/app/app/src/main/aidl/androidx/car/app/model/signin/IOnInputCompletedListener.aidl
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/KClassExt.kt
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package androidx.car.app.model.signin;
+package androidx.room.compiler.processing
 
-import androidx.car.app.IOnDoneCallback;
+import kotlin.reflect.KClass
 
-/** @hide */
-oneway interface IOnInputCompletedListener {
-  void onInputCompleted(String value, IOnDoneCallback callback) = 1;
-}
+private typealias JavaRepeatable = java.lang.annotation.Repeatable
+
+/**
+ * Returns the container annotation if `this` is a Repeatable annotation.
+ */
+internal val <T : Annotation> KClass<T>.containerAnnotation: KClass<out Annotation>?
+    get() = this.java.getAnnotation(JavaRepeatable::class.java)?.value

room/compiler-processing/src/main/java/androidx/room/compiler/processing/XAnnotated.kt

diff --git a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XAnnotated.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XAnnotated.kt
index bc43682..de23361 100644
--- a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XAnnotated.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XAnnotated.kt
@@ -23,13 +23,30 @@
  */
 interface XAnnotated {
     /**
-     * If the current element has an annotation with the given [annotation] class, a boxed instance
-     * of it will be returned where fields can be read. Otherwise, `null` value is returned.
+     * Gets the list of annotations with the given type.
+     *
+     * For repeated annotations declared in Java code, please use the repeated annotation type,
+     * not the container. Calling this method with a container annotation will have inconsistent
+     * behaviour between Java AP and KSP.
      *
      * @see [hasAnnotation]
      * @see [hasAnnotationWithPackage]
      */
-    fun <T : Annotation> toAnnotationBox(annotation: KClass<T>): XAnnotationBox<T>?
+    fun <T : Annotation> getAnnotations(
+        annotation: KClass<T>
+    ): List<XAnnotationBox<T>>
+
+    /**
+     * Returns `true` if this element is annotated with the given [annotation].
+     *
+     * For repeated annotations declared in Java code, please use the repeated annotation type,
+     * not the container. Calling this method with a container annotation will have inconsistent
+     * behaviour between Java AP and KSP.
+     * @see [hasAnyOf]
+     */
+    fun hasAnnotation(
+        annotation: KClass<out Annotation>
+    ): Boolean
 
     /**
      * Returns `true` if this element has an annotation that is declared in the given package.
@@ -38,15 +55,26 @@
     fun hasAnnotationWithPackage(pkg: String): Boolean
 
     /**
-     * Returns `true` if this element is annotated with the given [annotation].
-     *
-     * @see [toAnnotationBox]
-     * @see [hasAnyOf]
-     */
-    fun hasAnnotation(annotation: KClass<out Annotation>): Boolean
-
-    /**
      * Returns `true` if this element has one of the [annotations].
      */
     fun hasAnyOf(vararg annotations: KClass<out Annotation>) = annotations.any(this::hasAnnotation)
+
+    @Deprecated(
+        replaceWith = ReplaceWith("getAnnotation(annotation)"),
+        message = "Use getAnnotation(not repeatable) or getAnnotations (repeatable)"
+    )
+    fun <T : Annotation> toAnnotationBox(annotation: KClass<T>): XAnnotationBox<T>? =
+        getAnnotation(annotation)
+
+    /**
+     * If the current element has an annotation with the given [annotation] class, a boxed instance
+     * of it will be returned where fields can be read. Otherwise, `null` value is returned.
+     *
+     * @see [hasAnnotation]
+     * @see [getAnnotations]
+     * @see [hasAnnotationWithPackage]
+     */
+    fun <T : Annotation> getAnnotation(annotation: KClass<T>): XAnnotationBox<T>? {
+        return getAnnotations(annotation).firstOrNull()
+    }
 }
\ No newline at end of file

room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingStep.kt

diff --git a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingStep.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingStep.kt
index 7063b75..725faa16 100644
--- a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingStep.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingStep.kt
@@ -22,13 +22,12 @@
 import androidx.room.compiler.processing.ksp.KspTypeElement
 import com.google.auto.common.BasicAnnotationProcessor
 import com.google.auto.common.MoreElements
-import com.google.common.collect.SetMultimap
+import com.google.common.collect.ImmutableSetMultimap
 import com.google.devtools.ksp.symbol.KSAnnotated
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import javax.annotation.processing.ProcessingEnvironment
 import javax.lang.model.element.Element
 import javax.tools.Diagnostic
-import kotlin.reflect.KClass
 
 /**
  * Specialized processing step which only supports annotations on TypeElements.
@@ -47,13 +46,13 @@
      */
     fun process(
         env: XProcessingEnv,
-        elementsByAnnotation: Map<KClass<out Annotation>, List<XTypeElement>>
+        elementsByAnnotation: Map<String, List<XTypeElement>>
     ): Set<XTypeElement>
 
     /**
-     * The set of annotations processed by this step.
+     * The set of annotation qualified names processed by this step.
      */
-    fun annotations(): Set<KClass<out Annotation>>
+    fun annotations(): Set<String>
 
     /**
      * Wraps current [XProcessingStep] into an Auto Common
@@ -61,7 +60,7 @@
      */
     fun asAutoCommonProcessor(
         env: ProcessingEnvironment
-    ): BasicAnnotationProcessor.ProcessingStep {
+    ): BasicAnnotationProcessor.Step {
         return JavacProcessingStepDelegate(
             env = env,
             delegate = this
@@ -72,7 +71,7 @@
         check(env is KspProcessingEnv)
         val args = annotations().associateWith { annotation ->
             val elements = env.resolver.getSymbolsWithAnnotation(
-                annotation.java.canonicalName
+                annotation
             ).filterIsInstance<KSClassDeclaration>()
                 .map {
                     env.requireTypeElement(it.qualifiedName!!.asString())
@@ -84,15 +83,17 @@
     }
 }
 
-@Suppress("UnstableApiUsage")
 internal class JavacProcessingStepDelegate(
     val env: ProcessingEnvironment,
     val delegate: XProcessingStep
-) : BasicAnnotationProcessor.ProcessingStep {
+) : BasicAnnotationProcessor.Step {
+    override fun annotations(): Set<String> = delegate.annotations()
+
+    @Suppress("UnstableApiUsage")
     override fun process(
-        elementsByAnnotation: SetMultimap<Class<out Annotation>, Element>
+        elementsByAnnotation: ImmutableSetMultimap<String, Element>
     ): Set<Element> {
-        val converted = mutableMapOf<KClass<out Annotation>, List<XTypeElement>>()
+        val converted = mutableMapOf<String, List<XTypeElement>>()
         // create a new x processing environment for each step to ensure it can freely cache
         // whatever it wants and we don't keep elements references across rounds.
         val xEnv = JavacProcessingEnv(env)
@@ -109,17 +110,11 @@
                     null
                 }
             }
-            converted[annotation.kotlin] = elements
+            converted[annotation] = elements
         }
         val result = delegate.process(xEnv, converted)
         return result.map {
             (it as JavacElement).element
         }.toSet()
     }
-
-    override fun annotations(): Set<Class<out Annotation>> {
-        return delegate.annotations().mapTo(mutableSetOf()) {
-            it.java
-        }
-    }
 }

room/compiler-processing/src/main/java/androidx/room/compiler/processing/XRoundEnv.kt

diff --git a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XRoundEnv.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XRoundEnv.kt
index 0f41811..e7b19ef 100644
--- a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XRoundEnv.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XRoundEnv.kt
@@ -36,9 +36,9 @@
     val rootElements: Set<XElement>
 
     /**
-     * Returns the set of [XElement]s that are annotated with the given [klass].
+     * Returns the set of [XElement]s that are annotated with the given [annotationQualifiedName].
      */
-    fun getTypeElementsAnnotatedWith(klass: Class<out Annotation>): Set<XTypeElement>
+    fun getTypeElementsAnnotatedWith(annotationQualifiedName: String): Set<XTypeElement>
 
     companion object {
         /**

room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt

diff --git a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt
index d12eb4d..7397551 100644
--- a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt
@@ -16,10 +16,12 @@
 
 package androidx.room.compiler.processing.javac
 
+import androidx.room.compiler.processing.InternalXAnnotated
 import androidx.room.compiler.processing.XAnnotationBox
 import androidx.room.compiler.processing.XElement
 import androidx.room.compiler.processing.XEquality
 import com.google.auto.common.MoreElements
+import com.google.auto.common.MoreElements.isAnnotationPresent
 import java.util.Locale
 import javax.lang.model.element.Element
 import kotlin.reflect.KClass
@@ -28,16 +30,34 @@
 internal abstract class JavacElement(
     protected val env: JavacProcessingEnv,
     open val element: Element
-) : XElement, XEquality {
-    override fun <T : Annotation> toAnnotationBox(annotation: KClass<T>): XAnnotationBox<T>? {
-        return MoreElements
-            .getAnnotationMirror(element, annotation.java)
-            .orNull()
-            ?.box(env, annotation.java)
+) : XElement, XEquality, InternalXAnnotated {
+    override fun <T : Annotation> getAnnotations(
+        annotation: KClass<T>,
+        containerAnnotation: KClass<out Annotation>?
+    ): List<XAnnotationBox<T>> {
+        return if (containerAnnotation == null) {
+            MoreElements
+                .getAnnotationMirror(element, annotation.java)
+                .orNull()
+                ?.box(env, annotation.java)
+                ?.let {
+                    listOf(it)
+                }
+        } else {
+            val container = MoreElements
+                .getAnnotationMirror(element, containerAnnotation.java)
+                .orNull()
+                ?.box(env, containerAnnotation.java)
+            container?.getAsAnnotationBoxArray<T>("value")?.toList()
+        } ?: emptyList()
     }
 
-    override fun hasAnnotation(annotation: KClass<out Annotation>): Boolean {
-        return MoreElements.isAnnotationPresent(element, annotation.java)
+    override fun hasAnnotation(
+        annotation: KClass<out Annotation>,
+        containerAnnotation: KClass<out Annotation>?
+    ): Boolean {
+        return isAnnotationPresent(element, annotation.java) ||
+            (containerAnnotation != null && isAnnotationPresent(element, containerAnnotation.java))
     }
 
     override fun toString(): String {

room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacRoundEnv.kt

diff --git a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacRoundEnv.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacRoundEnv.kt
index 672a539..d878f1d 100644
--- a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacRoundEnv.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacRoundEnv.kt
@@ -37,8 +37,10 @@
     }
 
     // TODO this is only for tests but we may need to support more types of elements
-    override fun getTypeElementsAnnotatedWith(klass: Class<out Annotation>): Set<XTypeElement> {
-        val result = delegate.getElementsAnnotatedWith(klass)
+    override fun getTypeElementsAnnotatedWith(annotationQualifiedName: String): Set<XTypeElement> {
+        val element = env.elementUtils.getTypeElement(annotationQualifiedName)
+            ?: error("Cannot find TypeElement: $annotationQualifiedName")
+        val result = delegate.getElementsAnnotatedWith(element)
         return result.filter {
             MoreElements.isType(it)
         }.map {

room/compiler-processing/src/main/java/androidx/room/compiler/processing/ksp/KspAnnotated.kt

diff --git a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/ksp/KspAnnotated.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/ksp/KspAnnotated.kt
index 0e6a7aa..0cf6f88 100644
--- a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/ksp/KspAnnotated.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/ksp/KspAnnotated.kt
@@ -16,6 +16,7 @@
 
 package androidx.room.compiler.processing.ksp
 
+import androidx.room.compiler.processing.InternalXAnnotated
 import androidx.room.compiler.processing.XAnnotated
 import androidx.room.compiler.processing.XAnnotationBox
 import com.google.devtools.ksp.symbol.AnnotationUseSiteTarget
@@ -25,20 +26,40 @@
 
 internal sealed class KspAnnotated(
     val env: KspProcessingEnv
-) : XAnnotated {
+) : InternalXAnnotated {
     abstract fun annotations(): Sequence<KSAnnotation>
 
-    override fun <T : Annotation> toAnnotationBox(annotation: KClass<T>): XAnnotationBox<T>? {
-        return annotations().firstOrNull {
+    private fun <T : Annotation> findAnnotations(annotation: KClass<T>): Sequence<KSAnnotation> {
+        return annotations().filter {
             val qName = it.annotationType.resolve().declaration.qualifiedName?.asString()
             qName == annotation.qualifiedName
-        }?.let {
+        }
+    }
+
+    override fun <T : Annotation> getAnnotations(
+        annotation: KClass<T>,
+        containerAnnotation: KClass<out Annotation>?
+    ): List<XAnnotationBox<T>> {
+        // we'll try both because it can be the container or the annotation itself.
+        // try container first
+        if (containerAnnotation != null) {
+            // if container also repeats, this won't work but we don't have that use case
+            findAnnotations(containerAnnotation).firstOrNull()?.let {
+                return KspAnnotationBox(
+                    env = env,
+                    annotation = it,
+                    annotationClass = containerAnnotation.java,
+                ).getAsAnnotationBoxArray<T>("value").toList()
+            }
+        }
+        // didn't find anything with the container, try the annotation class
+        return findAnnotations(annotation).map {
             KspAnnotationBox(
                 env = env,
                 annotationClass = annotation.java,
                 annotation = it
             )
-        }
+        }.toList()
     }
 
     override fun hasAnnotationWithPackage(pkg: String): Boolean {
@@ -47,10 +68,14 @@
         }
     }
 
-    override fun hasAnnotation(annotation: KClass<out Annotation>): Boolean {
+    override fun hasAnnotation(
+        annotation: KClass<out Annotation>,
+        containerAnnotation: KClass<out Annotation>?
+    ): Boolean {
         return annotations().any {
             val qName = it.annotationType.resolve().declaration.qualifiedName?.asString()
-            qName == annotation.qualifiedName
+            qName == annotation.qualifiedName ||
+                (containerAnnotation != null && qName == containerAnnotation.qualifiedName)
         }
     }
 
@@ -143,4 +168,4 @@
             } ?: NotAnnotated(env)
         }
     }
-}
+}
\ No newline at end of file

room/compiler-processing/src/main/java/androidx/room/compiler/processing/ksp/KspRoundEnv.kt

diff --git a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/ksp/KspRoundEnv.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/ksp/KspRoundEnv.kt
index 864b472..8162e8c 100644
--- a/room/compiler-processing/src/main/java/androidx/room/compiler/processing/ksp/KspRoundEnv.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/ksp/KspRoundEnv.kt
@@ -29,9 +29,9 @@
     override val rootElements: Set<XElement>
         get() = TODO("not supported")
 
-    override fun getTypeElementsAnnotatedWith(klass: Class<out Annotation>): Set<XTypeElement> {
+    override fun getTypeElementsAnnotatedWith(annotationQualifiedName: String): Set<XTypeElement> {
         return env.resolver.getSymbolsWithAnnotation(
-            klass.canonicalName
+            annotationQualifiedName
         ).filterIsInstance<KSClassDeclaration>()
             .map {
                 env.wrapClassDeclaration(it)

room/compiler-processing/src/test/java/androidx/room/compiler/processing/JavacTestProcessorTest.kt

diff --git a/room/compiler-processing/src/test/java/androidx/room/compiler/processing/JavacTestProcessorTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/JavacTestProcessorTest.kt
index 625454e..3f67ea3 100644
--- a/room/compiler-processing/src/test/java/androidx/room/compiler/processing/JavacTestProcessorTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/JavacTestProcessorTest.kt
@@ -42,7 +42,7 @@
             override fun doProcess(annotations: Set<XTypeElement>, roundEnv: XRoundEnv): Boolean {
                 invoked.set(true)
                 val annotatedElements = roundEnv.getTypeElementsAnnotatedWith(
-                    OtherAnnotation::class.java
+                    OtherAnnotation::class.qualifiedName!!
                 )
                 val targetElement = xProcessingEnv.requireTypeElement("foo.bar.Baz")
                 assertThat(

room/compiler-processing/src/test/java/androidx/room/compiler/processing/XAnnotationBoxTest.kt

diff --git a/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XAnnotationBoxTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XAnnotationBoxTest.kt
index f8bf777..06a3390 100644
--- a/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XAnnotationBoxTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XAnnotationBoxTest.kt
@@ -22,6 +22,7 @@
 import androidx.room.compiler.processing.testcode.JavaEnum
 import androidx.room.compiler.processing.testcode.MainAnnotation
 import androidx.room.compiler.processing.testcode.OtherAnnotation
+import androidx.room.compiler.processing.testcode.RepeatableJavaAnnotation
 import androidx.room.compiler.processing.testcode.TestSuppressWarnings
 import androidx.room.compiler.processing.util.Source
 import androidx.room.compiler.processing.util.XTestInvocation
@@ -95,7 +96,7 @@
             sources = listOf(source)
         ) {
             val element = it.processingEnv.requireTypeElement("foo.bar.Baz")
-            val annotationBox = element.toAnnotationBox(TestSuppressWarnings::class)
+            val annotationBox = element.getAnnotation(TestSuppressWarnings::class)
             assertThat(annotationBox).isNotNull()
             assertThat(
                 annotationBox!!.value.value
@@ -134,7 +135,7 @@
             listOf(mySource)
         ) {
             val element = it.processingEnv.requireTypeElement("foo.bar.Baz")
-            element.toAnnotationBox(MainAnnotation::class)!!.let { annotation ->
+            element.getAnnotation(MainAnnotation::class)!!.let { annotation ->
                 assertThat(
                     annotation.getAsTypeList("typeList")
                 ).containsExactly(
@@ -177,7 +178,7 @@
             sources = listOf(source)
         ) {
             val element = it.processingEnv.requireTypeElement("Subject")
-            val annotationBox = element.toAnnotationBox(TestSuppressWarnings::class)
+            val annotationBox = element.getAnnotation(TestSuppressWarnings::class)
             assertThat(annotationBox).isNotNull()
             assertThat(
                 annotationBox!!.value.value
@@ -217,7 +218,7 @@
             listOf(mySource)
         ) { invocation ->
             val element = invocation.processingEnv.requireTypeElement("Subject")
-            element.toAnnotationBox(MainAnnotation::class)!!.let { annotation ->
+            element.getAnnotation(MainAnnotation::class)!!.let { annotation ->
                 assertThat(
                     annotation.getAsTypeList("typeList").map {
                         it.typeName
@@ -267,7 +268,7 @@
             sources = listOf(src)
         ) { invocation ->
             val subject = invocation.processingEnv.requireTypeElement("Subject")
-            val annotationValue = subject.toAnnotationBox(
+            val annotationValue = subject.getAnnotation(
                 JavaAnnotationWithTypeReferences::class
             )?.getAsTypeList("value")
             assertThat(annotationValue?.map { it.typeName }).containsExactly(
@@ -423,7 +424,7 @@
                     invocation.processingEnv.requireTypeElement(it)
                 }.forEach { typeElement ->
                     val annotation =
-                        typeElement.toAnnotationBox(JavaAnnotationWithDefaults::class)
+                        typeElement.getAnnotation(JavaAnnotationWithDefaults::class)
                     checkNotNull(annotation)
                     assertThat(annotation.value.intVal).isEqualTo(3)
                     assertThat(annotation.value.intArrayVal).isEqualTo(intArrayOf(1, 3, 5))
@@ -499,7 +500,7 @@
             arrayOf("JavaSubject", "KotlinSubject").map {
                 invocation.processingEnv.requireTypeElement(it)
             }.forEach { subject ->
-                val annotation = subject.getField("annotated1").toAnnotationBox(
+                val annotation = subject.getField("annotated1").getAnnotation(
                     JavaAnnotationWithPrimitiveArray::class
                 )
                 assertThat(
@@ -511,9 +512,65 @@
         }
     }
 
+    @Test
+    fun javaRepeatableAnnotation() {
+        val javaSrc = Source.java(
+            "JavaSubject",
+            """
+            import ${RepeatableJavaAnnotation::class.qualifiedName};
+            @RepeatableJavaAnnotation("x")
+            @RepeatableJavaAnnotation("y")
+            @RepeatableJavaAnnotation("z")
+            public class JavaSubject {}
+            """.trimIndent()
+        )
+        val kotlinSrc = Source.kotlin(
+            "KotlinSubject.kt",
+            """
+            import ${RepeatableJavaAnnotation::class.qualifiedName}
+            // TODO update when https://youtrack.jetbrains.com/issue/KT-12794 is fixed.
+            // right now, kotlin does not support repeatable annotations.
+            @RepeatableJavaAnnotation.List(
+                RepeatableJavaAnnotation("x"),
+                RepeatableJavaAnnotation("y"),
+                RepeatableJavaAnnotation("z")
+            )
+            public class KotlinSubject
+            """.trimIndent()
+        )
+        runTest(
+            sources = listOf(javaSrc, kotlinSrc)
+        ) { invocation ->
+            listOf("JavaSubject", "KotlinSubject")
+                .map(invocation.processingEnv::requireTypeElement)
+                .forEach { subject ->
+                    if (invocation.isKsp && preCompiled) {
+                        // TODO remove once https://github.com/google/ksp/issues/356 is fixed
+                        // KSP cannot read array of annotation values in compiled code
+                    } else {
+                        val annotations = subject.getAnnotations(
+                            RepeatableJavaAnnotation::class
+                        )
+                        assertThat(
+                            subject.hasAnnotation(
+                                RepeatableJavaAnnotation::class
+                            )
+                        ).isTrue()
+                        val values = annotations
+                            .map {
+                                it.value.value
+                            }
+                        assertWithMessage(subject.qualifiedName)
+                            .that(values)
+                            .containsExactly("x", "y", "z")
+                    }
+                }
+        }
+    }
+
     // helper function to read what we need
     private fun XAnnotated.getSuppressValues(): Array<String>? {
-        return this.toAnnotationBox(TestSuppressWarnings::class)?.value?.value
+        return this.getAnnotation(TestSuppressWarnings::class)?.value?.value
     }
 
     private fun XAnnotated.assertHasSuppressWithValue(vararg expected: String) {
@@ -541,7 +598,7 @@
     }
 
     private fun XAnnotated.getOtherAnnotationValue(): String? {
-        return this.toAnnotationBox(OtherAnnotation::class)?.value?.value
+        return this.getAnnotation(OtherAnnotation::class)?.value?.value
     }
 
     companion object {

room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingStepTest.kt

diff --git a/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingStepTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingStepTest.kt
index 0eacab4..ac75488 100644
--- a/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingStepTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingStepTest.kt
@@ -54,23 +54,26 @@
         val processingStep = object : XProcessingStep {
             override fun process(
                 env: XProcessingEnv,
-                elementsByAnnotation: Map<KClass<out Annotation>, List<XTypeElement>>
+                elementsByAnnotation: Map<String, List<XTypeElement>>
             ): Set<XTypeElement> {
-                elementsByAnnotation[OtherAnnotation::class]?.forEach {
+                elementsByAnnotation[OtherAnnotation::class.qualifiedName]?.forEach {
                     annotatedElements[OtherAnnotation::class] = it.qualifiedName
                 }
-                elementsByAnnotation[MainAnnotation::class]?.forEach {
+                elementsByAnnotation[MainAnnotation::class.qualifiedName]?.forEach {
                     annotatedElements[MainAnnotation::class] = it.qualifiedName
                 }
                 return emptySet()
             }
 
-            override fun annotations(): Set<KClass<out Annotation>> {
-                return setOf(OtherAnnotation::class, MainAnnotation::class)
+            override fun annotations(): Set<String> {
+                return setOf(
+                    OtherAnnotation::class.qualifiedName!!,
+                    MainAnnotation::class.qualifiedName!!
+                )
             }
         }
         val mainProcessor = object : BasicAnnotationProcessor() {
-            override fun initSteps(): Iterable<ProcessingStep> {
+            override fun steps(): Iterable<Step> {
                 return listOf(
                     processingStep.asAutoCommonProcessor(processingEnv)
                 )
@@ -123,11 +126,11 @@
         val processingStep = object : XProcessingStep {
             override fun process(
                 env: XProcessingEnv,
-                elementsByAnnotation: Map<KClass<out Annotation>, List<XTypeElement>>
+                elementsByAnnotation: Map<String, List<XTypeElement>>
             ): Set<XTypeElement> {
                 // for each element annotated with Main annotation, create a class with Other
                 // annotation to trigger another round
-                elementsByAnnotation[MainAnnotation::class]?.forEach {
+                elementsByAnnotation[MainAnnotation::class.qualifiedName]?.forEach {
                     val className = ClassName.get(it.packageName, "${it.name}_Impl")
                     val spec = TypeSpec.classBuilder(className)
                         .addAnnotation(
@@ -140,14 +143,17 @@
                         .build()
                         .writeTo(env.filer)
                 }
-                elementsByAnnotation[OtherAnnotation::class]?.forEach {
+                elementsByAnnotation[OtherAnnotation::class.qualifiedName]?.forEach {
                     otherAnnotatedElements.add(it.type.typeName)
                 }
                 return emptySet()
             }
 
-            override fun annotations(): Set<KClass<out Annotation>> {
-                return setOf(OtherAnnotation::class, MainAnnotation::class)
+            override fun annotations(): Set<String> {
+                return setOf(
+                    OtherAnnotation::class.qualifiedName!!,
+                    MainAnnotation::class.qualifiedName!!
+                )
             }
         }
         val main = JavaFileObjects.forSourceString(
@@ -171,16 +177,16 @@
             listOf(main)
         ).processedWith(
             object : BasicAnnotationProcessor() {
-                override fun initSteps(): Iterable<ProcessingStep> {
+                override fun steps(): Iterable<Step> {
                     return listOf(
                         processingStep.asAutoCommonProcessor(processingEnv)
                     )
                 }
 
-                override fun getSupportedOptions(): MutableSet<String> {
-                    return mutableSetOf(
-                        MainAnnotation::class.java.canonicalName,
-                        OtherAnnotation::class.java.canonicalName
+                override fun getSupportedOptions(): Set<String> {
+                    return setOf(
+                        MainAnnotation::class.qualifiedName!!,
+                        OtherAnnotation::class.qualifiedName!!
                     )
                 }
             }
@@ -198,14 +204,14 @@
             var roundCounter = 0
             override fun process(
                 env: XProcessingEnv,
-                elementsByAnnotation: Map<KClass<out Annotation>, List<XTypeElement>>
+                elementsByAnnotation: Map<String, List<XTypeElement>>
             ): Set<XTypeElement> {
                 elementPerRound[roundCounter++] = listOf(
                     env.requireTypeElement("foo.bar.Main"),
                     env.requireTypeElement("foo.bar.Main")
                 )
                 // trigger another round
-                elementsByAnnotation[MainAnnotation::class]?.forEach {
+                elementsByAnnotation[MainAnnotation::class.qualifiedName]?.forEach {
                     val className = ClassName.get(it.packageName, "${it.name}_Impl")
                     val spec = TypeSpec.classBuilder(className)
                         .addAnnotation(
@@ -221,8 +227,11 @@
                 return emptySet()
             }
 
-            override fun annotations(): Set<KClass<out Annotation>> {
-                return setOf(OtherAnnotation::class, MainAnnotation::class)
+            override fun annotations(): Set<String> {
+                return setOf(
+                    OtherAnnotation::class.qualifiedName!!,
+                    MainAnnotation::class.qualifiedName!!
+                )
             }
         }
         val main = JavaFileObjects.forSourceString(
@@ -246,16 +255,16 @@
             listOf(main)
         ).processedWith(
             object : BasicAnnotationProcessor() {
-                override fun initSteps(): Iterable<ProcessingStep> {
+                override fun steps(): Iterable<Step> {
                     return listOf(
                         processingStep.asAutoCommonProcessor(processingEnv)
                     )
                 }
 
-                override fun getSupportedOptions(): MutableSet<String> {
-                    return mutableSetOf(
-                        MainAnnotation::class.java.canonicalName,
-                        OtherAnnotation::class.java.canonicalName
+                override fun getSupportedOptions(): Set<String> {
+                    return setOf(
+                        MainAnnotation::class.qualifiedName!!,
+                        OtherAnnotation::class.qualifiedName!!
                     )
                 }
             }
@@ -278,15 +287,15 @@
         val processingStep = object : XProcessingStep {
             override fun process(
                 env: XProcessingEnv,
-                elementsByAnnotation: Map<KClass<out Annotation>, List<XTypeElement>>
+                elementsByAnnotation: Map<String, List<XTypeElement>>
             ): Set<XTypeElement> {
                 return elementsByAnnotation.values
                     .flatten()
                     .toSet()
             }
 
-            override fun annotations(): Set<KClass<out Annotation>> {
-                return setOf(OtherAnnotation::class)
+            override fun annotations(): Set<String> {
+                return setOf(OtherAnnotation::class.qualifiedName!!)
             }
         }
         var returned: List<KSAnnotated>? = null

room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/RepeatableJavaAnnotation.java

diff --git a/room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/RepeatableJavaAnnotation.java b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/RepeatableJavaAnnotation.java
new file mode 100644
index 0000000..cc0ba38
--- /dev/null
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/RepeatableJavaAnnotation.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.room.compiler.processing.testcode;
+
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Repeatable(RepeatableJavaAnnotation.List.class)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RepeatableJavaAnnotation {
+    String value();
+    @Retention(RetentionPolicy.RUNTIME)
+    @interface List {
+        RepeatableJavaAnnotation[] value();
+    }
+}

room/compiler/src/main/kotlin/androidx/room/DatabaseProcessingStep.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/DatabaseProcessingStep.kt b/room/compiler/src/main/kotlin/androidx/room/DatabaseProcessingStep.kt
index ede6dab..dd00786 100644
--- a/room/compiler/src/main/kotlin/androidx/room/DatabaseProcessingStep.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/DatabaseProcessingStep.kt
@@ -29,16 +29,15 @@
 import androidx.room.writer.DaoWriter
 import androidx.room.writer.DatabaseWriter
 import java.io.File
-import kotlin.reflect.KClass
 
 class DatabaseProcessingStep : XProcessingStep {
     override fun process(
         env: XProcessingEnv,
-        elementsByAnnotation: Map<KClass<out Annotation>, List<XTypeElement>>
+        elementsByAnnotation: Map<String, List<XTypeElement>>
     ): Set<XTypeElement> {
         val context = Context(env)
         val rejectedElements = mutableSetOf<XTypeElement>()
-        val databases = elementsByAnnotation[Database::class]
+        val databases = elementsByAnnotation[Database::class.qualifiedName]
             ?.mapNotNull {
                 try {
                     DatabaseProcessor(
@@ -100,8 +99,8 @@
         return rejectedElements
     }
 
-    override fun annotations(): Set<KClass<out Annotation>> {
-        return mutableSetOf(Database::class)
+    override fun annotations(): Set<String> {
+        return mutableSetOf(Database::class.qualifiedName!!)
     }
 
     /**

room/compiler/src/main/kotlin/androidx/room/RoomProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/RoomProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/RoomProcessor.kt
index 76a7a8a..ed1595c 100644
--- a/room/compiler/src/main/kotlin/androidx/room/RoomProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/RoomProcessor.kt
@@ -38,7 +38,7 @@
     /** Helper variable to avoid reporting the warning twice. */
     private var jdkVersionHasBugReported = false
 
-    override fun initSteps(): MutableIterable<ProcessingStep> {
+    override fun steps(): MutableIterable<Step> {
         return mutableListOf(
             DatabaseProcessingStep().asAutoCommonProcessor(processingEnv)
         )

room/compiler/src/main/kotlin/androidx/room/processor/AutoMigrationProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/AutoMigrationProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/AutoMigrationProcessor.kt
index cc7781c..d8818644 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/AutoMigrationProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/AutoMigrationProcessor.kt
@@ -49,7 +49,8 @@
             return null
         }
 
-        if (!context.processingEnv.requireType(RoomTypeNames.AUTO_MIGRATION_CALLBACK)
+        if (!context.processingEnv
+            .requireType(RoomTypeNames.AUTO_MIGRATION_CALLBACK)
             .isAssignableFrom(element.type)
         ) {
             context.logger.e(
@@ -59,7 +60,7 @@
             return null
         }
 
-        val annotationBox = element.toAnnotationBox(AutoMigration::class)
+        val annotationBox = element.getAnnotation(AutoMigration::class)
         if (annotationBox == null) {
             context.logger.e(
                 element,

room/compiler/src/main/kotlin/androidx/room/processor/CustomConverterProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/CustomConverterProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/CustomConverterProcessor.kt
index 4f284c2..aceb277 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/CustomConverterProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/CustomConverterProcessor.kt
@@ -44,7 +44,7 @@
             isError() || isVoid() || isNone()
 
         fun findConverters(context: Context, element: XElement): ProcessResult {
-            val annotation = element.toAnnotationBox(TypeConverters::class)
+            val annotation = element.getAnnotation(TypeConverters::class)
             return annotation?.let {
                 val classes = it.getAsTypeList("value")
                     .mapTo(LinkedHashSet()) { it }

room/compiler/src/main/kotlin/androidx/room/processor/DatabaseProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseProcessor.kt
index 745bd1f..35ca51e 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseProcessor.kt
@@ -55,7 +55,7 @@
     }
 
     private fun doProcess(): Database {
-        val dbAnnotation = element.toAnnotationBox(androidx.room.Database::class)!!
+        val dbAnnotation = element.getAnnotation(androidx.room.Database::class)!!
 
         val entities = processEntities(dbAnnotation, element)
         val viewsMap = processDatabaseViews(dbAnnotation)
@@ -125,7 +125,7 @@
         element: XTypeElement,
         latestDbSchema: DatabaseBundle
     ): List<AutoMigrationResult> {
-        val dbAnnotation = element.toAnnotationBox(androidx.room.Database::class)!!
+        val dbAnnotation = element.getAnnotation(androidx.room.Database::class)!!
         val autoMigrationList = dbAnnotation.getAsTypeList("autoMigrations")
         context.checker.check(
             autoMigrationList.isEmpty() || dbAnnotation.value.exportSchema,

room/compiler/src/main/kotlin/androidx/room/processor/DatabaseViewProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseViewProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseViewProcessor.kt
index 0253959..67aecd0 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseViewProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseViewProcessor.kt
@@ -35,7 +35,7 @@
             element, androidx.room.DatabaseView::class,
             ProcessorErrors.VIEW_MUST_BE_ANNOTATED_WITH_DATABASE_VIEW
         )
-        val annotationBox = element.toAnnotationBox(androidx.room.DatabaseView::class)
+        val annotationBox = element.getAnnotation(androidx.room.DatabaseView::class)
 
         val viewName: String = if (annotationBox != null) {
             extractViewName(element, annotationBox.value)

room/compiler/src/main/kotlin/androidx/room/processor/FieldProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/FieldProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/FieldProcessor.kt
index 9e08987..f436016 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/FieldProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/FieldProcessor.kt
@@ -37,7 +37,7 @@
     fun process(): Field {
         val member = element.asMemberOf(containing)
         val type = member.typeName
-        val columnInfo = element.toAnnotationBox(ColumnInfo::class)?.value
+        val columnInfo = element.getAnnotation(ColumnInfo::class)?.value
         val name = element.name
         val rawCName = if (columnInfo != null && columnInfo.name != ColumnInfo.INHERIT_FIELD_NAME) {
             columnInfo.name

room/compiler/src/main/kotlin/androidx/room/processor/FtsTableEntityProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/FtsTableEntityProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/FtsTableEntityProcessor.kt
index eec6de9..7956c0d 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/FtsTableEntityProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/FtsTableEntityProcessor.kt
@@ -57,7 +57,7 @@
             element, androidx.room.Entity::class,
             ProcessorErrors.ENTITY_MUST_BE_ANNOTATED_WITH_ENTITY
         )
-        val entityAnnotation = element.toAnnotationBox(androidx.room.Entity::class)
+        val entityAnnotation = element.getAnnotation(androidx.room.Entity::class)
         val tableName: String
         if (entityAnnotation != null) {
             tableName = extractTableName(element, entityAnnotation.value)
@@ -84,9 +84,9 @@
         context.checker.check(pojo.relations.isEmpty(), element, ProcessorErrors.RELATION_IN_ENTITY)
 
         val (ftsVersion, ftsOptions) = if (element.hasAnnotation(androidx.room.Fts3::class)) {
-            FtsVersion.FTS3 to getFts3Options(element.toAnnotationBox(Fts3::class)!!)
+            FtsVersion.FTS3 to getFts3Options(element.getAnnotation(Fts3::class)!!)
         } else {
-            FtsVersion.FTS4 to getFts4Options(element.toAnnotationBox(Fts4::class)!!)
+            FtsVersion.FTS4 to getFts4Options(element.getAnnotation(Fts4::class)!!)
         }
 
         val shadowTableName = if (ftsOptions.contentEntity != null) {

room/compiler/src/main/kotlin/androidx/room/processor/PojoProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/PojoProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/PojoProcessor.kt
index 8747d0d..05c820d 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/PojoProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/PojoProcessor.kt
@@ -140,7 +140,7 @@
             }
 
         val ignoredColumns =
-            element.toAnnotationBox(androidx.room.Entity::class)?.value?.ignoredColumns?.toSet()
+            element.getAnnotation(androidx.room.Entity::class)?.value?.ignoredColumns?.toSet()
                 ?: emptySet()
         val fieldBindingErrors = mutableMapOf<Field, String>()
         val unfilteredMyFields = allFields[null]
@@ -403,7 +403,7 @@
             return null
         }
 
-        val fieldPrefix = variableElement.toAnnotationBox(Embedded::class)?.value?.prefix ?: ""
+        val fieldPrefix = variableElement.getAnnotation(Embedded::class)?.value?.prefix ?: ""
         val inheritedPrefix = parent?.prefix ?: ""
         val embeddedField = Field(
             variableElement,
@@ -432,7 +432,7 @@
         container: XType?,
         relationElement: XFieldElement
     ): androidx.room.vo.Relation? {
-        val annotation = relationElement.toAnnotationBox(Relation::class)!!
+        val annotation = relationElement.getAnnotation(Relation::class)!!
 
         val parentField = myFields.firstOrNull {
             it.columnName == annotation.value.parentColumn

room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
index b495976..9bee7d3 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
@@ -48,7 +48,7 @@
      * implemented as a sub procedure in [InternalQueryProcessor].
      */
     fun process(): QueryMethod {
-        val annotation = executableElement.toAnnotationBox(Query::class)?.value
+        val annotation = executableElement.getAnnotation(Query::class)?.value
         context.checker.check(
             annotation != null, executableElement,
             ProcessorErrors.MISSING_QUERY_ANNOTATION

room/compiler/src/main/kotlin/androidx/room/processor/RawQueryMethodProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/RawQueryMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/RawQueryMethodProcessor.kt
index 1ee04bb..4d2a30d 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/RawQueryMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/RawQueryMethodProcessor.kt
@@ -72,7 +72,7 @@
     }
 
     private fun processObservedTables(): Set<String> {
-        val annotation = executableElement.toAnnotationBox(RawQuery::class)
+        val annotation = executableElement.getAnnotation(RawQuery::class)
         return annotation?.getAsTypeList("observedEntities")
             ?.mapNotNull {
                 it.typeElement.also { typeElement ->

room/compiler/src/main/kotlin/androidx/room/processor/ShortcutMethodProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutMethodProcessor.kt
index 0bf456b..b6bddc9 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutMethodProcessor.kt
@@ -39,7 +39,7 @@
     private val delegate = MethodProcessorDelegate.createFor(context, containing, executableElement)
 
     fun <T : Annotation> extractAnnotation(klass: KClass<T>, errorMsg: String): XAnnotationBox<T>? {
-        val annotation = executableElement.toAnnotationBox(klass)
+        val annotation = executableElement.getAnnotation(klass)
         context.checker.check(annotation != null, executableElement, errorMsg)
         return annotation
     }

room/compiler/src/main/kotlin/androidx/room/processor/SuppressWarningProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/SuppressWarningProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/SuppressWarningProcessor.kt
index 390b8bd..7781560 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/SuppressWarningProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/SuppressWarningProcessor.kt
@@ -25,7 +25,7 @@
 object SuppressWarningProcessor {
 
     fun getSuppressedWarnings(element: XElement): Set<Warning> {
-        val annotation = element.toAnnotationBox(SuppressWarnings::class)?.value
+        val annotation = element.getAnnotation(SuppressWarnings::class)?.value
         return if (annotation == null) {
             emptySet()
         } else {

room/compiler/src/main/kotlin/androidx/room/processor/TableEntityProcessor.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/TableEntityProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/TableEntityProcessor.kt
index efc5e84..4f18a69 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/TableEntityProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/TableEntityProcessor.kt
@@ -58,7 +58,7 @@
             element, androidx.room.Entity::class,
             ProcessorErrors.ENTITY_MUST_BE_ANNOTATED_WITH_ENTITY
         )
-        val annotationBox = element.toAnnotationBox(androidx.room.Entity::class)
+        val annotationBox = element.getAnnotation(androidx.room.Entity::class)
         val tableName: String
         val entityIndices: List<IndexInput>
         val foreignKeyInputs: List<ForeignKeyInput>
@@ -232,7 +232,7 @@
                 context.logger.e(element, ProcessorErrors.FOREIGN_KEY_CANNOT_FIND_PARENT)
                 return@map null
             }
-            val parentAnnotation = parentElement.toAnnotationBox(androidx.room.Entity::class)
+            val parentAnnotation = parentElement.getAnnotation(androidx.room.Entity::class)
             if (parentAnnotation == null) {
                 context.logger.e(
                     element,
@@ -328,7 +328,7 @@
      */
     private fun collectPrimaryKeysFromPrimaryKeyAnnotations(fields: List<Field>): List<PrimaryKey> {
         return fields.mapNotNull { field ->
-            field.element.toAnnotationBox(androidx.room.PrimaryKey::class)?.let {
+            field.element.getAnnotation(androidx.room.PrimaryKey::class)?.let {
                 if (field.parent != null) {
                     // the field in the entity that contains this error.
                     val grandParentField = field.parent.mRootParent.field.element
@@ -359,7 +359,7 @@
         typeElement: XTypeElement,
         availableFields: List<Field>
     ): List<PrimaryKey> {
-        val myPkeys = typeElement.toAnnotationBox(androidx.room.Entity::class)?.let {
+        val myPkeys = typeElement.getAnnotation(androidx.room.Entity::class)?.let {
             val primaryKeyColumns = it.value.primaryKeys
             if (primaryKeyColumns.isEmpty()) {
                 emptyList()
@@ -402,7 +402,7 @@
         embeddedFields: List<EmbeddedField>
     ): List<PrimaryKey> {
         return embeddedFields.mapNotNull { embeddedField ->
-            embeddedField.field.element.toAnnotationBox(androidx.room.PrimaryKey::class)?.let {
+            embeddedField.field.element.getAnnotation(androidx.room.PrimaryKey::class)?.let {
                 context.checker.check(
                     !it.value.autoGenerate || embeddedField.pojo.fields.size == 1,
                     embeddedField.field.element,
@@ -494,7 +494,7 @@
         // see if any embedded field is an entity with indices, if so, report a warning
         pojo.embeddedFields.forEach { embedded ->
             val embeddedElement = embedded.pojo.element
-            embeddedElement.toAnnotationBox(androidx.room.Entity::class)?.let {
+            embeddedElement.getAnnotation(androidx.room.Entity::class)?.let {
                 val subIndices = extractIndices(it, "")
                 if (subIndices.isNotEmpty()) {
                     context.logger.w(
@@ -528,7 +528,7 @@
             return emptyList()
         }
         val myIndices = parentTypeElement
-            .toAnnotationBox(androidx.room.Entity::class)?.let { annotation ->
+            .getAnnotation(androidx.room.Entity::class)?.let { annotation ->
                 val indices = extractIndices(annotation, tableName = "super")
                 if (indices.isEmpty()) {
                     emptyList()

room/compiler/src/main/kotlin/androidx/room/vo/Pojo.kt

diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/Pojo.kt b/room/compiler/src/main/kotlin/androidx/room/vo/Pojo.kt
index 3922f26..b463a7b 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/Pojo.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/Pojo.kt
@@ -42,11 +42,11 @@
      * Might be via Embedded or Relation.
      */
     fun accessedTableNames(): List<String> {
-        val entityAnnotation = element.toAnnotationBox(androidx.room.Entity::class)
+        val entityAnnotation = element.getAnnotation(androidx.room.Entity::class)
         return if (entityAnnotation != null) {
             listOf(EntityProcessor.extractTableName(element, entityAnnotation.value))
         } else {
-            val viewAnnotation = element.toAnnotationBox(androidx.room.DatabaseView::class)
+            val viewAnnotation = element.getAnnotation(androidx.room.DatabaseView::class)
             if (viewAnnotation != null) {
                 listOf(DatabaseViewProcessor.extractViewName(element, viewAnnotation.value))
             } else {

room/compiler/src/test/kotlin/androidx/room/processor/BaseEntityParserTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/BaseEntityParserTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/BaseEntityParserTest.kt
index c442c6f..7e79cd0 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/BaseEntityParserTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/BaseEntityParserTest.kt
@@ -68,7 +68,7 @@
         ) { invocation ->
             val entity = invocation.roundEnv
                 .getTypeElementsAnnotatedWith(
-                    androidx.room.Entity::class.java
+                    androidx.room.Entity::class.qualifiedName!!
                 ).first {
                     it.qualifiedName == "foo.bar.MyEntity"
                 }

room/compiler/src/test/kotlin/androidx/room/processor/BaseFtsEntityParserTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/BaseFtsEntityParserTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/BaseFtsEntityParserTest.kt
index 8e83ba6..31f63f3 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/BaseFtsEntityParserTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/BaseFtsEntityParserTest.kt
@@ -99,9 +99,9 @@
                     )
                     .nextRunHandler { invocation ->
                         val fts3AnnotatedElements = invocation.roundEnv
-                            .getTypeElementsAnnotatedWith(Fts3::class.java)
+                            .getTypeElementsAnnotatedWith(Fts3::class.qualifiedName!!)
                         val fts4AnnotatedElements = invocation.roundEnv
-                            .getTypeElementsAnnotatedWith(Fts4::class.java)
+                            .getTypeElementsAnnotatedWith(Fts4::class.qualifiedName!!)
                         val entity = (fts3AnnotatedElements + fts4AnnotatedElements).first {
                             it.toString() == "foo.bar.MyEntity"
                         }

room/compiler/src/test/kotlin/androidx/room/processor/DaoProcessorTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/DaoProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/DaoProcessorTest.kt
index d857001..081f84f 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/DaoProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/DaoProcessorTest.kt
@@ -427,7 +427,7 @@
         ) { invocation: XTestInvocation ->
             val dao = invocation.roundEnv
                 .getTypeElementsAnnotatedWith(
-                    androidx.room.Dao::class.java
+                    androidx.room.Dao::class.qualifiedName!!
                 )
                 .first()
             check(dao.isTypeElement())

room/compiler/src/test/kotlin/androidx/room/processor/DatabaseProcessorTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/DatabaseProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/DatabaseProcessorTest.kt
index 6902a61..1e72450 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/DatabaseProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/DatabaseProcessorTest.kt
@@ -1164,7 +1164,7 @@
                     .nextRunHandler { invocation ->
                         val database = invocation.roundEnv
                             .getTypeElementsAnnotatedWith(
-                                androidx.room.Database::class.java
+                                androidx.room.Database::class.qualifiedName!!
                             )
                             .first()
                         val processor = DatabaseProcessor(
@@ -1237,7 +1237,7 @@
                     .nextRunHandler { invocation ->
                         val entity = invocation.roundEnv
                             .getTypeElementsAnnotatedWith(
-                                androidx.room.Database::class.java
+                                androidx.room.Database::class.qualifiedName!!
                             )
                             .first()
                         val parser = DatabaseProcessor(

room/compiler/src/test/kotlin/androidx/room/processor/FieldProcessorTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/FieldProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/FieldProcessorTest.kt
index 4531a61..9a7fcb2 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/FieldProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/FieldProcessorTest.kt
@@ -602,7 +602,7 @@
                         .forAnnotations(androidx.room.Entity::class)
                         .nextRunHandler { invocation ->
                             val (owner, fieldElement) = invocation.roundEnv
-                                .getTypeElementsAnnotatedWith(Entity::class.java)
+                                .getTypeElementsAnnotatedWith(Entity::class.qualifiedName!!)
                                 .map {
                                     Pair(
                                         it,

room/compiler/src/test/kotlin/androidx/room/processor/Fts4TableEntityProcessorTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/Fts4TableEntityProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/Fts4TableEntityProcessorTest.kt
index b8ee82f..92b679c 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/Fts4TableEntityProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/Fts4TableEntityProcessorTest.kt
@@ -89,7 +89,8 @@
                 """
             )
         ) { invocation ->
-            val entity = invocation.roundEnv.getTypeElementsAnnotatedWith(Fts4::class.java)
+            val entity = invocation.roundEnv
+                .getTypeElementsAnnotatedWith(Fts4::class.qualifiedName!!)
                 .first { it.toString() == "foo.bar.MyEntity" }
             FtsTableEntityProcessor(invocation.context, entity)
                 .process()

room/compiler/src/test/kotlin/androidx/room/processor/InsertionMethodProcessorTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/InsertionMethodProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/InsertionMethodProcessorTest.kt
index 9f5d417..a0767a7 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/InsertionMethodProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/InsertionMethodProcessorTest.kt
@@ -863,7 +863,7 @@
                     .forAnnotations(Insert::class, Dao::class)
                     .nextRunHandler { invocation ->
                         val (owner, methods) = invocation.roundEnv
-                            .getTypeElementsAnnotatedWith(Dao::class.java)
+                            .getTypeElementsAnnotatedWith(Dao::class.qualifiedName!!)
                             .map {
                                 Pair(
                                     it,

room/compiler/src/test/kotlin/androidx/room/processor/ProjectionExpanderTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/ProjectionExpanderTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/ProjectionExpanderTest.kt
index 3d03007..d086818 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/ProjectionExpanderTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/ProjectionExpanderTest.kt
@@ -520,7 +520,7 @@
             options = listOf("-Aroom.expandProjection=true")
         ) { invocation ->
             val entities = invocation.roundEnv
-                .getTypeElementsAnnotatedWith(androidx.room.Entity::class.java)
+                .getTypeElementsAnnotatedWith(androidx.room.Entity::class.qualifiedName!!)
                 .map { element ->
                     TableEntityProcessor(
                         invocation.context,
@@ -623,7 +623,7 @@
             options = listOf("-Aroom.expandProjection=true")
         ) { invocation ->
             val entities = invocation.roundEnv
-                .getTypeElementsAnnotatedWith(androidx.room.Entity::class.java)
+                .getTypeElementsAnnotatedWith(androidx.room.Entity::class.qualifiedName!!)
                 .map { element ->
                     TableEntityProcessor(
                         invocation.context,

room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
index 350c1ad..676bf07 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
@@ -1166,7 +1166,7 @@
                     )
                     .nextRunHandler { invocation ->
                         val (owner, methods) = invocation.roundEnv
-                            .getTypeElementsAnnotatedWith(Dao::class.java)
+                            .getTypeElementsAnnotatedWith(Dao::class.qualifiedName!!)
                             .map {
                                 Pair(
                                     it,

room/compiler/src/test/kotlin/androidx/room/processor/RawQueryMethodProcessorTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/RawQueryMethodProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/RawQueryMethodProcessorTest.kt
index e6b825b..6de8d49 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/RawQueryMethodProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/RawQueryMethodProcessorTest.kt
@@ -343,7 +343,7 @@
                     )
                     .nextRunHandler { invocation ->
                         val (owner, methods) = invocation.roundEnv
-                            .getTypeElementsAnnotatedWith(Dao::class.java)
+                            .getTypeElementsAnnotatedWith(Dao::class.qualifiedName!!)
                             .map {
                                 Pair(
                                     it,

room/compiler/src/test/kotlin/androidx/room/processor/ShortcutMethodProcessorTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/ShortcutMethodProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/ShortcutMethodProcessorTest.kt
index 1810560..7c226d3 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/ShortcutMethodProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/ShortcutMethodProcessorTest.kt
@@ -536,7 +536,7 @@
                         .forAnnotations(annotation, Dao::class)
                         .nextRunHandler { invocation ->
                             val (owner, methods) = invocation.roundEnv
-                                .getTypeElementsAnnotatedWith(Dao::class.java)
+                                .getTypeElementsAnnotatedWith(Dao::class.qualifiedName!!)
                                 .map {
                                     Pair(
                                         it,

room/compiler/src/test/kotlin/androidx/room/processor/TransactionMethodProcessorTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/TransactionMethodProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/TransactionMethodProcessorTest.kt
index 8fad90d..988a598 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/TransactionMethodProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/TransactionMethodProcessorTest.kt
@@ -251,7 +251,7 @@
                     .forAnnotations(Transaction::class, Dao::class)
                     .nextRunHandler { invocation ->
                         val (owner, methods) = invocation.roundEnv
-                            .getTypeElementsAnnotatedWith(Dao::class.java)
+                            .getTypeElementsAnnotatedWith(Dao::class.qualifiedName!!)
                             .map {
                                 Pair(
                                     it,

room/compiler/src/test/kotlin/androidx/room/solver/query/QueryWriterTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/solver/query/QueryWriterTest.kt b/room/compiler/src/test/kotlin/androidx/room/solver/query/QueryWriterTest.kt
index cbb67cb..8976245 100644
--- a/room/compiler/src/test/kotlin/androidx/room/solver/query/QueryWriterTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/solver/query/QueryWriterTest.kt
@@ -354,7 +354,7 @@
                     .forAnnotations(Query::class, Dao::class)
                     .nextRunHandler { invocation ->
                         val (owner, methods) = invocation.roundEnv
-                            .getTypeElementsAnnotatedWith(Dao::class.java)
+                            .getTypeElementsAnnotatedWith(Dao::class.qualifiedName!!)
                             .map {
                                 Pair(
                                     it,

room/compiler/src/test/kotlin/androidx/room/testing/XProcessingStepExt.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/testing/XProcessingStepExt.kt b/room/compiler/src/test/kotlin/androidx/room/testing/XProcessingStepExt.kt
index 669f928..ddee174 100644
--- a/room/compiler/src/test/kotlin/androidx/room/testing/XProcessingStepExt.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/testing/XProcessingStepExt.kt
@@ -27,7 +27,7 @@
     delegate: (XTestInvocation) -> Unit
 ): (XTestInvocation) -> Unit = { invocation ->
     val elementsByAnnotation = annotations().associateWith {
-        invocation.roundEnv.getTypeElementsAnnotatedWith(it.java).toList()
+        invocation.roundEnv.getTypeElementsAnnotatedWith(it).toList()
     }
     this.process(
         env = invocation.processingEnv,

room/compiler/src/test/kotlin/androidx/room/testing/test_util.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/testing/test_util.kt b/room/compiler/src/test/kotlin/androidx/room/testing/test_util.kt
index d38af3f..d3fd8b2 100644
--- a/room/compiler/src/test/kotlin/androidx/room/testing/test_util.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/testing/test_util.kt
@@ -278,26 +278,26 @@
 }
 
 fun XTestInvocation.getViews(): List<androidx.room.vo.DatabaseView> {
-    return roundEnv.getTypeElementsAnnotatedWith(DatabaseView::class.java).map {
+    return roundEnv.getTypeElementsAnnotatedWith(DatabaseView::class.qualifiedName!!).map {
         DatabaseViewProcessor(context, it).process()
     }
 }
 
 fun XTestInvocation.getEntities(): List<androidx.room.vo.Entity> {
-    val entities = roundEnv.getTypeElementsAnnotatedWith(Entity::class.java).map {
+    val entities = roundEnv.getTypeElementsAnnotatedWith(Entity::class.qualifiedName!!).map {
         TableEntityProcessor(context, it).process()
     }
     return entities
 }
 
 fun TestInvocation.getViews(): List<androidx.room.vo.DatabaseView> {
-    return roundEnv.getTypeElementsAnnotatedWith(DatabaseView::class.java).map {
+    return roundEnv.getTypeElementsAnnotatedWith(DatabaseView::class.qualifiedName!!).map {
         DatabaseViewProcessor(context, it).process()
     }
 }
 
 fun TestInvocation.getEntities(): List<androidx.room.vo.Entity> {
-    val entities = roundEnv.getTypeElementsAnnotatedWith(Entity::class.java).map {
+    val entities = roundEnv.getTypeElementsAnnotatedWith(Entity::class.qualifiedName!!).map {
         TableEntityProcessor(context, it).process()
     }
     return entities

room/compiler/src/test/kotlin/androidx/room/writer/DaoWriterTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/writer/DaoWriterTest.kt b/room/compiler/src/test/kotlin/androidx/room/writer/DaoWriterTest.kt
index cda50d8..3882bd2 100644
--- a/room/compiler/src/test/kotlin/androidx/room/writer/DaoWriterTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/writer/DaoWriterTest.kt
@@ -140,12 +140,12 @@
         ) { invocation ->
             val dao = invocation.roundEnv
                 .getTypeElementsAnnotatedWith(
-                    androidx.room.Dao::class.java
+                    androidx.room.Dao::class.qualifiedName!!
                 ).firstOrNull()
             if (dao != null) {
                 val db = invocation.roundEnv
                     .getTypeElementsAnnotatedWith(
-                        androidx.room.Database::class.java
+                        androidx.room.Database::class.qualifiedName!!
                     ).firstOrNull()
                     ?: invocation.context.processingEnv
                         .requireTypeElement(RoomTypeNames.ROOM_DB)

room/compiler/src/test/kotlin/androidx/room/writer/SQLiteOpenHelperWriterTest.kt

diff --git a/room/compiler/src/test/kotlin/androidx/room/writer/SQLiteOpenHelperWriterTest.kt b/room/compiler/src/test/kotlin/androidx/room/writer/SQLiteOpenHelperWriterTest.kt
index fc1c911..8b1a973 100644
--- a/room/compiler/src/test/kotlin/androidx/room/writer/SQLiteOpenHelperWriterTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/writer/SQLiteOpenHelperWriterTest.kt
@@ -214,7 +214,7 @@
             sources = sources + databaseCode
         ) { invocation ->
             val db = invocation.roundEnv
-                .getTypeElementsAnnotatedWith(androidx.room.Database::class.java)
+                .getTypeElementsAnnotatedWith(androidx.room.Database::class.qualifiedName!!)
                 .first()
             handler(DatabaseProcessor(invocation.context, db).process(), invocation)
         }

room/integration-tests/testapp/schemas/androidx.room.integration.testapp.migration.MigrationDb/13.json

diff --git a/room/integration-tests/testapp/schemas/androidx.room.integration.testapp.migration.MigrationDb/13.json b/room/integration-tests/testapp/schemas/androidx.room.integration.testapp.migration.MigrationDb/13.json
new file mode 100644
index 0000000..ede0c4f
--- /dev/null
+++ b/room/integration-tests/testapp/schemas/androidx.room.integration.testapp.migration.MigrationDb/13.json
@@ -0,0 +1,153 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 13,
+    "identityHash": "243330983fa2a2c935ba4427cbd2238b",
+    "entities": [
+      {
+        "tableName": "Entity1",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT, `addedInV10` INTEGER NOT NULL DEFAULT 0, `added1InV13` INTEGER NOT NULL DEFAULT (0), PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "addedInV10",
+            "columnName": "addedInV10",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "added1InV13",
+            "columnName": "added1InV13",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "(0)"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Entity1_name",
+            "unique": true,
+            "columnNames": [
+              "name"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Entity1_name` ON `${TABLE_NAME}` (`name`)"
+          },
+          {
+            "name": "index_Entity1_addedInV10",
+            "unique": false,
+            "columnNames": [
+              "addedInV10"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Entity1_addedInV10` ON `${TABLE_NAME}` (`addedInV10`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Entity2",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addedInV3` TEXT, `name` TEXT DEFAULT 'Unknown', `addedInV9` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addedInV3",
+            "columnName": "addedInV3",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "'Unknown'"
+          },
+          {
+            "fieldPath": "addedInV9",
+            "columnName": "addedInV9",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Entity4",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT COLLATE NOCASE, PRIMARY KEY(`id`), FOREIGN KEY(`name`) REFERENCES `Entity1`(`name`) ON UPDATE NO ACTION ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Entity1",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "name"
+            ],
+            "referencedColumns": [
+              "name"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [
+      {
+        "viewName": "View1",
+        "createSql": "CREATE VIEW `${VIEW_NAME}` AS SELECT Entity4.id, Entity4.name, Entity1.id AS entity1Id FROM Entity4 INNER JOIN Entity1 ON Entity4.name = Entity1.name"
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '243330983fa2a2c935ba4427cbd2238b')"
+    ]
+  }
+}
\ No newline at end of file

room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationDb.java

diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationDb.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationDb.java
index 45ed433..6dce4f2 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationDb.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationDb.java
@@ -42,7 +42,7 @@
                 MigrationDb.Entity4.class},
         views = {MigrationDb.View1.class})
 public abstract class MigrationDb extends RoomDatabase {
-    static final int LATEST_VERSION = 12;
+    static final int LATEST_VERSION = 13;
     static final int MAX_VERSION = 1000;
     abstract MigrationDao dao();
     @Entity(indices = {
@@ -55,6 +55,8 @@
         public String name;
         @ColumnInfo(defaultValue = "0")
         public int addedInV10;
+        @ColumnInfo(defaultValue = "(0)")
+        public int added1InV13;
     }
 
     @Entity

room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationTest.java

diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationTest.java
index 9f86d1d..60b5462 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationTest.java
@@ -296,6 +296,29 @@
     }
 
     @Test
+    public void validateDefaultValueWithSurroundingParenthesis() throws IOException {
+        SupportSQLiteDatabase database = helper.createDatabase(TEST_DB, 12);
+        database.close();
+        Context targetContext = ApplicationProvider.getApplicationContext();
+        MigrationDb db = Room.databaseBuilder(targetContext, MigrationDb.class, TEST_DB)
+                .addMigrations(MIGRATION_12_13)
+                .build();
+
+        assertThat(db.dao().loadAllEntity1s(), is(notNullValue()));
+        helper.closeWhenFinished(db);
+
+        // Confirm if this is also works with the Migration Test Helper.
+        Throwable throwable = null;
+        try {
+            helper.runMigrationsAndValidate(TEST_DB, 13, true,
+                    MIGRATION_12_13);
+        } catch (Throwable t) {
+            throwable = t;
+        }
+        assertThat(throwable, is(nullValue()));
+    }
+
+    @Test
     public void missingMigration_onUpgrade() throws IOException {
         SupportSQLiteDatabase database = helper.createDatabase(TEST_DB, 1);
         database.close();
@@ -510,7 +533,7 @@
         database.close();
         Context targetContext = ApplicationProvider.getApplicationContext();
         MigrationDb db = Room.databaseBuilder(targetContext, MigrationDb.class, TEST_DB)
-                .addMigrations(new EmptyMigration(11, 12))
+                .addMigrations(new EmptyMigration(11, MIGRATION_MAX_LATEST.endVersion))
                 .build();
         try {
             db.dao().loadAllEntity1s();
@@ -657,6 +680,14 @@
         }
     };
 
+    private static final Migration MIGRATION_12_13 = new Migration(12, 13) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE Entity1 "
+                    + "ADD COLUMN added1InV13 INTEGER NOT NULL DEFAULT (0)");
+        }
+    };
+
     /**
      * Downgrade migration from {@link MigrationDb#MAX_VERSION} to
      * {@link MigrationDb#LATEST_VERSION} that uses the schema file and re-creates the tables such
@@ -697,7 +728,8 @@
 
     private static final Migration[] ALL_MIGRATIONS = new Migration[]{MIGRATION_1_2,
             MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5, MIGRATION_5_6, MIGRATION_6_7,
-            MIGRATION_7_8, MIGRATION_8_9, MIGRATION_9_10, MIGRATION_10_11, MIGRATION_11_12};
+            MIGRATION_7_8, MIGRATION_8_9, MIGRATION_9_10, MIGRATION_10_11, MIGRATION_11_12,
+            MIGRATION_12_13};
 
     static final class EmptyMigration extends Migration {
         EmptyMigration(int startVersion, int endVersion) {

room/ktx/src/main/java/androidx/room/CoroutinesRoom.kt

diff --git a/room/ktx/src/main/java/androidx/room/CoroutinesRoom.kt b/room/ktx/src/main/java/androidx/room/CoroutinesRoom.kt
index a72e89b..f45d8e5 100644
--- a/room/ktx/src/main/java/androidx/room/CoroutinesRoom.kt
+++ b/room/ktx/src/main/java/androidx/room/CoroutinesRoom.kt
@@ -23,7 +23,9 @@
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -102,29 +104,33 @@
             tableNames: Array<String>,
             callable: Callable<R>
         ): Flow<@JvmSuppressWildcards R> = flow {
-            // Observer channel receives signals from the invalidation tracker to emit queries.
-            val observerChannel = Channel<Unit>(Channel.CONFLATED)
-            val observer = object : InvalidationTracker.Observer(tableNames) {
-                override fun onInvalidated(tables: MutableSet<String>) {
-                    observerChannel.offer(Unit)
-                }
-            }
-            observerChannel.offer(Unit) // Initial signal to perform first query.
-            val flowContext = coroutineContext
-            val queryContext = coroutineContext[TransactionElement]?.transactionDispatcher
-                ?: if (inTransaction) db.transactionDispatcher else db.queryDispatcher
-            withContext(queryContext) {
-                db.invalidationTracker.addObserver(observer)
-                try {
-                    // Iterate until cancelled, transforming observer signals to query results to
-                    // be emitted to the flow.
-                    for (signal in observerChannel) {
-                        val result = callable.call()
-                        withContext(flowContext) { emit(result) }
+            coroutineScope {
+                // Observer channel receives signals from the invalidation tracker to emit queries.
+                val observerChannel = Channel<Unit>(Channel.CONFLATED)
+                val observer = object : InvalidationTracker.Observer(tableNames) {
+                    override fun onInvalidated(tables: MutableSet<String>) {
+                        observerChannel.offer(Unit)
                     }
-                } finally {
-                    db.invalidationTracker.removeObserver(observer)
                 }
+                observerChannel.offer(Unit) // Initial signal to perform first query.
+                val queryContext = coroutineContext[TransactionElement]?.transactionDispatcher
+                    ?: if (inTransaction) db.transactionDispatcher else db.queryDispatcher
+                val resultChannel = Channel<R>()
+                launch(queryContext) {
+                    db.invalidationTracker.addObserver(observer)
+                    try {
+                        // Iterate until cancelled, transforming observer signals to query results
+                        // to be emitted to the flow.
+                        for (signal in observerChannel) {
+                            val result = callable.call()
+                            resultChannel.send(result)
+                        }
+                    } finally {
+                        db.invalidationTracker.removeObserver(observer)
+                    }
+                }
+
+                emitAll(resultChannel)
             }
         }
     }

room/ktx/src/test/java/androidx/room/CoroutinesRoomTest.kt

diff --git a/room/ktx/src/test/java/androidx/room/CoroutinesRoomTest.kt b/room/ktx/src/test/java/androidx/room/CoroutinesRoomTest.kt
index 086b217..28c8f23 100644
--- a/room/ktx/src/test/java/androidx/room/CoroutinesRoomTest.kt
+++ b/room/ktx/src/test/java/androidx/room/CoroutinesRoomTest.kt
@@ -20,8 +20,7 @@
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.flow.single
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.yield
 import org.junit.Test
@@ -39,25 +38,29 @@
     @Test
     fun testCreateFlow() = testRun {
         var callableExecuted = false
+        val expectedResult = Any()
         val flow = CoroutinesRoom.createFlow(
             db = database,
             inTransaction = false,
             tableNames = arrayOf("Pet"),
-            callable = Callable { callableExecuted = true }
+            callable = Callable {
+                callableExecuted = true
+                expectedResult
+            }
         )
 
         assertThat(invalidationTracker.observers.isEmpty()).isTrue()
         assertThat(callableExecuted).isFalse()
 
         val job = async {
-            flow.single()
+            flow.first()
         }
         yield(); yield() // yield for async and flow
 
         assertThat(invalidationTracker.observers.size).isEqualTo(1)
         assertThat(callableExecuted).isTrue()
 
-        job.cancelAndJoin()
+        assertThat(job.await()).isEqualTo(expectedResult)
         assertThat(invalidationTracker.observers.isEmpty()).isTrue()
     }
 

room/runtime/api/restricted_current.txt

diff --git a/room/runtime/api/restricted_current.txt b/room/runtime/api/restricted_current.txt
index 8662b57..89994c2 100644
--- a/room/runtime/api/restricted_current.txt
+++ b/room/runtime/api/restricted_current.txt
@@ -302,6 +302,7 @@
   public static final class TableInfo.Column {
     ctor @Deprecated public TableInfo.Column(String!, String!, boolean, int);
     ctor public TableInfo.Column(String!, String!, boolean, int, String!, int);
+    method public static boolean defaultValueEquals(String, String?);
     method public boolean isPrimaryKey();
     field @androidx.room.ColumnInfo.SQLiteTypeAffinity public final int affinity;
     field public final String! defaultValue;

room/runtime/src/androidTest/java/androidx/room/migration/TableInfoTest.java

diff --git a/room/runtime/src/androidTest/java/androidx/room/migration/TableInfoTest.java b/room/runtime/src/androidTest/java/androidx/room/migration/TableInfoTest.java
index b71367d..f7eb2f8 100644
--- a/room/runtime/src/androidTest/java/androidx/room/migration/TableInfoTest.java
+++ b/room/runtime/src/androidTest/java/androidx/room/migration/TableInfoTest.java
@@ -17,6 +17,8 @@
 package androidx.room.migration;
 
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
@@ -46,6 +48,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 @SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
@@ -401,4 +404,74 @@
                         }).build()
         ).getWritableDatabase();
     }
+
+    @Test
+    public void testSurroundingParenthesis() {
+        mDb = createDatabase(
+                "CREATE TABLE foo (name INTEGER NOT NULL DEFAULT ((0) + (1 + 2)))");
+        TableInfo dbInfo = TableInfo.read(mDb, "foo");
+
+        assertThat("((0) + (1 + 2))")
+                .isNotEqualTo(Objects.requireNonNull(dbInfo.columns.get("name")).defaultValue);
+
+        assertThat(TableInfo.Column.defaultValueEquals(
+                "((0) + (1 + 2))",
+                Objects.requireNonNull(dbInfo.columns.get("name")).defaultValue)).isTrue();
+    }
+
+    @Test
+    public void testDoubleSurroundingParenthesis() {
+        mDb = createDatabase(
+                "CREATE TABLE foo (name INTEGER NOT NULL DEFAULT (((0) + (1 + 2))))");
+        TableInfo dbInfo = TableInfo.read(mDb, "foo");
+
+        assertThat("(((0) + (1 + 2)))")
+                .isNotEqualTo(Objects.requireNonNull(dbInfo.columns.get("name")).defaultValue);
+
+        assertThat(TableInfo.Column.defaultValueEquals(
+                "(((0) + (1 + 2)))",
+                Objects.requireNonNull(dbInfo.columns.get("name")).defaultValue));
+    }
+
+    @Test
+    public void testMultipleParenthesisWithSurrounding() {
+        mDb = createDatabase(
+                "CREATE TABLE foo (name INTEGER NOT NULL DEFAULT (((3 + 5) + (2 + 1)) + (1 + 2)))");
+        TableInfo dbInfo = TableInfo.read(mDb, "foo");
+
+        assertThat("(((3 + 5) + (2 + 1)) + (1 + 2))")
+                .isNotEqualTo(Objects.requireNonNull(dbInfo.columns.get("name")).defaultValue);
+
+        assertThat(TableInfo.Column.defaultValueEquals(
+                "(((3 + 5) + (2 + 1)) + (1 + 2))",
+                Objects.requireNonNull(dbInfo.columns.get("name")).defaultValue));
+    }
+
+    @Test
+    public void testSurroundingParenthesisWithSpacesBefore() {
+        mDb = createDatabase(
+                "CREATE TABLE foo (name INTEGER NOT NULL DEFAULT (    (0) + (1 + 2)))");
+        TableInfo dbInfo = TableInfo.read(mDb, "foo");
+
+        assertThat("(    (0) + (1 + 2))")
+                .isNotEqualTo(Objects.requireNonNull(dbInfo.columns.get("name")).defaultValue);
+
+        assertThat(TableInfo.Column.defaultValueEquals(
+                "(    (0) + (1 + 2))",
+                Objects.requireNonNull(dbInfo.columns.get("name")).defaultValue));
+    }
+
+    @Test
+    public void testSurroundingParenthesisWithSpacesAfter() {
+        mDb = createDatabase(
+                "CREATE TABLE foo (name INTEGER NOT NULL DEFAULT ((0) + (1 + 2)    ))");
+        TableInfo dbInfo = TableInfo.read(mDb, "foo");
+
+        assertThat("((0) + (1 + 2)    )")
+                .isNotEqualTo(Objects.requireNonNull(dbInfo.columns.get("name")).defaultValue);
+
+        assertThat(TableInfo.Column.defaultValueEquals(
+                "((0) + (1 + 2)    )",
+                Objects.requireNonNull(dbInfo.columns.get("name")).defaultValue)).isTrue();
+    }
 }

room/runtime/src/main/java/androidx/room/util/TableInfo.java

diff --git a/room/runtime/src/main/java/androidx/room/util/TableInfo.java b/room/runtime/src/main/java/androidx/room/util/TableInfo.java
index f884f3f..37b41d6 100644
--- a/room/runtime/src/main/java/androidx/room/util/TableInfo.java
+++ b/room/runtime/src/main/java/androidx/room/util/TableInfo.java
@@ -237,6 +237,7 @@
 
     private static Map<String, Column> readColumns(SupportSQLiteDatabase database,
             String tableName) {
+
         Cursor cursor = database
                 .query("PRAGMA table_info(`" + tableName + "`)");
         //noinspection TryFinallyCanBeTryWithResources
@@ -456,15 +457,18 @@
             // from the compiler itself has it. b/136019383
             if (mCreatedFrom == CREATED_FROM_ENTITY
                     && column.mCreatedFrom == CREATED_FROM_DATABASE
-                    && (defaultValue != null && !defaultValue.equals(column.defaultValue))) {
+                    && (defaultValue != null && !defaultValueEquals(defaultValue,
+                    column.defaultValue))) {
                 return false;
             } else if (mCreatedFrom == CREATED_FROM_DATABASE
                     && column.mCreatedFrom == CREATED_FROM_ENTITY
-                    && (column.defaultValue != null && !column.defaultValue.equals(defaultValue))) {
+                    && (column.defaultValue != null && !defaultValueEquals(
+                    column.defaultValue, defaultValue))) {
                 return false;
             } else if (mCreatedFrom != CREATED_FROM_UNKNOWN
                     && mCreatedFrom == column.mCreatedFrom
-                    && (defaultValue != null ? !defaultValue.equals(column.defaultValue)
+                    && (defaultValue != null ? !defaultValueEquals(defaultValue,
+                    column.defaultValue)
                     : column.defaultValue != null)) {
                 return false;
             }
@@ -473,6 +477,56 @@
         }
 
         /**
+         * Checks if the default values provided match. Handles the special case in which the
+         * default value is surrounded by parenthesis (e.g. encountered in b/182284899).
+         *
+         * Surrounding parenthesis are removed by SQLite when reading from the database, hence
+         * this function will check if they are present in the actual value, if so, it will
+         * compare the two values by ignoring the surrounding parenthesis.
+         *
+         */
+        public static boolean defaultValueEquals(@NonNull String actual, @Nullable String other) {
+            if (other == null) {
+                return false;
+            }
+
+            if (actual.equals(other)) {
+                return true;
+            } else if (containsSurroundingParenthesis(actual)) {
+                return actual.substring(1, actual.length() - 1).trim().equals(other);
+            }
+            return false;
+        }
+
+        /**
+         * Checks for potential surrounding parenthesis, if found, removes them and checks if
+         * remaining paranthesis are balanced. If so, the surrounding parenthesis are redundant,
+         * and returns true.
+         */
+        private static boolean containsSurroundingParenthesis(@NonNull String actual) {
+            if (actual.length() == 0) {
+                return false;
+            }
+            int surroundingParenthesis = 0;
+            for (int i = 0; i < actual.length(); i++) {
+                char c = actual.charAt(i);
+                if (i == 0 && c != '(') {
+                    return false;
+                }
+
+                if (c == '(') {
+                    surroundingParenthesis++;
+                } else if (c == ')') {
+                    surroundingParenthesis--;
+                    if (surroundingParenthesis == 0 && i != actual.length() - 1) {
+                        return false;
+                    }
+                }
+            }
+            return surroundingParenthesis == 0;
+        }
+
+        /**
          * Returns whether this column is part of the primary key or not.
          *
          * @return True if this column is part of the primary key, false otherwise.

samples/SupportEmojiDemos/build.gradle

diff --git a/samples/SupportEmojiDemos/build.gradle b/samples/SupportEmojiDemos/build.gradle
index 1d1da74..1121cfb7 100644
--- a/samples/SupportEmojiDemos/build.gradle
+++ b/samples/SupportEmojiDemos/build.gradle
@@ -20,7 +20,7 @@
 }
 
 ext {
-    fontDir = project(":noto-emoji-compat").projectDir
+    fontDir = project(":noto-emoji-compat-font").projectDir
 }
 
 dependencies {

security/identity-credential/src/androidTest/java/androidx/security/identity/cts/Util.java

diff --git a/security/identity-credential/src/androidTest/java/androidx/security/identity/cts/Util.java b/security/identity-credential/src/androidTest/java/androidx/security/identity/cts/Util.java
index 20b2af8..a3ab3af 100644
--- a/security/identity-credential/src/androidTest/java/androidx/security/identity/cts/Util.java
+++ b/security/identity-credential/src/androidTest/java/androidx/security/identity/cts/Util.java
@@ -415,8 +415,10 @@
         if (signature.length != 64) {
             throw new RuntimeException("signature.length is " + signature.length + ", expected 64");
         }
-        BigInteger r = new BigInteger(Arrays.copyOfRange(signature, 0, 32));
-        BigInteger s = new BigInteger(Arrays.copyOfRange(signature, 32, 64));
+        // r and s are always positive and may use all 256 bits so use the constructor which
+        // parses them as unsigned.
+        BigInteger r = new BigInteger(1, Arrays.copyOfRange(signature, 0, 32));
+        BigInteger s = new BigInteger(1, Arrays.copyOfRange(signature, 32, 64));
         byte[] rBytes = encodePositiveBigInteger(r);
         byte[] sBytes = encodePositiveBigInteger(s);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();

security/identity-credential/src/main/java/androidx/security/identity/Util.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/Util.java b/security/identity-credential/src/main/java/androidx/security/identity/Util.java
index 4e90f88..cbe691e 100644
--- a/security/identity-credential/src/main/java/androidx/security/identity/Util.java
+++ b/security/identity-credential/src/main/java/androidx/security/identity/Util.java
@@ -600,8 +600,10 @@
         if (signature.length != 64) {
             throw new RuntimeException("signature.length is " + signature.length + ", expected 64");
         }
-        BigInteger r = new BigInteger(Arrays.copyOfRange(signature, 0, 32));
-        BigInteger s = new BigInteger(Arrays.copyOfRange(signature, 32, 64));
+        // r and s are always positive and may use all 256 bits so use the constructor which
+        // parses them as unsigned.
+        BigInteger r = new BigInteger(1, Arrays.copyOfRange(signature, 0, 32));
+        BigInteger s = new BigInteger(1, Arrays.copyOfRange(signature, 32, 64));
         byte[] rBytes = encodePositiveBigInteger(r);
         byte[] sBytes = encodePositiveBigInteger(s);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();

serialization/OWNERS

diff --git a/serialization/OWNERS b/serialization/OWNERS
deleted file mode 100644
index 9878e82..0000000
--- a/serialization/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-emberrose@google.com

serialization/serialization-annotation/api/current.txt

diff --git a/serialization/serialization-annotation/api/current.txt b/serialization/serialization-annotation/api/current.txt
deleted file mode 100644
index 45f6427..0000000
--- a/serialization/serialization-annotation/api/current.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-// Signature format: 4.0
-package androidx.serialization {
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Action {
-    method public abstract boolean oneWay() default false;
-    method public abstract int value();
-    property public abstract int id;
-    property public abstract boolean oneWay;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface EnumValue {
-    method public abstract int value();
-    property public abstract int id;
-    field public static final androidx.serialization.EnumValue.Companion Companion;
-    field public static final int DEFAULT = 0; // 0x0
-  }
-
-  public static final class EnumValue.Companion {
-    field public static final int DEFAULT = 0; // 0x0
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface Field {
-    method public abstract androidx.serialization.ProtoEncoding mapKeyProtoEncoding() default androidx.serialization.ProtoEncoding.DEFAULT;
-    method public abstract androidx.serialization.ProtoEncoding protoEncoding() default androidx.serialization.ProtoEncoding.DEFAULT;
-    method public abstract int value();
-    property public abstract int id;
-    property public abstract androidx.serialization.ProtoEncoding mapKeyProtoEncoding;
-    property public abstract androidx.serialization.ProtoEncoding protoEncoding;
-  }
-
-  public enum ProtoEncoding {
-    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;
-    enum_constant public static final androidx.serialization.ProtoEncoding UNSIGNED_FIXED;
-    enum_constant public static final androidx.serialization.ProtoEncoding UNSIGNED_VARINT;
-    enum_constant public static final androidx.serialization.ProtoEncoding ZIG_ZAG_VARINT;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Reserved {
-    method public abstract androidx.serialization.Reserved.IdRange[] idRanges() default {};
-    method public abstract int[] ids() default {};
-    method public abstract String[] names() default {};
-    property public abstract androidx.serialization.Reserved.IdRange![] idRanges;
-    property public abstract int[] ids;
-    property public abstract String![] names;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={}) public static @interface Reserved.IdRange {
-    method public abstract int from();
-    method public abstract int to();
-    property public abstract int from;
-    property public abstract int to;
-  }
-
-}
-

serialization/serialization-annotation/api/public_plus_experimental_current.txt

diff --git a/serialization/serialization-annotation/api/public_plus_experimental_current.txt b/serialization/serialization-annotation/api/public_plus_experimental_current.txt
deleted file mode 100644
index 45f6427..0000000
--- a/serialization/serialization-annotation/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-// Signature format: 4.0
-package androidx.serialization {
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Action {
-    method public abstract boolean oneWay() default false;
-    method public abstract int value();
-    property public abstract int id;
-    property public abstract boolean oneWay;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface EnumValue {
-    method public abstract int value();
-    property public abstract int id;
-    field public static final androidx.serialization.EnumValue.Companion Companion;
-    field public static final int DEFAULT = 0; // 0x0
-  }
-
-  public static final class EnumValue.Companion {
-    field public static final int DEFAULT = 0; // 0x0
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface Field {
-    method public abstract androidx.serialization.ProtoEncoding mapKeyProtoEncoding() default androidx.serialization.ProtoEncoding.DEFAULT;
-    method public abstract androidx.serialization.ProtoEncoding protoEncoding() default androidx.serialization.ProtoEncoding.DEFAULT;
-    method public abstract int value();
-    property public abstract int id;
-    property public abstract androidx.serialization.ProtoEncoding mapKeyProtoEncoding;
-    property public abstract androidx.serialization.ProtoEncoding protoEncoding;
-  }
-
-  public enum ProtoEncoding {
-    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;
-    enum_constant public static final androidx.serialization.ProtoEncoding UNSIGNED_FIXED;
-    enum_constant public static final androidx.serialization.ProtoEncoding UNSIGNED_VARINT;
-    enum_constant public static final androidx.serialization.ProtoEncoding ZIG_ZAG_VARINT;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Reserved {
-    method public abstract androidx.serialization.Reserved.IdRange[] idRanges() default {};
-    method public abstract int[] ids() default {};
-    method public abstract String[] names() default {};
-    property public abstract androidx.serialization.Reserved.IdRange![] idRanges;
-    property public abstract int[] ids;
-    property public abstract String![] names;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={}) public static @interface Reserved.IdRange {
-    method public abstract int from();
-    method public abstract int to();
-    property public abstract int from;
-    property public abstract int to;
-  }
-
-}
-

serialization/serialization-annotation/api/restricted_current.txt

diff --git a/serialization/serialization-annotation/api/restricted_current.txt b/serialization/serialization-annotation/api/restricted_current.txt
deleted file mode 100644
index 45f6427..0000000
--- a/serialization/serialization-annotation/api/restricted_current.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-// Signature format: 4.0
-package androidx.serialization {
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Action {
-    method public abstract boolean oneWay() default false;
-    method public abstract int value();
-    property public abstract int id;
-    property public abstract boolean oneWay;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface EnumValue {
-    method public abstract int value();
-    property public abstract int id;
-    field public static final androidx.serialization.EnumValue.Companion Companion;
-    field public static final int DEFAULT = 0; // 0x0
-  }
-
-  public static final class EnumValue.Companion {
-    field public static final int DEFAULT = 0; // 0x0
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface Field {
-    method public abstract androidx.serialization.ProtoEncoding mapKeyProtoEncoding() default androidx.serialization.ProtoEncoding.DEFAULT;
-    method public abstract androidx.serialization.ProtoEncoding protoEncoding() default androidx.serialization.ProtoEncoding.DEFAULT;
-    method public abstract int value();
-    property public abstract int id;
-    property public abstract androidx.serialization.ProtoEncoding mapKeyProtoEncoding;
-    property public abstract androidx.serialization.ProtoEncoding protoEncoding;
-  }
-
-  public enum ProtoEncoding {
-    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;
-    enum_constant public static final androidx.serialization.ProtoEncoding UNSIGNED_FIXED;
-    enum_constant public static final androidx.serialization.ProtoEncoding UNSIGNED_VARINT;
-    enum_constant public static final androidx.serialization.ProtoEncoding ZIG_ZAG_VARINT;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface Reserved {
-    method public abstract androidx.serialization.Reserved.IdRange[] idRanges() default {};
-    method public abstract int[] ids() default {};
-    method public abstract String[] names() default {};
-    property public abstract androidx.serialization.Reserved.IdRange![] idRanges;
-    property public abstract int[] ids;
-    property public abstract String![] names;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={}) public static @interface Reserved.IdRange {
-    method public abstract int from();
-    method public abstract int to();
-    property public abstract int from;
-    property public abstract int to;
-  }
-
-}
-

serialization/serialization-annotation/build.gradle

diff --git a/serialization/serialization-annotation/build.gradle b/serialization/serialization-annotation/build.gradle
deleted file mode 100644
index 6470a4a..0000000
--- a/serialization/serialization-annotation/build.gradle
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import androidx.build.LibraryGroups
-import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-
-import static androidx.build.dependencies.DependenciesKt.getKOTLIN_STDLIB
-
-plugins {
-    id("AndroidXPlugin")
-    id("kotlin")
-}
-
-targetCompatibility = JavaVersion.VERSION_1_7
-sourceCompatibility = JavaVersion.VERSION_1_7
-
-dependencies {
-    compileOnly(KOTLIN_STDLIB)
-}
-
-androidx {
-    name = "AndroidX Serialization - Annotation"
-    type = LibraryType.PUBLISHED_LIBRARY
-    mavenVersion = LibraryVersions.SERIALIZATION
-    mavenGroup = LibraryGroups.SERIALIZATION
-    inceptionYear = "2020"
-    description = "Annotations for AndroidX Serialization"
-}

serialization/serialization-annotation/lint-baseline.xml

diff --git a/serialization/serialization-annotation/lint-baseline.xml b/serialization/serialization-annotation/lint-baseline.xml
deleted file mode 100644
index 297ae16..0000000
--- a/serialization/serialization-annotation/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta02" client="gradle" version="4.2.0-beta02">
-
-</issues>

serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Action.kt

diff --git a/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Action.kt b/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Action.kt
deleted file mode 100644
index bc84613..0000000
--- a/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Action.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization
-
-import kotlin.annotation.AnnotationRetention.BINARY
-import kotlin.annotation.AnnotationTarget.FUNCTION
-
-/**
- * Marks a function as an action in a service interface.
- *
- * Applying this annotation to an interface function marks the interface as a service and the
- * function as an action. A service interface may be used as a [Field] in a message class with a
- * parcel representation and by itself with Android's [android.os.IBinder] inter-process
- * communication API.
- *
- * ```kotlin
- * interface MyService {
- *     @Action(1)
- *     fun myAction(request: MyRequestMessage): MyResponseMessage
- *
- *     @Action(2, oneWay = true)
- *     fun myOneWayAction(request: MyOneWayRequestMessage)
- * }
- * ```
- *
- * To ensure that services have an extensible schema, actions may only produce or consume message
- * classes from the same compilation unit. Each action function must either take zero arguments
- * or one request message class argument and return [Unit] or a response message class.
- *
- * Service interfaces may contain a mix of abstract functions and functions or properties with
- * default implementations, but all abstract members must be action functions with this
- * annotation applied. Service interfaces may extend interfaces with no abstract functions or
- * properties or other service interfaces in the same compilation unit.
- *
- * @property id Integer ID of this action.
- *
- * Valid action IDs are between 1 and 16,777,215 inclusive
- * ([android.os.IBinder.FIRST_CALL_TRANSACTION] through
- * [android.os.IBinder.LAST_CALL_TRANSACTION]).
- *
- * Action IDs must be unique within a service interface, including any actions inherited from
- * another service interface, but may be reused between unrelated service interfaces.
- *
- * To reserve action IDs for future use or to prevent unintentional reuse of removed field IDs,
- * apply the [Reserved] annotation to the service interface.
- *
- * @property oneWay True if this action is one-way.
- *
- * One-way actions do not wait for the action to complete on the remote process and cannot throw
- * exceptions or return a result. Functions with a one-way action annotation are required to return
- * [Unit]. To receive a result from a one-way action asynchronously, consider creating a callback
- * service and passing an instance of it in the request message.
- *
- * For more details on one-way actions, see [android.os.IBinder.FLAG_ONEWAY].
- */
-@Retention(BINARY)
-@Target(FUNCTION)
-public annotation class Action(
-    @get:JvmName("value")
-    val id: Int,
-    val oneWay: Boolean = false
-)

serialization/serialization-annotation/src/main/kotlin/androidx/serialization/EnumValue.kt

diff --git a/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/EnumValue.kt b/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/EnumValue.kt
deleted file mode 100644
index 950e745..0000000
--- a/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/EnumValue.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization
-
-import kotlin.annotation.AnnotationRetention.BINARY
-import kotlin.annotation.AnnotationTarget.FIELD
-
-/**
- * Tags a serializable enum value with its serialized ID.
- *
- * A serializable enum must have this annotation on all its values. One value of the enum must be
- * selected as the default value to use if the enum value is unrecognized or missing. Set the ID
- * of this value to [DEFAULT] or zero.
- *
- * ```kotlin
- * enum class MyEnum {
- *    @EnumValue(EnumValue.DEFAULT)
- *    DEFAULT,
- *
- *    @EnumValue(1)
- *    MY_VALUE
- * }
- * ```
- *
- * @property id Integer ID of the enum value.
- *
- * Any integer is a valid enum value ID, but `0` has special meaning as the default value.
- * Additionally, negative values are not recommended as their proto representation is always 10
- * bytes long.
- *
- * Enum value IDs must be unique within an enum class, but may be freely reused between enum
- * classes.
- *
- * To reserve enum value IDs for future use or to prevent unintentional reuse of removed enum
- * value IDs, apply the [Reserved] annotation to the enum class.
- */
-@Retention(BINARY)
-@Target(FIELD)
-public annotation class EnumValue(
-    @get:JvmName("value") val id: Int
-) {
-    public companion object {
-        /**
-         * The ID of a default enum value.
-         *
-         * One value in every enum must be default to be used if a parser encounters an
-         * unrecognized or missing enum field.
-         */
-        public const val DEFAULT: Int = 0
-    }
-}

serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Field.kt

diff --git a/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Field.kt b/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Field.kt
deleted file mode 100644
index 1d6f638..0000000
--- a/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Field.kt
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization
-
-import kotlin.annotation.AnnotationRetention.BINARY
-import kotlin.annotation.AnnotationTarget.FIELD
-import kotlin.annotation.AnnotationTarget.FUNCTION
-import kotlin.annotation.AnnotationTarget.PROPERTY
-import kotlin.annotation.AnnotationTarget.VALUE_PARAMETER
-
-/**
- * Marks a property of a message class as a serializable field.
- *
- * Applying this annotation to the properties of a class marks it as a message class. A message
- * classes may be serialized to a proto-encoded byte array or a [android.os.Parcel] or used as
- * the request or response type of an [Action] on a service interface.
- *
- * ```kotlin
- * data class MyMessage(
- *     @Field(1) val textField: String,
- *     @Field(2, protoEncoding = ProtoEncoding.ZIG_ZAG_VARINT) negativeField: Int
- * )
- * ```
- *
- * ## Field Types
- *
- * Fields may be of a nullable or non-null scalar type including [Boolean], [Double], [Float],
- * [Int] or [UInt], [Long] or [ULong], [String], and bytes as [ByteArray], [UByteArray], or
- * [java.nio.ByteBuffer]. Complex types for fields include nullable or non-null enum classes with
- * [EnumValue] annotations and other message classes in the same compilation unit. Message
- * classes with only a parcel representation and no proto representation may also include
- * nullable service interfaces from the same package, nullable instances of active objects
- * including [android.os.IInterface], [android.os.IBinder], and [android.os.ParcelFileDescriptor].
- *
- * Fields can also be collections of supported non-null types either as arrays or collections.
- * Supported collection types include [Collection], [Iterable], [List], [Set], and
- * [java.util.SortedSet] as well as concrete implementations of [Collection] that have a default
- * constructor.
- *
- * Maps fields with non-null string or integral keys and non-null values of any supported type are
- * supported as well. Supported map types include [Map], [androidx.collection.SimpleArrayMap],
- * and the specialized `SparseArray` classes from [android.util] or [androidx.collection].
- * Concrete implementations of [Map] are also supported provided they have a default constructor.
- *
- * ## Default Values
- *
- * When deserializing an encoded message, fields missing from the encoded representation are set
- * to a default value. This property allows the serializer to reduce the size of encoded messages
- * by eliding scalar fields and nullable fields set to their default values entirely.
- *
- * For nullable fields, the default value is always `null`. The default for service fields and
- * active objects is always `null`, as these fields are required to be nullable.
- *
- * For non-null fields, the default varies based on the type of the field:
- *
- *   * Numeric fields default to zero
- *   * Boolean fields default to false
- *   * String and bytes fields default to an empty string, byte array or byte buffer
- *   * Enum fields default to the enum value marked with [EnumValue.DEFAULT]
- *   * Message fields default to an instance of the message class with all its fields set to
- *     their default values recursively
- *   * Array, collection, and map fields default to an empty container of the appropriate type
- *
- * If you need to know if a scalar type was present in an encoded message or simply set to the
- * default value, use the nullable version of the type.
- *
- * ## Message Classes
- *
- * Message classes be abstract and may extend other classes, including other message classes
- * within the same compilation unit. However messages themselves do not have a hierarchy, and
- * each concrete message class is flattened into one message in the resolved schema.
- *
- * Not every property of a message class needs to be serializable, but Serialization must be able
- * to instantiate a message class from the recognized fields parsed from an encoded message. This
- * means that a constructor of factory function must exist that only takes field parameters with
- * this annotation. Alternatively a builder class with this annotation on its setter methods may
- * be used for instantiation instead.
- *
- * This annotation can be used at multiple points for the same logical field, such as a parameter
- * to a factory function or a setter on a builder and an immutable property on the message class.
- * To avoid unexpected behavior, both copies of the annotation for a logical field must be
- * identical.
- *
- * @property id Integer ID of the field.
- *
- * Valid field IDs are positive integers between 1 and 268,435,456 (`0x0fff_ffff`) inclusive except
- * 19,000 through 19,999 inclusive, which are [reserved in proto][1]. Note that the upper limit is
- * one bit smaller than proto's upper limit to accommodate a 4 bits of field length in the parcel
- * encoding.
- *
- * Field IDs must be unique within a message, including any fields inherited from parent message
- * classes but may be reused between unrelated messages.
- *
- * To reserve field IDs for future use or to prevent unintentional reuse of removed field IDs,
- * apply the [Reserved] annotation to the message class.
- *
- * [1]: https://developers.google.com/protocol-buffers/docs/proto3#assigning-field-numbers
- *
- * @property protoEncoding The encoding for this field's proto representation.
- *
- * If this field is an array or supported collection type, this property sets the encoding of the
- * items in the collection. If the field is a supported map type, this property sets the encoding
- * of the values of the map.
- *
- * Only integral fields in the proto representation of a message have multiple encoding options.
- * Leave this set to [ProtoEncoding.DEFAULT] for non-integral fields.
- *
- * @property mapKeyProtoEncoding The proto encoding for this field's keys, if it's a map.
- *
- * This property is only applicable to fields of supported map types with integral keys. Leave
- * this set to [ProtoEncoding.DEFAULT] for non-map fields or map fields with string keys.
- */
-@Retention(BINARY)
-@Target(FIELD, FUNCTION, PROPERTY, VALUE_PARAMETER)
-public annotation class Field(
-    @get:JvmName("value")
-    val id: Int,
-    val protoEncoding: ProtoEncoding = ProtoEncoding.DEFAULT,
-    val mapKeyProtoEncoding: ProtoEncoding = ProtoEncoding.DEFAULT
-)

serialization/serialization-annotation/src/main/kotlin/androidx/serialization/ProtoEncoding.kt

diff --git a/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/ProtoEncoding.kt b/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/ProtoEncoding.kt
deleted file mode 100644
index eb6bcf8..0000000
--- a/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/ProtoEncoding.kt
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization
-
-/**
- * The encoding used in the proto representation of a field.
- *
- * Protocol Buffers supports [several encodings][1] for integral fields which may allow you to
- * reduce the average encoded size of a field based on knowledge of what values it is likely to
- * contain. Supply an encoding from this enumeration to [Field.protoEncoding] or
- * [Field.mapKeyProtoEncoding] to select a field's encoding.
- *
- * Use the [DEFAULT] value for non-integral fields, as all other fields types only have one
- * encoding, or to request the compiler to select a variable length encoding with a signedness
- * matching the signedness of an integral field.
- *
- * Signed integral fields may optionally use an unsigned encoding. This may be desirable when
- * integrating with other protobuf implementations. Unsigned numbers are represented as signed
- * numbers by setting the sign bit to their most significant bit. This means that smaller values
- * with zero in their most significant bit are represented as positive values and larger values are
- * represented as negative values with the same binary representation as their unsigned
- * counterpart.
- *
- * [1]: https://developers.google.com/protocol-buffers/docs/proto3#scalar
- */
-public enum class ProtoEncoding {
-    /**
-     * Default varint encoding for integral fields, or no specific encoding for other types.
-     */
-    DEFAULT,
-
-    /**
-     * Signed variable length encoding, `int32` and `int64` in proto.
-     *
-     * This encoding represents smaller positive values in fewer bytes, but always uses 10 bytes
-     * for negative values. Consider [ZIG_ZAG_VARINT] for fields that often contain negative
-     * values. It stores 7 bits of data per encoded byte. For fields that commonly contain ints
-     * greater than 2^28 or longs greater than 2^56, consider [SIGNED_FIXED] instead.
-     *
-     * It is used by default for [Int] and [Long] fields and supports nullable fields using the
-     * [`Int32Value`][1] and [`Int64Value`][2] wrapper messages.
-     *
-     * [1]: https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Int32Value
-     * [2]: https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Int64Value
-     */
-    SIGNED_VARINT,
-
-    /**
-     * Unsigned variable length encoding, `uint32` and `uint64` in proto.
-     *
-     * This is an unsigned variant of [SIGNED_VARINT] which represents smaller values in fewer
-     * bytes. It stores 7 bits of data per encoded byte. Consider [UNSIGNED_FIXED] instead for
-     * fields that commonly contains ints greater than 2^28 or longs greater than 2^56.
-     *
-     * It is used by default for [UInt] and [ULong] fields and supports nullable fields using the
-     * [`UInt32Value`][1] and [`UInt64Value][2] wrapper messages.
-     *
-     * [1]: https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.UInt32Value
-     * [2]: https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.UInt64Value
-     */
-    UNSIGNED_VARINT,
-
-    /**
-     * Signed variable length encoding with compact negative values, `sint32` and `sint64` in proto.
-     *
-     * This is a variant of [SIGNED_VARINT] which stores the sign bit in the least significant
-     * bit of the encoded representation to represent smaller absolute values in fewer bytes.
-     *
-     * It does support nullable fields.
-     */
-    ZIG_ZAG_VARINT,
-
-    /**
-     * Signed fixed width encoding, `sfixed32` and `sfixed64` in proto.
-     *
-     * This encoding always uses 4 bytes for ints and 8 bytes for longs. It is more compact than
-     * the variable length encodings for fields which commonly contain ints greater than 2^28 or
-     * longs greater than 2^56. Consider [SIGNED_VARINT] instead for fields which usually
-     * contain smaller positive values or [ZIG_ZAG_VARINT] for fields which often contain
-     * negative values with small absolute values.
-     *
-     * It does not support nullable fields.
-     */
-    SIGNED_FIXED,
-
-    /**
-     * Unsigned fixed width encoding, `fixed32` and `fixed64` in proto.
-     *
-     * This encoding always uses 4 bytes for ints and 8 bytes for longs. It is more compact than
-     * the variable length encodings for fields which commonly contain ints greater than 2^28 or
-     * longs greater than 2^56. Consider [UNSIGNED_VARINT] instead for fields which do not
-     * usually contain large values.
-     *
-     * It does not support nullable fields.
-     */
-    UNSIGNED_FIXED
-}

serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Reserved.kt

diff --git a/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Reserved.kt b/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Reserved.kt
deleted file mode 100644
index d3b7f8c..0000000
--- a/serialization/serialization-annotation/src/main/kotlin/androidx/serialization/Reserved.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization
-
-import kotlin.annotation.AnnotationRetention.SOURCE
-import kotlin.annotation.AnnotationTarget.CLASS
-
-/**
- * Reserves some IDs or names for a message class, enum class, or service interface.
- *
- * Apply this to a message class, enum class, or service interface to reserve member IDs or names.
- * This can be used to reserve unimplemented names or IDs for future use or to ensure that a
- * removed ID is not unintentionally reused in the future.
- *
- * For message classes and service interfaces, the reservation only applies to the annotated
- * class or interface. Its descendants do not inherit its reserved values.
- *
- * ```kotlin
- * @Reserved(1, 2, 3)
- * data class MyMessage(@Field(4) val myField: Int)
- * ```
- *
- * @property ids Message field, enum value, or service action IDs to reserve.
- * @property names Message field, enum value, or service action names to reserve.
- * @property idRanges Ranges of IDs to reserve in bulk.
- */
-@Retention(SOURCE)
-@Target(CLASS)
-public annotation class Reserved(
-    vararg val ids: Int = [],
-    val names: Array<String> = [],
-    val idRanges: Array<IdRange> = []
-) {
-    /**
-     * Reserves a block of IDs.
-     *
-     * Supply instances of this to [idRanges] to reserve ranges of IDs in bulk.
-     *
-     * ```kotlin
-     * @Reserved(idRanges = [Reserved.IdRange(from = 1, to = 9000)])
-     * data class MyMessage(@Field(9001) val myField: Int)
-     * ```
-     *
-     * @property from First ID to reserve, inclusive.
-     * @property to Last ID to reserve, inclusive.
-     */
-    @Retention(SOURCE)
-    @Target(allowedTargets = [])
-    public annotation class IdRange(val from: Int, val to: Int)
-}

serialization/serialization-compiler/build.gradle

diff --git a/serialization/serialization-compiler/build.gradle b/serialization/serialization-compiler/build.gradle
deleted file mode 100644
index 62342d1..0000000
--- a/serialization/serialization-compiler/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import androidx.build.LibraryGroups
-import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-
-import static androidx.build.dependencies.DependenciesKt.*
-
-plugins {
-    id("AndroidXPlugin")
-    id("kotlin")
-    id("kotlin-kapt")
-}
-
-targetCompatibility = JavaVersion.VERSION_1_7
-sourceCompatibility = JavaVersion.VERSION_1_7
-
-dependencies {
-    implementation(project(":serialization:serialization-annotation"))
-
-    implementation(AUTO_COMMON)
-    implementation(GUAVA)
-    implementation(JAVAPOET)
-    implementation(KOTLIN_STDLIB)
-
-    compileOnly(AUTO_SERVICE_ANNOTATIONS)
-    kapt(AUTO_SERVICE_PROCESSOR)
-
-    compileOnly(GRADLE_INCAP_HELPER)
-    kapt(GRADLE_INCAP_HELPER_PROCESSOR)
-
-    testImplementation("androidx.annotation:annotation:1.1.0")
-    testImplementation(project(":serialization:serialization-runtime"))
-    testImplementation(GOOGLE_COMPILE_TESTING)
-    testImplementation(JSR250)
-    testImplementation(JUNIT)
-    testImplementation(TRUTH)
-}
-
-androidx {
-    name = "AndroidX Serialization - Compiler"
-    mavenVersion = LibraryVersions.SERIALIZATION
-    type = LibraryType.ANNOTATION_PROCESSOR
-    mavenGroup = LibraryGroups.SERIALIZATION
-    inceptionYear = "2020"
-    description = "Annotation processor for AndroidX Serialization"
-}

serialization/serialization-compiler/lint-baseline.xml

diff --git a/serialization/serialization-compiler/lint-baseline.xml b/serialization/serialization-compiler/lint-baseline.xml
deleted file mode 100644
index 297ae16..0000000
--- a/serialization/serialization-compiler/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta02" client="gradle" version="4.2.0-beta02">
-
-</issues>

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/SerializationProcessor.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/SerializationProcessor.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/SerializationProcessor.kt
deleted file mode 100644
index 8eb9f51..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/SerializationProcessor.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler
-
-import androidx.serialization.compiler.codegen.CodeGenerator
-import androidx.serialization.compiler.processing.steps.EnumProcessingStep
-import com.google.auto.common.BasicAnnotationProcessor
-import com.google.auto.service.AutoService
-import net.ltgt.gradle.incap.IncrementalAnnotationProcessor
-import net.ltgt.gradle.incap.IncrementalAnnotationProcessorType.ISOLATING
-import javax.annotation.processing.Processor
-import javax.lang.model.SourceVersion
-
-/**
- * Parses and validates Serialization schema and generates message serializers and service binders.
- */
-@AutoService(Processor::class)
-@IncrementalAnnotationProcessor(ISOLATING)
-class SerializationProcessor : BasicAnnotationProcessor() {
-    override fun initSteps(): List<ProcessingStep> {
-        val codeGenerator = CodeGenerator(
-            processingEnv,
-            "androidx.serialization.compiler.SerializationProcessor"
-        )
-
-        val enumStep = EnumProcessingStep(processingEnv) { enum ->
-            codeGenerator.generateEnumSerializer(enum).writeTo(processingEnv)
-        }
-
-        return listOf(enumStep)
-    }
-
-    override fun getSupportedSourceVersion(): SourceVersion = SourceVersion.latest()
-}

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/CodeGenerator.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/CodeGenerator.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/CodeGenerator.kt
deleted file mode 100644
index a93b2dd..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/CodeGenerator.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.codegen
-
-import androidx.serialization.compiler.models.Enum
-import javax.annotation.processing.ProcessingEnvironment
-import androidx.serialization.compiler.codegen.java.javaEnumSerializer
-
-internal class CodeGenerator(
-    val generatedAnnotation: GeneratedAnnotation? = null
-) {
-    constructor(
-        processingEnv: ProcessingEnvironment,
-        generatingClassName: String
-    ) : this(GeneratedAnnotation.fromEnvironment(processingEnv, generatingClassName))
-
-    fun generateEnumSerializer(enum: Enum): GeneratedFile {
-        return GeneratedFile.Java(javaEnumSerializer(enum, generatedAnnotation))
-    }
-}
\ No newline at end of file

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/GeneratedAnnotation.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/GeneratedAnnotation.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/GeneratedAnnotation.kt
deleted file mode 100644
index 04e816f..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/GeneratedAnnotation.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.codegen
-
-import androidx.serialization.compiler.processing.ext.packageElement
-import com.google.auto.common.GeneratedAnnotations
-import com.squareup.javapoet.ClassName as JavaClassName
-import com.squareup.javapoet.AnnotationSpec as JavaAnnotationSpec
-import javax.annotation.processing.ProcessingEnvironment
-import javax.lang.model.element.NestingKind
-
-internal class GeneratedAnnotation(
-    val generatingClassName: String,
-    val packageName: String,
-    val simpleName: String = "Generated"
-) {
-    private lateinit var javaAnnotationSpec: JavaAnnotationSpec
-
-    fun toJavaAnnotationSpec(): JavaAnnotationSpec {
-        if (!::javaAnnotationSpec.isInitialized) {
-            javaAnnotationSpec = JavaAnnotationSpec
-                .builder(JavaClassName.get(packageName, simpleName))
-                .addMember("value", "\$S", generatingClassName)
-                .build()
-        }
-
-        return javaAnnotationSpec
-    }
-
-    companion object {
-        fun fromEnvironment(
-            processingEnv: ProcessingEnvironment,
-            generatingClassName: String
-        ): GeneratedAnnotation? {
-            return GeneratedAnnotations.generatedAnnotation(
-                processingEnv.elementUtils,
-                processingEnv.sourceVersion
-            ).orElse(null).let { typeElement ->
-                require(typeElement.nestingKind == NestingKind.TOP_LEVEL) {
-                    "Expected @Generated annotation to be a top-level type"
-                }
-
-                GeneratedAnnotation(
-                    generatingClassName,
-                    typeElement.packageElement.toString(),
-                    typeElement.simpleName.toString()
-                )
-            }
-        }
-    }
-}
\ No newline at end of file

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/GeneratedFile.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/GeneratedFile.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/GeneratedFile.kt
deleted file mode 100644
index 9c191b4..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/GeneratedFile.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.codegen
-
-import com.squareup.javapoet.JavaFile
-import javax.annotation.processing.ProcessingEnvironment
-
-internal sealed class GeneratedFile {
-    abstract fun writeTo(processingEnv: ProcessingEnvironment)
-
-    class Java(val javaFile: JavaFile) : GeneratedFile() {
-        override fun writeTo(processingEnv: ProcessingEnvironment) {
-            javaFile.writeTo(processingEnv.filer)
-        }
-
-        override fun toString(): String {
-            return javaFile.toString()
-        }
-    }
-}
\ No newline at end of file

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/EnumSerializer.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/EnumSerializer.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/EnumSerializer.kt
deleted file mode 100644
index a8c0bcd..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/EnumSerializer.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.codegen.java
-
-import androidx.serialization.EnumValue
-import androidx.serialization.compiler.codegen.GeneratedAnnotation
-import androidx.serialization.compiler.codegen.java.ext.buildClass
-import androidx.serialization.compiler.codegen.java.ext.controlFlow
-import androidx.serialization.compiler.codegen.java.ext.field
-import androidx.serialization.compiler.codegen.java.ext.nonNull
-import androidx.serialization.compiler.codegen.java.ext.overrideMethod
-import androidx.serialization.compiler.codegen.java.ext.parameterized
-import androidx.serialization.compiler.codegen.java.ext.switchCase
-import androidx.serialization.compiler.codegen.java.ext.switchDefault
-import androidx.serialization.compiler.codegen.java.ext.toClassName
-import androidx.serialization.compiler.models.Enum
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.JavaFile
-import com.squareup.javapoet.TypeName
-import javax.lang.model.element.Modifier.FINAL
-import javax.lang.model.element.Modifier.PUBLIC
-import javax.lang.model.element.Modifier.STATIC
-
-/** Generate an enum serializer implementation. */
-internal fun javaEnumSerializer(
-    enum: Enum,
-    generatedAnnotation: GeneratedAnnotation? = null
-): JavaFile {
-    val enumClass = enum.element.toClassName()
-    val serializer = serializerName(enumClass)
-
-    val values = enum.values.sortedBy { it.id }
-
-    return buildClass(serializer, PUBLIC, FINAL) {
-        generatedAnnotation?.let { addAnnotation(it.toJavaAnnotationSpec()) }
-        addOriginatingElement(enum.element)
-        addSuperinterface(ENUM_SERIALIZER.parameterized(enumClass))
-
-        field(serializer.nonNull, "INSTANCE", PUBLIC, STATIC, FINAL) {
-            initializer("new \$T()", serializer)
-        }
-
-        overrideMethod("encode", PUBLIC) {
-            addParameter(enumClass.nonNull, "value")
-            returns(TypeName.INT)
-
-            controlFlow("switch (value)") {
-                for (value in values) {
-                    switchCase("\$N", value.element.simpleName) {
-                        addStatement("return \$L", value.id)
-                    }
-                }
-
-                switchDefault {
-                    addStatement(
-                        "throw new \$T(\"Enum value \" + value.toString()\$W+ " +
-                            "\" does not have a serialization ID.\")",
-                        IllegalArgumentException::class.java
-                    )
-                }
-            }
-        }
-
-        overrideMethod("decode", PUBLIC) {
-            addParameter(TypeName.INT, "value")
-            returns(enumClass.nonNull)
-
-            controlFlow("switch (value)") {
-                for (value in values.filterNot { it.id == EnumValue.DEFAULT }) {
-                    switchCase("\$L", value.id) {
-                        addStatement("return \$T.\$N", enumClass, value.element.simpleName)
-                    }
-                }
-
-                switchDefault {
-                    val value = values.first { it.id == EnumValue.DEFAULT }
-                    addStatement("return \$T.\$N", enumClass, value.element.simpleName)
-                }
-            }
-        }
-    }
-}
-
-val ENUM_SERIALIZER: ClassName =
-    ClassName.get("androidx.serialization.runtime.internal", "EnumSerializerV1")

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/SerializerName.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/SerializerName.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/SerializerName.kt
deleted file mode 100644
index 2acb612..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/SerializerName.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.codegen.java
-
-import com.squareup.javapoet.ClassName
-
-/** Class name of a generated message or enum serializer. */
-internal fun serializerName(className: ClassName): ClassName {
-    return ClassName.get(
-        className.packageName(),
-        className.simpleNames().joinToString(separator = "_", postfix = "Serializer")
-    )
-}

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/MethodSpecExt.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/MethodSpecExt.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/MethodSpecExt.kt
deleted file mode 100644
index 4bfdf17..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/MethodSpecExt.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.codegen.java.ext
-
-import com.squareup.javapoet.MethodSpec
-
-/** Type-safe builder for a control flow within a method. */
-internal inline fun MethodSpec.Builder.controlFlow(
-    format: String,
-    vararg args: Any?,
-    body: MethodSpec.Builder.() -> Unit
-) {
-    beginControlFlow(format, *args)
-    body()
-    endControlFlow()
-}
-
-/** Type-safe builder for a `case` block within a `switch`. */
-internal inline fun MethodSpec.Builder.switchCase(
-    format: String,
-    vararg args: Any?,
-    body: MethodSpec.Builder.() -> Unit
-) {
-    addCode("case $format:\$>\n", *args)
-    body()
-    addCode("\$<")
-}
-
-/** Type-safe builder for a `default` block within a `switch`. */
-internal inline fun MethodSpec.Builder.switchDefault(body: MethodSpec.Builder.() -> Unit) {
-    addCode("default:\n\$>")
-    body()
-    addCode("\$<")
-}

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/TypeNameExt.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/TypeNameExt.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/TypeNameExt.kt
deleted file mode 100644
index ce2995c..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/TypeNameExt.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.codegen.java.ext
-
-import com.squareup.javapoet.AnnotationSpec
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.ParameterizedTypeName
-import com.squareup.javapoet.TypeName
-import javax.lang.model.element.TypeElement
-
-/** Convert a type element to a class name. */
-internal fun TypeElement.toClassName(): ClassName {
-    return ClassName.get(this)
-}
-
-/** This class name with type parameters.  */
-internal fun ClassName.parameterized(vararg typeArguments: TypeName): ParameterizedTypeName {
-    return ParameterizedTypeName.get(this, *typeArguments)
-}
-
-/** This type name annotated with NonNull. */
-internal val TypeName.nonNull: TypeName
-    get() {
-        require(!isPrimitive) { "@NonNull is not applicable to primitive type: $this" }
-        require(annotations.none { it.type == NULLABLE.type }) {
-            "@NonNull conflicts with @Nullable present on type: ${withoutAnnotations()}"
-        }
-        return if (annotations.any { it.type == NON_NULL.type }) this else annotated(
-            NON_NULL
-        )
-    }
-
-private val NON_NULL: AnnotationSpec =
-    AnnotationSpec.builder(ClassName.get("androidx.annotation", "NonNull")).build()
-
-/** This type name annotated with Nullable. */
-internal val TypeName.nullable: TypeName
-    get() {
-        require(!isPrimitive) { "@Nullable is not applicable to primitive type: $this" }
-        require(annotations.none { it.type == NON_NULL.type }) {
-            "@Nullable conflicts with @NonNull present on type: ${withoutAnnotations()}"
-        }
-        return if (annotations.any { it.type == NULLABLE.type }) this else annotated(NULLABLE)
-    }
-
-private val NULLABLE: AnnotationSpec =
-    AnnotationSpec.builder(ClassName.get("androidx.annotation", "Nullable")).build()
\ No newline at end of file

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/TypeSpecExt.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/TypeSpecExt.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/TypeSpecExt.kt
deleted file mode 100644
index a798f93..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/codegen/java/ext/TypeSpecExt.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.codegen.java.ext
-
-import com.squareup.javapoet.AnnotationSpec
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.FieldSpec
-import com.squareup.javapoet.JavaFile
-import com.squareup.javapoet.MethodSpec
-import com.squareup.javapoet.TypeName
-import com.squareup.javapoet.TypeSpec
-import javax.lang.model.element.Modifier
-
-/** Builds a new class type spec. */
-internal inline fun buildClass(
-    className: ClassName,
-    vararg modifiers: Modifier,
-    init: TypeSpec.Builder.() -> Unit
-): JavaFile {
-    return TypeSpec.classBuilder(className.topLevelClassName()).run {
-        addModifiers(*modifiers)
-        init()
-        build()
-    }.toJavaFile(className.packageName())
-}
-
-internal fun TypeSpec.toJavaFile(packageName: String): JavaFile {
-    return JavaFile.builder(packageName, this).indent(INDENTATION).build()
-}
-
-private const val INDENTATION = "    "
-
-/** Type-safe builder for a field. */
-internal inline fun TypeSpec.Builder.field(
-    type: TypeName,
-    name: String,
-    vararg modifiers: Modifier,
-    init: FieldSpec.Builder.() -> Unit
-) {
-    addField(FieldSpec.builder(type, name, *modifiers).apply(init).build())
-}
-
-/** Type-safe builder for a method. */
-internal inline fun TypeSpec.Builder.method(
-    name: String,
-    vararg modifiers: Modifier,
-    init: MethodSpec.Builder.() -> Unit
-) {
-    addMethod(
-        MethodSpec.methodBuilder(name).run {
-            addModifiers(*modifiers)
-            init()
-            build()
-        }
-    )
-}
-
-internal inline fun TypeSpec.Builder.overrideMethod(
-    name: String,
-    vararg modifiers: Modifier,
-    init: MethodSpec.Builder.() -> Unit
-) {
-    method(name, *modifiers) {
-        addAnnotation(OVERRIDE)
-        init()
-    }
-}
-
-private val OVERRIDE: AnnotationSpec =
-    AnnotationSpec.builder(ClassName.get("java.lang", "Override")).build()
\ No newline at end of file

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/models/Enum.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/models/Enum.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/models/Enum.kt
deleted file mode 100644
index 9ff954c..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/models/Enum.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.models
-
-import javax.lang.model.element.AnnotationMirror
-import javax.lang.model.element.TypeElement
-import javax.lang.model.element.VariableElement
-
-internal class Enum(
-    val element: TypeElement,
-    val values: List<Value>,
-    val reserved: Reserved
-) {
-    class Value(
-        val element: VariableElement,
-        val annotation: AnnotationMirror,
-        val id: Int
-    )
-}

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/models/Reserved.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/models/Reserved.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/models/Reserved.kt
deleted file mode 100644
index cecc00e..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/models/Reserved.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.models
-
-internal class Reserved(
-    val ids: Set<Int>,
-    val names: Set<String>,
-    val idRanges: Set<IntRange>
-) {
-    companion object {
-        private val EMPTY = Reserved(emptySet(), emptySet(), emptySet())
-
-        fun empty(): Reserved = EMPTY
-    }
-}
\ No newline at end of file

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/AnnotationMirrorExt.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/AnnotationMirrorExt.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/AnnotationMirrorExt.kt
deleted file mode 100644
index 0f8cd75..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/AnnotationMirrorExt.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.processing.ext
-
-import com.google.auto.common.AnnotationMirrors
-import javax.lang.model.element.AnnotationMirror
-import javax.lang.model.element.AnnotationValue
-
-/** Get an annotation value by Java property name. */
-@Suppress("DEPRECATION")
-internal operator fun AnnotationMirror.get(name: String): AnnotationValue {
-    return AnnotationMirrors.getAnnotationValue(this, name)
-}

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/AnnotationValueExt.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/AnnotationValueExt.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/AnnotationValueExt.kt
deleted file mode 100644
index 84df736..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/AnnotationValueExt.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.processing.ext
-
-import javax.lang.model.element.AnnotationMirror
-import javax.lang.model.element.AnnotationValue
-import javax.lang.model.util.SimpleAnnotationValueVisitor7
-
-internal fun AnnotationValue.asInt(): Int {
-    return accept(AsIntAnnotationValueVisitor, null)
-}
-
-private object AsIntAnnotationValueVisitor : AsTypeAnnotationValueVisitor<Int>("int") {
-    override fun visitInt(i: Int, p: Nothing?): Int {
-        return i
-    }
-}
-
-internal fun AnnotationValue.asString(): String {
-    return accept(AsStringAnnotationValueVisitor, null)
-}
-
-private object AsStringAnnotationValueVisitor : AsTypeAnnotationValueVisitor<String>("String") {
-    override fun visitString(s: String, p: Nothing?): String {
-        return s
-    }
-}
-
-internal fun AnnotationValue.asList(): List<AnnotationValue> {
-    return accept(AsListAnnotationValueVisitor, null)
-}
-
-private object AsListAnnotationValueVisitor :
-    AsTypeAnnotationValueVisitor<List<AnnotationValue>>("List<AnnotationValue>") {
-
-    override fun visitArray(vals: List<AnnotationValue>, p: Nothing?): List<AnnotationValue> {
-        return vals
-    }
-}
-
-internal fun AnnotationValue.asAnnotationMirror(): AnnotationMirror {
-    return accept(AsAnnotationMirrorAnnotationValueVisitor, null)
-}
-
-private object AsAnnotationMirrorAnnotationValueVisitor :
-    AsTypeAnnotationValueVisitor<AnnotationMirror>("AnnotationMirror") {
-
-    override fun visitAnnotation(a: AnnotationMirror, p: Nothing?): AnnotationMirror {
-        return a
-    }
-}
-
-private abstract class AsTypeAnnotationValueVisitor<T>(
-    private val expectedType: String
-) : SimpleAnnotationValueVisitor7<T, Nothing?>() {
-    override fun defaultAction(o: Any, p: Nothing?): T {
-        throw IllegalArgumentException(
-            "Expected annotation value of type $expectedType, got ${o::class.java.canonicalName}"
-        )
-    }
-}

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/ElementExt.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/ElementExt.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/ElementExt.kt
deleted file mode 100644
index 6115b38..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/ElementExt.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.processing.ext
-
-import com.google.auto.common.MoreElements
-import javax.lang.model.element.AnnotationMirror
-import javax.lang.model.element.Element
-import javax.lang.model.element.Modifier
-import javax.lang.model.element.PackageElement
-import javax.lang.model.element.TypeElement
-import javax.lang.model.element.VariableElement
-import javax.lang.model.util.SimpleElementVisitor6
-import kotlin.reflect.KClass
-
-/** Casts this element to a [TypeElement] using [MoreElements.asType]. */
-internal fun Element.asTypeElement(): TypeElement {
-    return MoreElements.asType(this)
-}
-
-/** Casts this element to a [VariableElement] using [MoreElements.asVariable]. */
-internal fun Element.asVariableElement(): VariableElement {
-    return MoreElements.asVariable(this)
-}
-
-/** Determines if this element is private by the presence of [Modifier.PRIVATE] in it modifiers. */
-internal fun Element.isPrivate(): Boolean {
-    return Modifier.PRIVATE in modifiers
-}
-
-/**
- * Determines if this element is visible to its own package.
- *
- * A private element or an element enclosed within a private element is not visible to its package.
- */
-internal fun Element.isVisibleToPackage(): Boolean {
-    return accept(IsVisibleToPackageVisitor, null)
-}
-
-@Suppress("DEPRECATION")
-private object IsVisibleToPackageVisitor : SimpleElementVisitor6<Boolean, Nothing?>() {
-    override fun visitPackage(e: PackageElement, p: Nothing?): Boolean {
-        return true
-    }
-
-    override fun defaultAction(e: Element, p: Nothing?): Boolean {
-        return if (e.isPrivate()) {
-            false
-        } else {
-            e.enclosingElement.accept(this, null)
-        }
-    }
-}
-
-/** Gets the enclosing package element using [MoreElements.getPackage]. */
-internal val Element.packageElement: PackageElement
-    get() = MoreElements.getPackage(this)
-
-/** Get an annotation mirror if directly present on this element or else `null`. */
-internal operator fun Element.get(annotationClass: KClass<out Annotation>): AnnotationMirror? {
-    return MoreElements.getAnnotationMirror(this, annotationClass.java).orNull()
-}

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/MessagerExt.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/MessagerExt.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/MessagerExt.kt
deleted file mode 100644
index 84a1f7b..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/ext/MessagerExt.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.processing.ext
-
-import javax.annotation.processing.Messager
-import javax.lang.model.element.AnnotationMirror
-import javax.lang.model.element.AnnotationValue
-import javax.lang.model.element.Element
-import javax.tools.Diagnostic.Kind.ERROR
-import javax.tools.Diagnostic.Kind.WARNING
-import kotlin.reflect.KClass
-
-/** Print [message] as a warning with optional positional information. */
-internal inline fun Messager.warn(
-    element: Element? = null,
-    annotation: AnnotationMirror? = null,
-    annotationValue: AnnotationValue? = null,
-    message: () -> String
-) {
-    printMessage(WARNING, message(), element, annotation, annotationValue)
-}
-
-/** Print [message] as an error with optional positional information. */
-internal inline fun Messager.error(
-    element: Element? = null,
-    annotation: AnnotationMirror? = null,
-    annotationValue: AnnotationValue? = null,
-    message: () -> String
-) {
-    printMessage(ERROR, message(), element, annotation, annotationValue)
-}
-
-/** Print [message] as an error on the annotation of type [annotationClass] on [element]. */
-internal inline fun Messager.error(
-    element: Element,
-    annotationClass: KClass<out Annotation>,
-    message: () -> String
-) {
-    printMessage(ERROR, message(), element, element[annotationClass])
-}

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/parsers/ParseReserved.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/parsers/ParseReserved.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/parsers/ParseReserved.kt
deleted file mode 100644
index 612d8e9..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/parsers/ParseReserved.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.processing.parsers
-
-import androidx.serialization.Reserved.IdRange
-import androidx.serialization.compiler.processing.ext.asAnnotationMirror
-import androidx.serialization.compiler.processing.ext.asInt
-import androidx.serialization.compiler.processing.ext.asList
-import androidx.serialization.compiler.processing.ext.asString
-import androidx.serialization.compiler.processing.ext.get
-import androidx.serialization.compiler.models.Reserved
-import javax.lang.model.element.TypeElement
-import androidx.serialization.Reserved as ReservedAnnotation
-
-/**
- * Extract the data from a [androidx.serialization.Reserved] annotation on [element].
- *
- * If no annotation is present, this returns an empty reserved data class. If it encounters an
- * [IdRange] with its `from` greater than its `to`, it reverses them before converting them to an
- * [IntRange], reserving the same range of IDs as if they had been correctly placed.
- */
-internal fun parseReserved(element: TypeElement): Reserved {
-    return when (val reserved = element[ReservedAnnotation::class]) {
-        null -> Reserved.empty()
-        else -> Reserved(
-            ids = reserved["ids"].asList().mapTo(mutableSetOf()) { it.asInt() },
-            names = reserved["names"].asList().mapTo(mutableSetOf()) { it.asString() },
-            idRanges = reserved["idRanges"].asList().mapTo(mutableSetOf()) { annotationValue ->
-                val idRange = annotationValue.asAnnotationMirror()
-                val from = idRange["from"].asInt()
-                val to = idRange["to"].asInt()
-
-                when {
-                    from <= to -> from..to
-                    else -> to..from
-                }
-            }
-        )
-    }
-}

serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/steps/EnumProcessingStep.kt

diff --git a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/steps/EnumProcessingStep.kt b/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/steps/EnumProcessingStep.kt
deleted file mode 100644
index df770b2..0000000
--- a/serialization/serialization-compiler/src/main/kotlin/androidx/serialization/compiler/processing/steps/EnumProcessingStep.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.processing.steps
-
-import androidx.serialization.EnumValue
-import androidx.serialization.compiler.processing.ext.asInt
-import androidx.serialization.compiler.processing.ext.asTypeElement
-import androidx.serialization.compiler.processing.ext.asVariableElement
-import androidx.serialization.compiler.processing.ext.error
-import androidx.serialization.compiler.processing.ext.get
-import androidx.serialization.compiler.processing.ext.isPrivate
-import androidx.serialization.compiler.processing.ext.isVisibleToPackage
-import androidx.serialization.compiler.processing.parsers.parseReserved
-import androidx.serialization.compiler.models.Enum
-import com.google.auto.common.BasicAnnotationProcessor.ProcessingStep
-import com.google.common.collect.SetMultimap
-import javax.annotation.processing.Messager
-import javax.annotation.processing.ProcessingEnvironment
-import javax.lang.model.element.Element
-import javax.lang.model.element.ElementKind
-import javax.lang.model.element.ElementKind.ENUM_CONSTANT
-import javax.lang.model.element.TypeElement
-
-/** Processing step that parses and validates enums, and generates enum coders. */
-internal class EnumProcessingStep(
-    private val processingEnv: ProcessingEnvironment,
-    private val onEnum: (Enum) -> Unit
-) : ProcessingStep {
-    private val messager: Messager = processingEnv.messager
-
-    override fun annotations(): Set<Class<out Annotation>> {
-        return setOf(EnumValue::class.java)
-    }
-
-    override fun process(
-        elementsByAnnotation: SetMultimap<Class<out Annotation>, Element>
-    ): Set<Element> {
-        elementsByAnnotation[EnumValue::class.java]
-            .let(::processEnumValues)
-            .forEach(::processEnumClass)
-
-        return emptySet()
-    }
-
-    /**
-     * Process [EnumValue] annotations present in a round.
-     *
-     * This method validates the placement of the annotations on enum constants, and returns a
-     * set of type elements representing the enum classes that have at least one [EnumValue]
-     * annotation on an enum constant.
-     */
-    private fun processEnumValues(elements: Set<Element>): Set<TypeElement> {
-        if (elements.isEmpty()) return emptySet()
-
-        val enumClasses = mutableSetOf<TypeElement>()
-
-        for (element in elements) {
-            if (element.kind == ENUM_CONSTANT) {
-                enumClasses += element.enclosingElement.asTypeElement()
-            } else {
-                messager.error(element, EnumValue::class) {
-                    "@EnumValue must annotate an enum constant"
-                }
-            }
-        }
-
-        return enumClasses
-    }
-
-    /**
-     * Process a type element representing a serializable enum class.
-     *
-     * This method operates by validating that the enum class is not private, then walking its
-     * enum constants. It validates that all constants have an [EnumValue] annotation, and then
-     * reads [EnumValue.id] and constructs an [Enum] and dispatches it to [onEnum]. It fills
-     * [Enum.reserved] using [parseReserved].
-     */
-    private fun processEnumClass(enumClass: TypeElement) {
-        check(enumClass.kind == ElementKind.ENUM) {
-            "Expected $enumClass to be an enum class"
-        }
-
-        var hasError = false
-
-        if (!enumClass.isVisibleToPackage()) {
-            if (enumClass.isPrivate()) {
-                messager.error(enumClass) {
-                    "Enum ${enumClass.qualifiedName} is private and cannot be serialized"
-                }
-            } else {
-                messager.error(enumClass) {
-                    "Enum ${enumClass.qualifiedName} is not visible to its package and cannot " +
-                        "be serialized"
-                }
-            }
-
-            hasError = true
-        }
-
-        val values = mutableListOf<Enum.Value>()
-
-        for (element in enumClass.enclosedElements) {
-            if (element.kind == ENUM_CONSTANT) {
-                val annotation = element[EnumValue::class]
-
-                if (annotation != null) {
-                    values += Enum.Value(
-                        element = element.asVariableElement(),
-                        annotation = annotation,
-                        id = annotation["value"].asInt()
-                    )
-                } else {
-                    messager.error(element) {
-                        "To avoid unexpected behavior, all enum constants in a serializable " +
-                            "enum must be annotated with @EnumValue"
-                    }
-                    hasError = true
-                }
-            }
-        }
-
-        if (!hasError) {
-            onEnum(Enum(enumClass, values, parseReserved(enumClass)))
-        }
-    }
-}

serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/EnumSerializerTest.kt

diff --git a/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/EnumSerializerTest.kt b/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/EnumSerializerTest.kt
deleted file mode 100644
index bb7581c..0000000
--- a/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/EnumSerializerTest.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler
-
-import com.google.testing.compile.Compilation
-import com.google.testing.compile.CompilationSubject.assertThat
-import com.google.testing.compile.Compiler.javac
-import com.google.testing.compile.JavaFileObjects
-import org.junit.Test
-import javax.tools.JavaFileObject
-
-/** Integration tests for enum serializer generation. */
-class EnumSerializerTest {
-    @Test
-    fun test() {
-        val enum = JavaFileObjects.forSourceString(
-            "com.example.TestEnum",
-            """
-            package com.example;
-            
-            import androidx.serialization.EnumValue;
-            
-            public enum TestEnum {
-                @EnumValue(EnumValue.DEFAULT)
-                DEFAULT,
-                @EnumValue(1)
-                ONE,
-                @EnumValue(2)
-                TWO
-            }
-            """.trimIndent()
-        )
-
-        /* ktlint-disable max-line-length */
-        val serializer = JavaFileObjects.forSourceString(
-            "com.example.TestEnumSerializer",
-            """
-            package com.example;
-
-            import androidx.annotation.NonNull;
-            import androidx.serialization.runtime.internal.EnumSerializerV1;
-            import java.lang.IllegalArgumentException;
-            import java.lang.Override;
-            import javax.annotation.processing.Generated;
-
-            @Generated("androidx.serialization.compiler.SerializationProcessor")
-            public final class TestEnumSerializer implements EnumSerializerV1<TestEnum> {
-                public static final @NonNull TestEnumSerializer INSTANCE = new TestEnumSerializer();
-
-                @Override
-                public int encode(@NonNull TestEnum value) {
-                    switch (value) {
-                        case DEFAULT:
-                            return 0;
-                        case ONE:
-                            return 1;
-                        case TWO:
-                            return 2;
-                        default:
-                            throw new IllegalArgumentException("Enum value " + value.toString()
-                                    + " does not have a serialization ID.");
-                    }
-                }
-
-                @Override
-                public @NonNull TestEnum decode(int value) {
-                    switch (value) {
-                        case 1:
-                            return TestEnum.ONE;
-                        case 2:
-                            return TestEnum.TWO;
-                        default:
-                            return TestEnum.DEFAULT;
-                    }
-                }
-            }
-            """.trimIndent()
-        )
-        /* ktlint-enable max-line-length */
-
-        assertThat(compile(enum))
-            .generatedSourceFile("com.example.TestEnumSerializer")
-            .hasSourceEquivalentTo(serializer)
-    }
-
-    private fun compile(vararg sources: JavaFileObject): Compilation {
-        return javac().withProcessors(SerializationProcessor()).compile(*sources)
-    }
-}
\ No newline at end of file

serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/SerializationProcessorTest.kt

diff --git a/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/SerializationProcessorTest.kt b/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/SerializationProcessorTest.kt
deleted file mode 100644
index 53a00ae..0000000
--- a/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/SerializationProcessorTest.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler
-
-import com.google.testing.compile.Compilation
-import com.google.testing.compile.CompilationSubject.assertThat
-import com.google.testing.compile.Compiler.javac
-import com.google.testing.compile.JavaFileObjects
-import org.junit.Test
-import javax.tools.JavaFileObject
-
-/** Unit tests for [SerializationProcessor]. */
-class SerializationProcessorTest {
-    @Test
-    fun testSucceedsWithoutWarnings() {
-        val testClass = JavaFileObjects.forSourceString("Test", "public class Test {}")
-        assertThat(compile(testClass)).succeededWithoutWarnings()
-    }
-
-    private fun compile(vararg sources: JavaFileObject): Compilation {
-        return javac().withProcessors(SerializationProcessor()).compile(*sources)
-    }
-}

serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/codegen/java/SerializerNameTest.kt

diff --git a/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/codegen/java/SerializerNameTest.kt b/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/codegen/java/SerializerNameTest.kt
deleted file mode 100644
index 7077c08..0000000
--- a/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/codegen/java/SerializerNameTest.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.codegen.java
-
-import org.junit.Test
-import com.google.common.truth.Truth.assertThat
-import com.squareup.javapoet.ClassName
-
-/** Unit tests for [serializerName]. */
-class SerializerNameTest {
-    @Test
-    fun testSimpleName() {
-        assertThat(serializerName(ClassName.get("com.example", "Test")))
-            .isEqualTo(ClassName.get("com.example", "TestSerializer"))
-    }
-
-    @Test
-    fun testNestedName() {
-        assertThat(serializerName(ClassName.get("com.example", "Outer", "Inner")))
-            .isEqualTo(ClassName.get("com.example", "Outer_InnerSerializer"))
-    }
-
-    @Test
-    fun testDefaultPackage() {
-        assertThat(serializerName(ClassName.get("", "Test")))
-            .isEqualTo(ClassName.get("", "TestSerializer"))
-    }
-}

serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/processing/parsers/ParseReservedTest.kt

diff --git a/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/processing/parsers/ParseReservedTest.kt b/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/processing/parsers/ParseReservedTest.kt
deleted file mode 100644
index 1e00920..0000000
--- a/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/processing/parsers/ParseReservedTest.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.processing.parsers
-
-import androidx.serialization.compiler.processing.ext.asTypeElement
-import androidx.serialization.compiler.models.Reserved
-import com.google.auto.common.BasicAnnotationProcessor
-import com.google.auto.common.BasicAnnotationProcessor.ProcessingStep
-import com.google.common.collect.SetMultimap
-import com.google.common.truth.Truth.assertThat
-import com.google.testing.compile.CompilationSubject.assertThat
-import com.google.testing.compile.Compiler.javac
-import com.google.testing.compile.JavaFileObjects
-import org.junit.Test
-import javax.lang.model.SourceVersion
-import javax.lang.model.element.Element
-
-/** Unit tests for [parseReserved]. */
-class ParseReservedTest {
-    @Test
-    fun testIds() {
-        assertThat(compile("@Reserved(ids = {1, 2, 3})").ids).containsExactly(1, 2, 3)
-    }
-
-    @Test
-    fun testNames() {
-        assertThat(compile("""@Reserved(names = {"foo", "bar"})""").names)
-            .containsExactly("foo", "bar")
-    }
-
-    @Test
-    fun testIdRanges() {
-        val reserved = """
-            @Reserved(idRanges = {
-                @Reserved.IdRange(from = 1, to = 2),
-                @Reserved.IdRange(from = 4, to = 3) // Reversed for testing
-            })
-        """.trimIndent()
-        assertThat(compile(reserved).idRanges).containsExactly(1..2, 3..4)
-    }
-
-    private fun compile(reserved: String): Reserved {
-        val processor =
-            ReservedProcessor()
-        val source = JavaFileObjects.forSourceString(
-            "TestClass",
-            """
-            import androidx.serialization.Reserved;
-            
-            $reserved
-            public final class TestClass {}
-            """.trimIndent()
-        )
-        assertThat(javac().withProcessors(processor).compile(source)).succeededWithoutWarnings()
-        return processor.reserved
-    }
-
-    private class ReservedProcessingStep(
-        private val onReserved: (Reserved) -> Unit
-    ) : ProcessingStep {
-        override fun annotations(): Set<Class<out Annotation>> {
-            return setOf(androidx.serialization.Reserved::class.java)
-        }
-
-        override fun process(
-            elementsByAnnotation: SetMultimap<Class<out Annotation>, Element>
-        ): Set<Element> {
-            elementsByAnnotation[androidx.serialization.Reserved::class.java].forEach {
-                onReserved(parseReserved(it.asTypeElement()))
-            }
-
-            return emptySet()
-        }
-    }
-
-    private class ReservedProcessor : BasicAnnotationProcessor() {
-        lateinit var reserved: Reserved
-
-        override fun initSteps(): List<ProcessingStep> = listOf(
-            ReservedProcessingStep { reserved = it }
-        )
-
-        override fun getSupportedSourceVersion(): SourceVersion = SourceVersion.latest()
-    }
-}

serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/processing/steps/EnumProcessingStepTest.kt

diff --git a/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/processing/steps/EnumProcessingStepTest.kt b/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/processing/steps/EnumProcessingStepTest.kt
deleted file mode 100644
index 8aefd65..0000000
--- a/serialization/serialization-compiler/src/test/kotlin/androidx/serialization/compiler/processing/steps/EnumProcessingStepTest.kt
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.compiler.processing.steps
-
-import androidx.serialization.compiler.models.Enum
-import androidx.serialization.compiler.models.Reserved
-import com.google.auto.common.BasicAnnotationProcessor
-import com.google.common.truth.Correspondence
-import com.google.common.truth.Truth.assertThat
-import com.google.testing.compile.Compilation
-import com.google.testing.compile.CompilationSubject.assertThat
-import com.google.testing.compile.Compiler.javac
-import com.google.testing.compile.JavaFileObjects
-import org.junit.Test
-import javax.lang.model.SourceVersion
-import javax.tools.JavaFileObject
-
-/** Unit tests for [EnumProcessingStep]. */
-class EnumProcessingStepTest {
-    private val enumValueCorrespondence = Correspondence.from(
-        {
-            actual: Enum.Value?, expected: Pair<Int, String>? ->
-            if (actual != null && expected != null) {
-                actual.id == expected.first &&
-                    actual.element.simpleName.contentEquals(expected.second)
-            } else {
-                actual == null && expected == null
-            }
-        },
-        "has ID and name"
-    )
-
-    @Test
-    fun testParsing() {
-        val enum = compileEnum(
-            JavaFileObjects.forSourceString(
-                "TestEnum",
-                """
-            import androidx.serialization.EnumValue;
-            
-            public enum TestEnum {
-                @EnumValue(EnumValue.DEFAULT)
-                DEFAULT,
-                @EnumValue(1)
-                ONE
-            }
-                """.trimIndent()
-            )
-        )
-
-        assertThat(enum.values)
-            .comparingElementsUsing(enumValueCorrespondence)
-            .containsExactly(0 to "DEFAULT", 1 to "ONE")
-        assertThat(enum.reserved).isSameInstanceAs(Reserved.empty())
-    }
-
-    @Test
-    fun testInvalidPrivateEnum() {
-        val testEnum = JavaFileObjects.forSourceString(
-            "com.example.PrivateEnumTest",
-            """
-            package com.example;
-            
-            import androidx.serialization.EnumValue;
-            
-            public class PrivateEnumTest {
-                private enum PrivateEnum {
-                    @EnumValue(0) TEST
-                }
-            }
-            """.trimIndent()
-        )
-
-        assertThat(compile(testEnum)).hadErrorContaining(
-            "Enum com.example.PrivateEnumTest.PrivateEnum is private and cannot be serialized"
-        )
-    }
-
-    @Test
-    fun testInvalidPrivateNestedEnum() {
-        val testEnum = JavaFileObjects.forSourceString(
-            "PrivateNestedEnumTest",
-            """
-            import androidx.serialization.EnumValue;
-            
-            public class PrivateNestedEnumTest {
-                private static class NestedClass {
-                    public enum NestedEnum {
-                        @EnumValue(EnumValue.DEFAULT) TEST
-                    }
-                }
-            }
-            """.trimIndent()
-        )
-
-        assertThat(compile(testEnum)).hadErrorContaining(
-            "Enum PrivateNestedEnumTest.NestedClass.NestedEnum is not visible to its package"
-        )
-    }
-
-    @Test
-    fun testInvalidEnumValueAnnotationLocation() {
-        val testField = JavaFileObjects.forSourceString(
-            "EnumValueFieldTest",
-            """
-            import androidx.serialization.EnumValue;
-            
-            public class EnumValueFieldTest {
-                @EnumValue(0)
-                public int foo;
-            }
-            """.trimIndent()
-        )
-
-        assertThat(compile(testField))
-            .hadErrorContaining("@EnumValue must annotate an enum constant")
-    }
-
-    @Test
-    fun testInvalidMissingEnumValue() {
-        val testEnum = JavaFileObjects.forSourceString(
-            "MissingEnumValue",
-            """
-            import androidx.serialization.EnumValue;
-            
-            public enum MissingEnumValue {
-                @EnumValue(0)
-                ZERO,
-                ONE
-            }
-            """.trimIndent()
-        )
-
-        assertThat(compile(testEnum)).hadErrorContaining(
-            "To avoid unexpected behavior, all enum constants in a serializable enum must be " +
-                "annotated with @EnumValue"
-        )
-    }
-
-    private fun compile(vararg sources: JavaFileObject): Compilation {
-        return javac().withProcessors(SchemaCompilationProcessor()).compile(*sources)
-    }
-
-    private fun compileEnum(source: JavaFileObject): Enum {
-        val processor = SchemaCompilationProcessor()
-        assertThat(javac().withProcessors(processor).compile(source))
-            .succeededWithoutWarnings()
-
-        return processor.enum
-    }
-
-    private class SchemaCompilationProcessor : BasicAnnotationProcessor() {
-        lateinit var enum: Enum
-
-        override fun initSteps(): List<ProcessingStep> {
-            return listOf(EnumProcessingStep(processingEnv) { enum = it })
-        }
-
-        override fun getSupportedSourceVersion(): SourceVersion {
-            return SourceVersion.latest()
-        }
-    }
-}

serialization/serialization-runtime-parcel/api/current.txt

diff --git a/serialization/serialization-runtime-parcel/api/current.txt b/serialization/serialization-runtime-parcel/api/current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/serialization/serialization-runtime-parcel/api/current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

serialization/serialization-runtime-parcel/api/public_plus_experimental_current.txt

diff --git a/serialization/serialization-runtime-parcel/api/public_plus_experimental_current.txt b/serialization/serialization-runtime-parcel/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/serialization/serialization-runtime-parcel/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

serialization/serialization-runtime-parcel/api/res-current.txt

diff --git a/serialization/serialization-runtime-parcel/api/res-current.txt b/serialization/serialization-runtime-parcel/api/res-current.txt
deleted file mode 100644
index e69de29..0000000
--- a/serialization/serialization-runtime-parcel/api/res-current.txt
+++ /dev/null

serialization/serialization-runtime-parcel/api/restricted_current.txt

diff --git a/serialization/serialization-runtime-parcel/api/restricted_current.txt b/serialization/serialization-runtime-parcel/api/restricted_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/serialization/serialization-runtime-parcel/api/restricted_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

serialization/serialization-runtime-parcel/build.gradle

diff --git a/serialization/serialization-runtime-parcel/build.gradle b/serialization/serialization-runtime-parcel/build.gradle
deleted file mode 100644
index db2225a..0000000
--- a/serialization/serialization-runtime-parcel/build.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
-import androidx.build.Publish
-
-plugins {
-    id("AndroidXPlugin")
-    id("com.android.library")
-}
-
-dependencies {
-    api(project(":serialization:serialization-runtime"))
-}
-
-android {
-    defaultConfig {
-        minSdkVersion 14
-    }
-
-    targetCompatibility = JavaVersion.VERSION_1_7
-    sourceCompatibility = JavaVersion.VERSION_1_7
-}
-
-androidx {
-    name = "AndroidX Serialization - Parcel Runtime"
-    publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenVersion = LibraryVersions.SERIALIZATION
-    mavenGroup = LibraryGroups.SERIALIZATION
-    inceptionYear = "2020"
-    description = "Parcel runtime for AndroidX Serialization"
-}

serialization/serialization-runtime-parcel/lint-baseline.xml

diff --git a/serialization/serialization-runtime-parcel/lint-baseline.xml b/serialization/serialization-runtime-parcel/lint-baseline.xml
deleted file mode 100644
index 8f1aa4b..0000000
--- a/serialization/serialization-runtime-parcel/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta02" client="gradle" variant="debug" version="4.2.0-beta02">
-
-</issues>

serialization/serialization-runtime-parcel/src/main/AndroidManifest.xml

diff --git a/serialization/serialization-runtime-parcel/src/main/AndroidManifest.xml b/serialization/serialization-runtime-parcel/src/main/AndroidManifest.xml
deleted file mode 100644
index c548652..0000000
--- a/serialization/serialization-runtime-parcel/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2020 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<manifest package="androidx.serialization.runtime.parcel"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-</manifest>

serialization/serialization-runtime-proto/api/current.txt

diff --git a/serialization/serialization-runtime-proto/api/current.txt b/serialization/serialization-runtime-proto/api/current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/serialization/serialization-runtime-proto/api/current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

serialization/serialization-runtime-proto/api/public_plus_experimental_current.txt

diff --git a/serialization/serialization-runtime-proto/api/public_plus_experimental_current.txt b/serialization/serialization-runtime-proto/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/serialization/serialization-runtime-proto/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

serialization/serialization-runtime-proto/api/restricted_current.txt

diff --git a/serialization/serialization-runtime-proto/api/restricted_current.txt b/serialization/serialization-runtime-proto/api/restricted_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/serialization/serialization-runtime-proto/api/restricted_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

serialization/serialization-runtime-proto/build.gradle

diff --git a/serialization/serialization-runtime-proto/build.gradle b/serialization/serialization-runtime-proto/build.gradle
deleted file mode 100644
index efae6b7..0000000
--- a/serialization/serialization-runtime-proto/build.gradle
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import androidx.build.LibraryGroups
-import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-
-plugins {
-    id("AndroidXPlugin")
-    id("java-library")
-}
-
-targetCompatibility = JavaVersion.VERSION_1_7
-sourceCompatibility = JavaVersion.VERSION_1_7
-
-dependencies {
-   //api(project(":serialization:serialization-runtime"))
-}
-
-androidx {
-    name = "AndroidX Serialization - Protocol Buffers Runtime"
-    mavenVersion = LibraryVersions.SERIALIZATION
-    type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.SERIALIZATION
-    inceptionYear = "2020"
-    description = "Protocol Buffers runtime for AndroidX Serialization"
-}

serialization/serialization-runtime-proto/lint-baseline.xml

diff --git a/serialization/serialization-runtime-proto/lint-baseline.xml b/serialization/serialization-runtime-proto/lint-baseline.xml
deleted file mode 100644
index 297ae16..0000000
--- a/serialization/serialization-runtime-proto/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta02" client="gradle" version="4.2.0-beta02">
-
-</issues>

serialization/serialization-runtime/api/current.txt

diff --git a/serialization/serialization-runtime/api/current.txt b/serialization/serialization-runtime/api/current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/serialization/serialization-runtime/api/current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

serialization/serialization-runtime/api/public_plus_experimental_current.txt

diff --git a/serialization/serialization-runtime/api/public_plus_experimental_current.txt b/serialization/serialization-runtime/api/public_plus_experimental_current.txt
deleted file mode 100644
index 0ccbfdc..0000000
--- a/serialization/serialization-runtime/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-// Signature format: 4.0
-package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) androidx.serialization.runtime.internal {
-
-  public interface CollectionFactory<C extends java.util.Collection<?>> {
-    method public C create(int);
-  }
-
-  public interface DecoderV1 {
-    method public boolean decodeBool();
-    method public byte[] decodeBytes();
-    method public double decodeDouble();
-    method public <T extends java.lang.Enum<T>> T decodeEnum(androidx.serialization.runtime.internal.EnumSerializerV1<T!>);
-    method public int decodeFixed32();
-    method public long decodeFixed64();
-    method public float decodeFloat();
-    method public int decodeInt32();
-    method public long decodeInt64();
-    method public <T> T decodeMessage(androidx.serialization.runtime.internal.SerializerV1<T!>, T?);
-    method public boolean[] decodeRepeatedBool(boolean[]?);
-    method public <C extends java.util.Collection<java.lang.Boolean>> C decodeRepeatedBool(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public <C extends java.util.Collection<byte[]>> C decodeRepeatedBytes(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public double[] decodeRepeatedDouble(double[]?);
-    method public <C extends java.util.Collection<java.lang.Double>> C decodeRepeatedDouble(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public <T extends java.lang.Enum<T>, C extends java.util.Collection<T>> C decodeRepeatedEnum(androidx.serialization.runtime.internal.EnumSerializerV1<T!>, C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public int[] decodeRepeatedFixed32(int[]?);
-    method public <C extends java.util.Collection<java.lang.Integer>> C decodeRepeatedFixed32(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public long[] decodeRepeatedFixed64(long[]?);
-    method public <C extends java.util.Collection<java.lang.Long>> C decodeRepeatedFixed64(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public float[] decodeRepeatedFloat(float[]?);
-    method public <C extends java.util.Collection<java.lang.Float>> C decodeRepeatedFloat(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public int[] decodeRepeatedInt32(int[]?);
-    method public <C extends java.util.Collection<java.lang.Integer>> C decodeRepeatedInt32(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public long[] decodeRepeatedInt64(long[]?);
-    method public <C extends java.util.Collection<java.lang.Long>> C decodeRepeatedInt64(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public <T, C extends java.util.Collection<T>> C decodeRepeatedMessage(androidx.serialization.runtime.internal.SerializerV1<T!>, C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public int[] decodeRepeatedSInt32(int[]?);
-    method public <C extends java.util.Collection<java.lang.Integer>> C decodeRepeatedSInt32(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public long[] decodeRepeatedSInt64(long[]?);
-    method public <C extends java.util.Collection<java.lang.Long>> C decodeRepeatedSInt64(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public String![] decodeRepeatedString(String![]?);
-    method public <C extends java.util.Collection<java.lang.String>> C decodeRepeatedString(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public int[] decodeRepeatedUInt32(int[]?);
-    method public <C extends java.util.Collection<java.lang.Integer>> C decodeRepeatedUInt32(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public long[] decodeRepeatedUInt64(long[]?);
-    method public <C extends java.util.Collection<java.lang.Long>> C decodeRepeatedUInt64(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public int decodeSInt32();
-    method public long decodeSInt64();
-    method public String decodeString();
-    method public int decodeUInt32();
-    method public long decodeUInt64();
-    method public boolean hasNextField();
-    method public int nextFieldId();
-  }
-
-  public interface EncoderV1 {
-    method public void encodeBool(int, boolean);
-    method public void encodeBytes(int, byte[]?);
-    method public void encodeDouble(int, double);
-    method public <T extends java.lang.Enum<T>> void encodeEnum(int, androidx.serialization.runtime.internal.EnumSerializerV1<T!>, T?);
-    method public void encodeFixed32(int, int);
-    method public void encodeFixed64(int, long);
-    method public void encodeFloat(int, float);
-    method public void encodeInt32(int, int);
-    method public void encodeInt64(int, long);
-    method public <T> void encodeMessage(int, androidx.serialization.runtime.internal.SerializerV1<T!>, T?);
-    method public void encodeRepeatedBool(int, boolean[]?);
-    method public void encodeRepeatedBool(int, Iterable<java.lang.Boolean!>?);
-    method public void encodeRepeatedBytes(int, Iterable<byte[]!>?);
-    method public void encodeRepeatedDouble(int, double[]?);
-    method public void encodeRepeatedDouble(int, Iterable<java.lang.Double!>?);
-    method public <T extends java.lang.Enum<T>> void encodeRepeatedEnum(int, androidx.serialization.runtime.internal.EnumSerializerV1<T!>, Iterable<T!>?);
-    method public void encodeRepeatedFixed32(int, int[]?);
-    method public void encodeRepeatedFixed32(int, Iterable<java.lang.Integer!>?);
-    method public void encodeRepeatedFixed64(int, long[]?);
-    method public void encodeRepeatedFixed64(int, Iterable<java.lang.Long!>?);
-    method public void encodeRepeatedFloat(int, float[]?);
-    method public void encodeRepeatedFloat(int, Iterable<java.lang.Float!>?);
-    method public void encodeRepeatedInt32(int, int[]?);
-    method public void encodeRepeatedInt32(int, Iterable<java.lang.Integer!>?);
-    method public void encodeRepeatedInt64(int, long[]?);
-    method public void encodeRepeatedInt64(int, Iterable<java.lang.Long!>?);
-    method public <T> void encodeRepeatedMessage(int, androidx.serialization.runtime.internal.SerializerV1<T!>, Iterable<T!>?);
-    method public void encodeRepeatedSInt32(int, int[]?);
-    method public void encodeRepeatedSInt32(int, Iterable<java.lang.Integer!>?);
-    method public void encodeRepeatedSInt64(int, long[]?);
-    method public void encodeRepeatedSInt64(int, Iterable<java.lang.Long!>?);
-    method public void encodeRepeatedString(int, String![]?);
-    method public void encodeRepeatedString(int, Iterable<java.lang.String!>?);
-    method public void encodeRepeatedUInt32(int, int[]?);
-    method public void encodeRepeatedUInt32(int, Iterable<java.lang.Integer!>?);
-    method public void encodeRepeatedUInt64(int, long[]?);
-    method public void encodeRepeatedUInt64(int, Iterable<java.lang.Long!>?);
-    method public void encodeSInt32(int, int);
-    method public void encodeSInt64(int, long);
-    method public void encodeString(int, String?);
-    method public void encodeUInt32(int, int);
-    method public void encodeUInt64(int, long);
-  }
-
-  public interface EnumSerializerV1<T extends java.lang.Enum<T>> {
-    method public T decode(int);
-    method public int encode(T);
-  }
-
-  public final class SerializationRuntime {
-    method public static <T> T defaultInstanceOf(androidx.serialization.runtime.internal.SerializerV1<T!>);
-    method public static <T> androidx.serialization.runtime.internal.CollectionFactory<java.util.List<T!>!> getListFactory();
-    method public static <T> androidx.serialization.runtime.internal.CollectionFactory<java.util.Set<T!>!> getSetFactory();
-  }
-
-  public interface SerializerV1<T> {
-    method public T decode(androidx.serialization.runtime.internal.DecoderV1, T?);
-    method public void encode(androidx.serialization.runtime.internal.EncoderV1, T);
-  }
-
-}
-

serialization/serialization-runtime/api/restricted_current.txt

diff --git a/serialization/serialization-runtime/api/restricted_current.txt b/serialization/serialization-runtime/api/restricted_current.txt
deleted file mode 100644
index 0ccbfdc..0000000
--- a/serialization/serialization-runtime/api/restricted_current.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-// Signature format: 4.0
-package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) androidx.serialization.runtime.internal {
-
-  public interface CollectionFactory<C extends java.util.Collection<?>> {
-    method public C create(int);
-  }
-
-  public interface DecoderV1 {
-    method public boolean decodeBool();
-    method public byte[] decodeBytes();
-    method public double decodeDouble();
-    method public <T extends java.lang.Enum<T>> T decodeEnum(androidx.serialization.runtime.internal.EnumSerializerV1<T!>);
-    method public int decodeFixed32();
-    method public long decodeFixed64();
-    method public float decodeFloat();
-    method public int decodeInt32();
-    method public long decodeInt64();
-    method public <T> T decodeMessage(androidx.serialization.runtime.internal.SerializerV1<T!>, T?);
-    method public boolean[] decodeRepeatedBool(boolean[]?);
-    method public <C extends java.util.Collection<java.lang.Boolean>> C decodeRepeatedBool(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public <C extends java.util.Collection<byte[]>> C decodeRepeatedBytes(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public double[] decodeRepeatedDouble(double[]?);
-    method public <C extends java.util.Collection<java.lang.Double>> C decodeRepeatedDouble(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public <T extends java.lang.Enum<T>, C extends java.util.Collection<T>> C decodeRepeatedEnum(androidx.serialization.runtime.internal.EnumSerializerV1<T!>, C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public int[] decodeRepeatedFixed32(int[]?);
-    method public <C extends java.util.Collection<java.lang.Integer>> C decodeRepeatedFixed32(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public long[] decodeRepeatedFixed64(long[]?);
-    method public <C extends java.util.Collection<java.lang.Long>> C decodeRepeatedFixed64(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public float[] decodeRepeatedFloat(float[]?);
-    method public <C extends java.util.Collection<java.lang.Float>> C decodeRepeatedFloat(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public int[] decodeRepeatedInt32(int[]?);
-    method public <C extends java.util.Collection<java.lang.Integer>> C decodeRepeatedInt32(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public long[] decodeRepeatedInt64(long[]?);
-    method public <C extends java.util.Collection<java.lang.Long>> C decodeRepeatedInt64(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public <T, C extends java.util.Collection<T>> C decodeRepeatedMessage(androidx.serialization.runtime.internal.SerializerV1<T!>, C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public int[] decodeRepeatedSInt32(int[]?);
-    method public <C extends java.util.Collection<java.lang.Integer>> C decodeRepeatedSInt32(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public long[] decodeRepeatedSInt64(long[]?);
-    method public <C extends java.util.Collection<java.lang.Long>> C decodeRepeatedSInt64(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public String![] decodeRepeatedString(String![]?);
-    method public <C extends java.util.Collection<java.lang.String>> C decodeRepeatedString(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public int[] decodeRepeatedUInt32(int[]?);
-    method public <C extends java.util.Collection<java.lang.Integer>> C decodeRepeatedUInt32(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public long[] decodeRepeatedUInt64(long[]?);
-    method public <C extends java.util.Collection<java.lang.Long>> C decodeRepeatedUInt64(C?, androidx.serialization.runtime.internal.CollectionFactory<C!>);
-    method public int decodeSInt32();
-    method public long decodeSInt64();
-    method public String decodeString();
-    method public int decodeUInt32();
-    method public long decodeUInt64();
-    method public boolean hasNextField();
-    method public int nextFieldId();
-  }
-
-  public interface EncoderV1 {
-    method public void encodeBool(int, boolean);
-    method public void encodeBytes(int, byte[]?);
-    method public void encodeDouble(int, double);
-    method public <T extends java.lang.Enum<T>> void encodeEnum(int, androidx.serialization.runtime.internal.EnumSerializerV1<T!>, T?);
-    method public void encodeFixed32(int, int);
-    method public void encodeFixed64(int, long);
-    method public void encodeFloat(int, float);
-    method public void encodeInt32(int, int);
-    method public void encodeInt64(int, long);
-    method public <T> void encodeMessage(int, androidx.serialization.runtime.internal.SerializerV1<T!>, T?);
-    method public void encodeRepeatedBool(int, boolean[]?);
-    method public void encodeRepeatedBool(int, Iterable<java.lang.Boolean!>?);
-    method public void encodeRepeatedBytes(int, Iterable<byte[]!>?);
-    method public void encodeRepeatedDouble(int, double[]?);
-    method public void encodeRepeatedDouble(int, Iterable<java.lang.Double!>?);
-    method public <T extends java.lang.Enum<T>> void encodeRepeatedEnum(int, androidx.serialization.runtime.internal.EnumSerializerV1<T!>, Iterable<T!>?);
-    method public void encodeRepeatedFixed32(int, int[]?);
-    method public void encodeRepeatedFixed32(int, Iterable<java.lang.Integer!>?);
-    method public void encodeRepeatedFixed64(int, long[]?);
-    method public void encodeRepeatedFixed64(int, Iterable<java.lang.Long!>?);
-    method public void encodeRepeatedFloat(int, float[]?);
-    method public void encodeRepeatedFloat(int, Iterable<java.lang.Float!>?);
-    method public void encodeRepeatedInt32(int, int[]?);
-    method public void encodeRepeatedInt32(int, Iterable<java.lang.Integer!>?);
-    method public void encodeRepeatedInt64(int, long[]?);
-    method public void encodeRepeatedInt64(int, Iterable<java.lang.Long!>?);
-    method public <T> void encodeRepeatedMessage(int, androidx.serialization.runtime.internal.SerializerV1<T!>, Iterable<T!>?);
-    method public void encodeRepeatedSInt32(int, int[]?);
-    method public void encodeRepeatedSInt32(int, Iterable<java.lang.Integer!>?);
-    method public void encodeRepeatedSInt64(int, long[]?);
-    method public void encodeRepeatedSInt64(int, Iterable<java.lang.Long!>?);
-    method public void encodeRepeatedString(int, String![]?);
-    method public void encodeRepeatedString(int, Iterable<java.lang.String!>?);
-    method public void encodeRepeatedUInt32(int, int[]?);
-    method public void encodeRepeatedUInt32(int, Iterable<java.lang.Integer!>?);
-    method public void encodeRepeatedUInt64(int, long[]?);
-    method public void encodeRepeatedUInt64(int, Iterable<java.lang.Long!>?);
-    method public void encodeSInt32(int, int);
-    method public void encodeSInt64(int, long);
-    method public void encodeString(int, String?);
-    method public void encodeUInt32(int, int);
-    method public void encodeUInt64(int, long);
-  }
-
-  public interface EnumSerializerV1<T extends java.lang.Enum<T>> {
-    method public T decode(int);
-    method public int encode(T);
-  }
-
-  public final class SerializationRuntime {
-    method public static <T> T defaultInstanceOf(androidx.serialization.runtime.internal.SerializerV1<T!>);
-    method public static <T> androidx.serialization.runtime.internal.CollectionFactory<java.util.List<T!>!> getListFactory();
-    method public static <T> androidx.serialization.runtime.internal.CollectionFactory<java.util.Set<T!>!> getSetFactory();
-  }
-
-  public interface SerializerV1<T> {
-    method public T decode(androidx.serialization.runtime.internal.DecoderV1, T?);
-    method public void encode(androidx.serialization.runtime.internal.EncoderV1, T);
-  }
-
-}
-

serialization/serialization-runtime/build.gradle

diff --git a/serialization/serialization-runtime/build.gradle b/serialization/serialization-runtime/build.gradle
deleted file mode 100644
index c9267ff..0000000
--- a/serialization/serialization-runtime/build.gradle
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import androidx.build.LibraryGroups
-import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-
-import static androidx.build.dependencies.DependenciesKt.*
-
-plugins {
-    id("AndroidXPlugin")
-    id("java-library")
-}
-
-targetCompatibility = JavaVersion.VERSION_1_7
-sourceCompatibility = JavaVersion.VERSION_1_7
-
-dependencies {
-    api("androidx.annotation:annotation:1.1.0")
-
-    testImplementation(JUNIT)
-    testImplementation(TRUTH)
-}
-
-androidx {
-    name = "AndroidX Serialization - Runtime"
-    mavenVersion = LibraryVersions.SERIALIZATION
-    type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.SERIALIZATION
-    inceptionYear = "2020"
-    description = "Core runtime for AndroidX Serialization"
-}

serialization/serialization-runtime/lint-baseline.xml

diff --git a/serialization/serialization-runtime/lint-baseline.xml b/serialization/serialization-runtime/lint-baseline.xml
deleted file mode 100644
index 297ae16..0000000
--- a/serialization/serialization-runtime/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta02" client="gradle" version="4.2.0-beta02">
-
-</issues>

serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/CollectionFactory.java

diff --git a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/CollectionFactory.java b/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/CollectionFactory.java
deleted file mode 100644
index 12219c3..0000000
--- a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/CollectionFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.runtime.internal;
-
-import androidx.annotation.NonNull;
-
-import java.util.Collection;
-
-/**
- * A factory that creates pre-sized collections.
- * <p>
- * This functional interface wraps a collection constructor, such as
- * {@link java.util.ArrayList#ArrayList(int)}, for Java 7 targets. In Java 8 and later, this will
- * likely be implemented using a method reference to the collection's constructor.
- * <p>
- * Collection decoding methods in {@link DecoderV1} accept this interface. This enables the
- * decoder to pre-size collections when possible, to avoid additional allocations as the
- * collection is being populated.
- *
- * @param <C> The type of collection created by this factory.
- */
-public interface CollectionFactory<C extends Collection<?>> {
-    /**
-     * Create a new collection with the specified capacity if applicable.
-     *
-     * @param capacity The initial capacity of the new collection.
-     * @return A new collection.
-     */
-    @NonNull
-    C create(int capacity);
-}

serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/DecoderV1.java

diff --git a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/DecoderV1.java b/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/DecoderV1.java
deleted file mode 100644
index 7cda3dc..0000000
--- a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/DecoderV1.java
+++ /dev/null
@@ -1,676 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.runtime.internal;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.Collection;
-
-/**
- * A decoder provides the fields of an encoded message to a serializer.
- * <p>
- * Decoders provide access to the fields of an encoded message in the order in which they were
- * encoded. As the wire format is not self-describing, decoding a field requires a serializer to
- * know what type to decode the field into. A serializer is expected to iterate through field IDs
- * using {@link #nextFieldId()} and {@link #nextFieldId()}. The serializer looks up the field,
- * such as with a switch statement, and calls the appropriate decode method for the fields type
- * to obtain the value. Calling decode methods at other times may result in an
- * {@link IllegalStateException}.
- * <p>
- * While Serialization does not split embedded messages or distribute repeated field entries
- * throughout an encoded message, serializers and decoders must be prepared to decode messages
- * encoded by other encoders. To reduce the burden on generated code, all array and collection
- * decoding methods accept a nullable {@code mergeFrom} parameter. The decoder is responsible for
- * appropriately concatenating arrays or appending to existing collections. Similarly, the
- * {@link #decodeMessage(SerializerV1, Object)} method accepts a nullable message to merge into
- * the decoded message for non-repeated embedded message fields.
- * <p>
- * Collection decoding methods accept a {@link CollectionFactory} lambda. When possible, decoder
- * implementations pre-compute the number of items in a collection, and supply it to the factory
- * to be used as the initial capacity of the collection. This enables the decoder to decode
- * fields of any collection type, while avoiding intermediary allocations.
- * <p>
- * Decoders include distinct methods for all Protocol Buffers integer types. This makes for
- * clearer serializer code and enables code shrinking tools such as R8 to more effectively remove
- * unused integer encodings.
- */
-public interface DecoderV1 {
-    /**
-     * Determine if this decoder has a next field available.
-     *
-     * @return True if another field is available to decode.
-     */
-    boolean hasNextField();
-
-    /**
-     * Get the next field ID in this decoder's current message, skipping the current field.
-     *
-     * @throws java.util.NoSuchElementException If no more fields are available.
-     * @return Next available field ID.
-     */
-    int nextFieldId();
-
-    /**
-     * Decode an embedded message field.
-     *
-     * @param serializer the serializer for the message class.
-     * @param mergeFrom  an optional message to merge fields.
-     * @param <T>        the message class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value as a new instance of the message class.
-     */
-    @NonNull
-    <T> T decodeMessage(
-            @NonNull SerializerV1<T> serializer,
-            @Nullable T mergeFrom
-    );
-
-    /**
-     * Decode a repeated embedded message field.
-     *
-     * @param serializer the serializer for the message class.
-     * @param mergeFrom  an optional collection to concatenate.
-     * @param factory    a factory for instantiating the collection.
-     * @param <T>        the message class.
-     * @param <C>        the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of new instances of the message class.
-     */
-    @NonNull
-    <T, C extends Collection<T>> C decodeRepeatedMessage(
-            @NonNull SerializerV1<T> serializer,
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode an enum field.
-     *
-     * @param serializer the serializer for the enum class.
-     * @param <T>        the enum class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value as an enum value.
-     */
-    @NonNull
-    <T extends Enum<T>> T decodeEnum(@NonNull EnumSerializerV1<T> serializer);
-
-    /**
-     * Decode a repeated enum field.
-     *
-     * @param serializer the enum serializer.
-     * @param mergeFrom  an optional collection to concatenate.
-     * @param factory    a factory for instantiating the collection.
-     * @param <T>        the enum class.
-     * @param <C>        the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of enum value.
-     */
-    @NonNull <T extends Enum<T>, C extends Collection<T>> C decodeRepeatedEnum(
-            @NonNull EnumSerializerV1<T> serializer,
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a bool scalar field.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    boolean decodeBool();
-
-    /**
-     * Decode a repeated bool scalar field.
-     *
-     * @param mergeFrom an optional array to concatenate.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as an boolean array.
-     */
-    @NonNull
-    boolean[] decodeRepeatedBool(@Nullable boolean[] mergeFrom);
-
-    /**
-     * Decode a repeated bool scalar field.
-     *
-     * @param mergeFrom an optional collection to concatenate.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed booleans.
-     */
-    @NonNull
-    <C extends Collection<Boolean>> C decodeRepeatedBool(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a bytes scalar field.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value as a byte array.
-     */
-    @NonNull
-    byte[] decodeBytes();
-
-    /**
-     * Decode a repeated bytes scalar field.
-     *
-     * @param mergeFrom an optional collection to concatenate.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of byte arrays.
-     */
-    @NonNull
-    <C extends Collection<byte[]>> C decodeRepeatedBytes(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a double scalar field.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    double decodeDouble();
-
-    /**
-     * Decode a repeated double scalar field.
-     *
-     * @param mergeFrom an optional array to concatenate.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a double array.
-     */
-    @NonNull
-    double[] decodeRepeatedDouble(@Nullable double[] mergeFrom);
-
-    /**
-     * Decode a repeated double scalar field.
-     *
-     * @param mergeFrom an optional collection to concatenate.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       The collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed doubles.
-     */
-    @NonNull
-    <C extends Collection<Double>> C decodeRepeatedDouble(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a float scalar field.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    float decodeFloat();
-
-    /**
-     * Decode a repeated float scalar field.
-     *
-     * @param mergeFrom an optional array to concatenate or null.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a float array.
-     */
-    @NonNull
-    float[] decodeRepeatedFloat(@Nullable float[] mergeFrom);
-
-    /**
-     * Decode a repeated float scalar field.
-     *
-     * @param mergeFrom an optional collection to concatenate or null.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed floats.
-     */
-    @NonNull
-    <C extends Collection<Float>> C decodeRepeatedFloat(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode an int32 scalar field.
-     * <p>
-     * With proto-based backends, int32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    int decodeInt32();
-
-    /**
-     * Decode a repeated int32 scalar field.
-     * <p>
-     * With proto-based backends, int32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @param mergeFrom an optional array to concatenate or null.
-     * @return the field values as an int array.
-     */
-    @NonNull
-    int[] decodeRepeatedInt32(@Nullable int[] mergeFrom);
-
-    /**
-     * Decode a repeated int32 scalar field.
-     * <p>
-     * With proto-based backends, int32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @param mergeFrom an optional collection to concatenate or null.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed integers.
-     */
-    @NonNull
-    <C extends Collection<Integer>> C decodeRepeatedInt32(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a sint32 scalar field.
-     * <p>
-     * With proto-based backends, sint32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    int decodeSInt32();
-
-    /**
-     * Decode a repeated sint32 scalar field.
-     * <p>
-     * With proto-based backends, sint32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @param mergeFrom an optional array to concatenate or null.
-     * @return the field values as an int array.
-     */
-    @NonNull
-    int[] decodeRepeatedSInt32(@Nullable int[] mergeFrom);
-
-    /**
-     * Decode a repeated sint32 scalar field.
-     * <p>
-     * With proto-based backends, sint32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @param mergeFrom an optional collection to concatenate or null.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed integers.
-     */
-    @NonNull
-    <C extends Collection<Integer>> C decodeRepeatedSInt32(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a uint32 scalar field.
-     * <p>
-     * With proto-based backends, uint32 fields store 32-bit unsigned integers using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned
-     * values greater than 2<sup>31</sup> are represented as negative signed values with the same
-     * binary representation as the unsigned values.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    int decodeUInt32();
-
-    /**
-     * Decode a repeated uint32 scalar field.
-     * <p>
-     * With proto-based backends, uint32 fields store 32-bit unsigned integers using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned
-     * values greater than 2<sup>31</sup> are represented as negative signed values with the same
-     * binary representation as the unsigned values.
-     *
-     * @param mergeFrom an optional array to concatenate or null.
-     * @return the field values as an int array.
-     */
-    @NonNull
-    int[] decodeRepeatedUInt32(@Nullable int[] mergeFrom);
-
-    /**
-     * Decode a repeated uint32 scalar field.
-     * <p>
-     * With proto-based backends, uint32 fields store 32-bit unsigned integers using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned
-     * values greater than 2<sup>31</sup> are represented as negative signed values with the same
-     * binary representation as the unsigned values.
-     *
-     * @param mergeFrom an optional collection to concatenate or null.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed integers.
-     */
-    @NonNull
-    <C extends Collection<Integer>> C decodeRepeatedUInt32(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a fixed32 or sfixed32 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed32 and the signed sfixed32 store 32-bit
-     * integers as 4 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>31</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed32 and the unsigned fixed32.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    int decodeFixed32();
-
-    /**
-     * Decode a repeated fixed32 or sfixed32 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed32 and the signed sfixed32 store 32-bit
-     * integers as 4 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>31</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed32 and the unsigned fixed32.
-     *
-     * @param mergeFrom an optional array to concatenate or null.
-     * @return the field values as an int array.
-     */
-    @NonNull
-    int[] decodeRepeatedFixed32(@Nullable int[] mergeFrom);
-
-    /**
-     * Decode a repeated fixed32 or sfixed32 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed32 and the signed sfixed32 store 32-bit
-     * integers as 4 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>31</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed32 and the unsigned fixed32.
-     *
-     * @param mergeFrom an optional collection to concatenate or null.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed integers.
-     */
-    @NonNull
-    <C extends Collection<Integer>> C decodeRepeatedFixed32(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode an int64 scalar field.
-     * <p>
-     * With proto-based backends, int64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    long decodeInt64();
-
-    /**
-     * Decode a repeated int64 scalar field.
-     * <p>
-     * With proto-based backends, int64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @param mergeFrom an optional array to concatenate or null.
-     * @return the field values as a long array.
-     */
-    @NonNull
-    long[] decodeRepeatedInt64(@Nullable long[] mergeFrom);
-
-    /**
-     * Decode a repeated int64 scalar field.
-     * <p>
-     * With proto-based backends, int64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @param mergeFrom an optional collection to concatenate or null.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed longs.
-     */
-    @NonNull
-    <C extends Collection<Long>> C decodeRepeatedInt64(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a sint64 scalar field.
-     * <p>
-     * With proto-based backends, sint64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    long decodeSInt64();
-
-    /**
-     * Decode a repeated sint64 scalar field.
-     * <p>
-     * With proto-based backends, sint64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @param mergeFrom an optional array to concatenate or null.
-     * @return the field values as a long array.
-     */
-    @NonNull
-    long[] decodeRepeatedSInt64(@Nullable long[] mergeFrom);
-
-    /**
-     * Decode a repeated sint64 scalar field.
-     * <p>
-     * With proto-based backends, sint64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @param mergeFrom an optional collection to concatenate or null.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed longs.
-     */
-    @NonNull
-    <C extends Collection<Long>> C decodeRepeatedSInt64(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a uint64 scalar field.
-     * <p>
-     * With proto-based backends, uint64 fields store 64-bit unsigned longs using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java longs with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    long decodeUInt64();
-
-    /**
-     * Decode a repeated uint64 scalar field.
-     * <p>
-     * With proto-based backends, sint64 fields store 64-bit unsigned longs using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java longs with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values.
-     *
-     * @param mergeFrom an optional array to concatenate or null.
-     * @return the field values as an long array.
-     */
-    @NonNull
-    long[] decodeRepeatedUInt64(@Nullable long[] mergeFrom);
-
-    /**
-     * Decode a repeated uint64 scalar field.
-     * <p>
-     * With proto-based backends, uint64 fields store 64-bit unsigned longs using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java longs with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values.
-     *
-     * @param mergeFrom an optional collection to concatenate or null.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed integers.
-     */
-    @NonNull
-    <C extends Collection<Long>> C decodeRepeatedUInt64(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a fixed64 or sfixed64 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed64 and the signed sfixed64 store 64-bit
-     * integers as 8 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed64 and the unsigned fixed64.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    long decodeFixed64();
-
-    /**
-     * Decode a repeated fixed64 or sfixed64 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed64 and the signed sfixed64 store 64-bit
-     * integers as 8 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed64 and the unsigned fixed64.
-     *
-     * @param mergeFrom an optional array to concatenate or null.
-     * @return the field values as an int array.
-     */
-    @NonNull
-    long[] decodeRepeatedFixed64(@Nullable long[] mergeFrom);
-
-    /**
-     * Decode a repeated fixed64 or sfixed64 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed64 and the signed sfixed64 store 64-bit
-     * integers as 8 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed64 and the unsigned fixed64.
-     *
-     * @param mergeFrom an optional collection to concatenate or null.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of boxed integers.
-     */
-    @NonNull
-    <C extends Collection<Long>> C decodeRepeatedFixed64(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-
-    /**
-     * Decode a string scalar field.
-     *
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field value.
-     */
-    @NonNull
-    String decodeString();
-
-    /**
-     * Decode a repeated string scalar field.
-     *
-     * @param mergeFrom an optional array to concatenate.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a string array.
-     */
-    @NonNull
-    String[] decodeRepeatedString(@Nullable String[] mergeFrom);
-
-    /**
-     * Decode a repeated string scalar field.
-     *
-     * @param mergeFrom an optional collection to concatenate.
-     * @param factory   a factory for instantiating the collection.
-     * @param <C>       the collection class.
-     * @throws IllegalStateException if this decoder is not currently positioned on a field.
-     * @return the field values as a collection of strings.
-     */
-    @NonNull
-    <C extends Collection<String>> C decodeRepeatedString(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    );
-}

serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EmptyDecoder.java

diff --git a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EmptyDecoder.java b/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EmptyDecoder.java
deleted file mode 100644
index 1831de6..0000000
--- a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EmptyDecoder.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.runtime.internal;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.Collection;
-import java.util.NoSuchElementException;
-
-/**
- * This decoder mimics an empty buffer for constructing default instances of message classes.
- * <p>
- * As it has no internal buffer, it is also stateless. A static instance is available as
- * {@link #INSTANCE}.
- */
-final class EmptyDecoder implements DecoderV1 {
-    @NonNull
-    public static final EmptyDecoder INSTANCE = new EmptyDecoder();
-
-    @NonNull
-    private static final String DECODE_FIELD_EXCEPTION_MESSAGE = "Decoder is empty";
-
-    private EmptyDecoder() {
-    }
-
-    @Override
-    public boolean hasNextField() {
-        return false;
-    }
-
-    @Override
-    public int nextFieldId() {
-        throw new NoSuchElementException();
-    }
-
-    @NonNull
-    @Override
-    public <T> T decodeMessage(@NonNull SerializerV1<T> serializer, @Nullable T mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <T, C extends Collection<T>> C decodeRepeatedMessage(
-            @NonNull SerializerV1<T> serializer,
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <T extends Enum<T>> T decodeEnum(@NonNull EnumSerializerV1<T> serializer) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <T extends Enum<T>, C extends Collection<T>> C decodeRepeatedEnum(
-            @NonNull EnumSerializerV1<T> serializer,
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public boolean decodeBool() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public boolean[] decodeRepeatedBool(@Nullable boolean[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Boolean>> C decodeRepeatedBool(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public byte[] decodeBytes() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<byte[]>> C decodeRepeatedBytes(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public double decodeDouble() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public double[] decodeRepeatedDouble(@Nullable double[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Double>> C decodeRepeatedDouble(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public float decodeFloat() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public float[] decodeRepeatedFloat(@Nullable float[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Float>> C decodeRepeatedFloat(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public int decodeInt32() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public int[] decodeRepeatedInt32(@Nullable int[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Integer>> C decodeRepeatedInt32(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public int decodeSInt32() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public int[] decodeRepeatedSInt32(@Nullable int[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Integer>> C decodeRepeatedSInt32(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public int decodeUInt32() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public int[] decodeRepeatedUInt32(@Nullable int[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Integer>> C decodeRepeatedUInt32(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public int decodeFixed32() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public int[] decodeRepeatedFixed32(@Nullable int[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Integer>> C decodeRepeatedFixed32(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public long decodeInt64() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public long[] decodeRepeatedInt64(@Nullable long[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Long>> C decodeRepeatedInt64(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public long decodeSInt64() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public long[] decodeRepeatedSInt64(@Nullable long[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Long>> C decodeRepeatedSInt64(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public long decodeUInt64() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public long[] decodeRepeatedUInt64(@Nullable long[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Long>> C decodeRepeatedUInt64(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @Override
-    public long decodeFixed64() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public long[] decodeRepeatedFixed64(@Nullable long[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<Long>> C decodeRepeatedFixed64(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public String decodeString() {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public String[] decodeRepeatedString(@Nullable String[] mergeFrom) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-
-    @NonNull
-    @Override
-    public <C extends Collection<String>> C decodeRepeatedString(
-            @Nullable C mergeFrom,
-            @NonNull CollectionFactory<C> factory
-    ) {
-        throw new IllegalStateException(DECODE_FIELD_EXCEPTION_MESSAGE);
-    }
-}

serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EncoderV1.java

diff --git a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EncoderV1.java b/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EncoderV1.java
deleted file mode 100644
index e212b3a..0000000
--- a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EncoderV1.java
+++ /dev/null
@@ -1,544 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.runtime.internal;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * An encoder receives field structure and values from a serializer.
- * <p>
- * Serializers provide the encoder with message data in units of whole fields. Each encode method
- * provides the backend with the field value, field ID, and information about the type of the
- * field, including a serializer for embedded messages. Units of whole fields makes encoders
- * agnostic of the order they receive fields in. This enables the encoder to intelligently omit
- * empty fields in their entirety and to define its own encoding direction. For example, the
- * proto encoder works from the end of its buffer towards the beginning.
- * <p>
- * While it is possible to encode fields with repeated values by repeatedly calling the encode
- * method for a single value of that type, this may result in an incorrect ordering in the
- * encoded message. Collections and scalar arrays should be encoded using the appropriate encode
- * method for the field type, such as
- * {@link #encodeRepeatedMessage(int, SerializerV1, Iterable)} for embedded messages.
- * <p>
- * Encoding for embedded messages, such as {@link #encodeMessage(int, SerializerV1, Object)}, is
- * likewise implemented in a unit of a whole field. This gives implementations flexibility in how
- * they invoke the serializer. The API is designed such that an implementation may store some
- * state on the stack and pass itself to the serializer, or at the implementor's discretion, it
- * could instantiate and pass a new encoder to the serializer.
- * <p>
- * Encoders include distinct methods for all Protocol Buffers integer types. This makes for
- * clearer serializer code and enables code shrinking tools such as R8 to more effectively remove
- * unused integer encodings. The int32 and int64 encodings are the default and the most common
- * integer types, and backends without multiple integer representations, such as the Parcel
- * backend may wish to implement {@link #encodeInt32(int, int)} and
- * {@link #encodeInt64(int, long)} and delegate the other int and long encoding methods to those
- * implementations.
- */
-public interface EncoderV1 {
-    /**
-     * Encode an embedded message field.
-     *
-     * @param fieldId    the ID of the field.
-     * @param serializer the serializer for the message class.
-     * @param message    a message or null to omit the field.
-     * @param <T>        the message class.
-     */
-    <T> void encodeMessage(
-            int fieldId,
-            @NonNull SerializerV1<T> serializer,
-            @Nullable T message
-    );
-
-    /**
-     * Encode a repeated embedded message field.
-     *
-     * @param fieldId    the ID of the field.
-     * @param serializer the serializer for the message class.
-     * @param messages   messages or null to omit the field.
-     * @param <T>        the message class.
-     */
-    <T> void encodeRepeatedMessage(
-            int fieldId,
-            @NonNull SerializerV1<T> serializer,
-            @Nullable Iterable<T> messages
-    );
-
-    /**
-     * Encode an enum field.
-     *
-     * @param fieldId    the ID of the field.
-     * @param serializer the serializer for the enum class.
-     * @param value      an enum value or null to omit the field.
-     * @param <T>        the enum class.
-     */
-    <T extends Enum<T>> void encodeEnum(
-            int fieldId,
-            @NonNull EnumSerializerV1<T> serializer,
-            @Nullable T value
-    );
-
-    /**
-     * Encode a repeated enum field.
-     *
-     * @param fieldId    the ID of the field.
-     * @param serializer the serializer for the enum class.
-     * @param values     enum values or null to omit the field.
-     * @param <T>        the enum class.
-     */
-    <T extends Enum<T>> void encodeRepeatedEnum(
-            int fieldId,
-            @NonNull EnumSerializerV1<T> serializer,
-            @Nullable Iterable<T> values
-    );
-
-    /**
-     * Encode a bool scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeBool(int fieldId, boolean value);
-
-    /**
-     * Encode a repeated bool scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedBool(int fieldId, @Nullable boolean[] values);
-
-    /**
-     * Encode a repeated bool scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedBool(int fieldId, @Nullable Iterable<Boolean> values);
-
-    /**
-     * Encode a bytes scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value or null to omit the field.
-     */
-    void encodeBytes(int fieldId, @Nullable byte[] value);
-
-    /**
-     * Encode a repeated bytes scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedBytes(int fieldId, @Nullable Iterable<byte[]> values);
-
-    /**
-     * Encode a double scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeDouble(int fieldId, double value);
-
-    /**
-     * Encode a repeated double scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedDouble(int fieldId, @Nullable double[] values);
-
-    /**
-     * Encode a repeated double scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedDouble(int fieldId, @Nullable Iterable<Double> values);
-
-    /**
-     * Encode a float scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeFloat(int fieldId, float value);
-
-    /**
-     * Encode a repeated float scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedFloat(int fieldId, @Nullable float[] values);
-
-    /**
-     * Encode a repeated float scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedFloat(int fieldId, @Nullable Iterable<Float> values);
-
-    /**
-     * Encode an int32 scalar field.
-     * <p>
-     * With proto-based backends, int32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeInt32(int fieldId, int value);
-
-    /**
-     * Encode a repeated int32 scalar field.
-     * <p>
-     * With proto-based backends, int32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedInt32(int fieldId, @Nullable int[] values);
-
-    /**
-     * Encode a repeated int32 scalar field.
-     * <p>
-     * With proto-based backends, int32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedInt32(int fieldId, @Nullable Iterable<Integer> values);
-
-    /**
-     * Encode a sint32 scalar field.
-     * <p>
-     * With proto-based backends, sint32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeSInt32(int fieldId, int value);
-
-    /**
-     * Encode a repeated sint32 scalar field.
-     * <p>
-     * With proto-based backends, sint32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedSInt32(int fieldId, @Nullable int[] values);
-
-    /**
-     * Encode a repeated sint32 scalar field.
-     * <p>
-     * With proto-based backends, sint32 fields store 32-bit signed integers using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedSInt32(int fieldId, @Nullable Iterable<Integer> values);
-
-    /**
-     * Encode a uint32 scalar field.
-     * <p>
-     * With proto-based backends, uint32 fields store 32-bit unsigned integers using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java ints with MSB in the sign bit. This means unsigned
-     * values greater than 2<sup>31</sup> are represented as negative signed values with the same
-     * binary representation as the unsigned values.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeUInt32(int fieldId, int value);
-
-    /**
-     * Encode a repeated uint32 scalar field.
-     * <p>
-     * With proto-based backends, uint32 fields store 32-bit unsigned integers using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java ints with MSB in the sign bit. This means unsigned
-     * values greater than 2<sup>31</sup> are represented as negative signed values with the same
-     * binary representation as the unsigned values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedUInt32(int fieldId, @Nullable int[] values);
-
-    /**
-     * Encode a repeated uint32 scalar field.
-     * <p>
-     * With proto-based backends, uint32 fields store 32-bit unsigned integers using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java ints with MSB in the sign bit. This means unsigned
-     * values greater than 2<sup>31</sup> are represented as negative signed values with the same
-     * binary representation as the unsigned values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedUInt32(int fieldId, @Nullable Iterable<Integer> values);
-
-    /**
-     * Encode a fixed32 or sfixed32 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed32 and the signed sfixed32 store 32-bit
-     * integers as 4 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java ints with MSB in the sign bit. This means unsigned
-     * values greater than 2<sup>31</sup> are represented as negative signed values with the same
-     * binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed32 and the unsigned fixed32.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeFixed32(int fieldId, int value);
-
-    /**
-     * Encode a repeated fixed32 or sfixed32 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed32 and the signed sfixed32 store 32-bit
-     * integers as 4 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java ints with MSB in the sign bit. This means unsigned
-     * values greater than 2<sup>31</sup> are represented as negative signed values with the same
-     * binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed32 and the unsigned fixed32.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedFixed32(int fieldId, @Nullable int[] values);
-
-    /**
-     * Encode a repeated fixed32 or sfixed32 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed32 and the signed sfixed32 store 32-bit
-     * integers as 4 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java ints with MSB in the sign bit. This means unsigned
-     * values greater than 2<sup>31</sup> are represented as negative signed values with the same
-     * binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed32 and the unsigned fixed32.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedFixed32(int fieldId, @Nullable Iterable<Integer> values);
-
-    /**
-     * Encode an int64 scalar field.
-     * <p>
-     * With proto-based backends, int64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeInt64(int fieldId, long value);
-
-    /**
-     * Encode a repeated int64 scalar field.
-     * <p>
-     * With proto-based backends, int64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedInt64(int fieldId, @Nullable long[] values);
-
-    /**
-     * Encode a repeated int64 scalar field.
-     * <p>
-     * With proto-based backends, int64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of small positive values, but always uses 10
-     * bytes for negative values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedInt64(int fieldId, @Nullable Iterable<Long> values);
-
-    /**
-     * Encode a sint64 scalar field.
-     * <p>
-     * With proto-based backends, sint64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeSInt64(int fieldId, long value);
-
-    /**
-     * Encode a repeated sint64 scalar field.
-     * <p>
-     * With proto-based backends, sint64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedSInt64(int fieldId, @Nullable long[] values);
-
-    /**
-     * Encode a repeated sint64 scalar field.
-     * <p>
-     * With proto-based backends, sint64 fields store 64-bit signed longs using a variable
-     * length encoding with a compact representation of values with small absolute values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedSInt64(int fieldId, @Nullable Iterable<Long> values);
-
-    /**
-     * Encode a uint64 scalar field.
-     * <p>
-     * With proto-based backends, uint64 fields store 64-bit unsigned longs using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java longs with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeUInt64(int fieldId, long value);
-
-    /**
-     * Encode a repeated uint64 scalar field.
-     * <p>
-     * With proto-based backends, uint64 fields store 64-bit unsigned longs using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java longs with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedUInt64(int fieldId, @Nullable long[] values);
-
-    /**
-     * Encode a repeated uint64 scalar field.
-     * <p>
-     * With proto-based backends, uint64 fields store 64-bit unsigned longs using a variable
-     * length encoding with a compact representation of small values.
-     * <p>
-     * Unsigned integers are represented as Java longs with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedUInt64(int fieldId, @Nullable Iterable<Long> values);
-
-    /**
-     * Encode a fixed64 or sfixed64 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed64 and the signed sfixed64 store 64-bit
-     * integers as 8 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed64 and the unsigned fixed64.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value.
-     */
-    void encodeFixed64(int fieldId, long value);
-
-    /**
-     * Encode a repeated fixed64 or sfixed64 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed64 and the signed sfixed64 store 64-bit
-     * integers as 8 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed64 and the unsigned fixed64.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedFixed64(int fieldId, @Nullable long[] values);
-
-    /**
-     * Encode a repeated fixed64 or sfixed64 scalar field.
-     * <p>
-     * With proto-based backends, the unsigned fixed64 and the signed sfixed64 store 64-bit
-     * integers as 8 little-endian bytes.
-     * <p>
-     * Unsigned integers are represented as Java integers with MSB in the sign bit. This means
-     * unsigned values greater than 2<sup>63</sup> are represented as negative signed values with
-     * the same binary representation as the unsigned values. This allows this method to be used
-     * interchangeably for the signed sfixed64 and the unsigned fixed64.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedFixed64(int fieldId, @Nullable Iterable<Long> values);
-
-    /**
-     * Encode a string scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param value   a field value or null to omit the field.
-     */
-    void encodeString(int fieldId, @Nullable String value);
-
-    /**
-     * Encode a repeated string field.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedString(int fieldId, @Nullable String[] values);
-
-    /**
-     * Encode a repeated string scalar field.
-     *
-     * @param fieldId the ID of the field.
-     * @param values  field values or null to omit the field.
-     */
-    void encodeRepeatedString(int fieldId, @Nullable Iterable<String> values);
-}

serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EnumSerializerV1.java

diff --git a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EnumSerializerV1.java b/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EnumSerializerV1.java
deleted file mode 100644
index a60d757..0000000
--- a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/EnumSerializerV1.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.runtime.internal;
-
-import androidx.annotation.NonNull;
-
-/**
- * Serializes an enum class to integer IDs.
- * <p>
- * Enum serializers are expected to be stateless singletons. The annotation processor generates
- * serializers in the same package as the enum class with a name derived by replacing the
- * {@code .} of nested classes with {@code _} and adding a {@code Serializer} suffix. In Java,
- * enum serializers are final classes which expose a singleton instance on a static final
- * {@code INSTANCE} field. In Kotlin, they are implemented as an object declaration.
- *
- * @param <T> The enum class this serializer serializes.
- */
-public interface EnumSerializerV1<T extends Enum<T>> {
-    /**
-     * Encode an enum value to an integer.
-     *
-     * @param value An enum value or null for the default ID.
-     * @return The integer ID of the enum value.
-     */
-    int encode(@NonNull T value);
-
-    /**
-     * Decode an enum value from an integer.
-     *
-     * @param valueId An enum value ID.
-     * @return The enum value with the supplied ID or the default enum value.
-     */
-    @NonNull
-    T decode(int valueId);
-}

serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/SerializationRuntime.java

diff --git a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/SerializationRuntime.java b/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/SerializationRuntime.java
deleted file mode 100644
index d0498ce..0000000
--- a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/SerializationRuntime.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.runtime.internal;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Collection factories for lists and sets.
- * <p>
- * This utility class provides type-safe methods for obtaining collection factories for lists and
- * sets. {@link List} and {@link Set} are the most common subinterfaces of
- * {@link java.util.Collection}, these factories reduce the volume of lambdas that need to be
- * created in generated code.
- */
-public final class SerializationRuntime {
-    private static final CollectionFactory<? extends List<?>> LIST_FACTORY =
-            new CollectionFactory<List<?>>() {
-                @NonNull
-                @Override
-                @SuppressWarnings("MixedMutabilityReturnType")
-                public List<?> create(int capacity) {
-                    if (capacity == 0) {
-                        return Collections.emptyList();
-                    } else {
-                        return new ArrayList<>(capacity);
-                    }
-                }
-            };
-
-    private static final CollectionFactory<? extends Set<?>> SET_FACTORY =
-            new CollectionFactory<Set<?>>() {
-                @NonNull
-                @Override
-                @SuppressWarnings("MixedMutabilityReturnType")
-                public Set<?> create(int capacity) {
-                    if (capacity == 0) {
-                        return Collections.emptySet();
-                    } else {
-                        return new LinkedHashSet<>(capacity);
-                    }
-                }
-            };
-
-    private SerializationRuntime() {
-    }
-
-    /**
-     * Obtain a default instance of a message class from its serializer.
-     *
-     * @param serializer the serializer for the message class.
-     * @param <T>        a message class.
-     * @return a new message with all fields set to default values.
-     */
-    @NonNull
-    public static <T> T defaultInstanceOf(@NonNull SerializerV1<T> serializer) {
-        return serializer.decode(EmptyDecoder.INSTANCE, null);
-    }
-
-    /**
-     * A collection factory that creates lists.
-     *
-     * @param <T> element type of the factory.
-     * @return a list factory.
-     */
-    @NonNull
-    @SuppressWarnings("unchecked")
-    public static <T> CollectionFactory<List<T>> getListFactory() {
-        return (CollectionFactory<List<T>>) LIST_FACTORY;
-    }
-
-    /**
-     * A collection factory that creates sets.
-     *
-     * @param <T> element type of the factory.
-     * @return a set factory.
-     */
-    @NonNull
-    @SuppressWarnings("unchecked")
-    public static <T> CollectionFactory<Set<T>> getSetFactory() {
-        return (CollectionFactory<Set<T>>) SET_FACTORY;
-    }
-}

serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/SerializerV1.java

diff --git a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/SerializerV1.java b/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/SerializerV1.java
deleted file mode 100644
index 24e49872..0000000
--- a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/SerializerV1.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.runtime.internal;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * Serializes a message class.
- * <p>
- * Serializers are expected to be stateless singletons. The annotation processor generates
- * serializers in the same package as the message class or union annotation with a name derived by
- * replacing the {@code .} of nested classes with {@code _} and adding a {@code Serializer}
- * suffix. In Java, serializers are final classes which expose a singleton instance on a static
- * final {@code INSTANCE} field. In Kotlin, they are implemented as an object declaration.
- * <p>
- * The annotation processor may add static convenience methods to a serializer implementation
- * that obtain an encoder or decoder from a backend and use the singleton instance to encode or
- * decode messages.
- *
- * @param <T> The message class this serializer serializes.
- */
-public interface SerializerV1<T> {
-    /**
-     * Encodes the fields of a message instance to an encoder.
-     *
-     * @param encoder An encoder which receives the fields of the message.
-     * @param message The message to encode.
-     */
-    void encode(@NonNull EncoderV1 encoder, @NonNull T message);
-
-    /**
-     * Decodes an instantiates a new message instance from a decoder.
-     * <p>
-     * To merge an encoded message with an existing decoded message, supply the instance of the
-     * message to the mergeFrom parameter. The new message's fields will default to the values of
-     * the existing message's fields. Singular fields will be replaced with any values present in
-     * the encoded message, and collection or array fields will be concatenated with encoded
-     * values. This functionality is required for inter-operation with other encoders which may
-     * split embedded messages into multiple chunks or distribute repeated field entries
-     * throughout the body of an encoded message.
-     *
-     * @param decoder A decoder to read from.
-     * @param mergeFrom An optional message instance to merge with the encoded message.
-     * @return A new instance of the message class.
-     */
-    @NonNull
-    T decode(@NonNull DecoderV1 decoder, @Nullable T mergeFrom);
-}

serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/package-info.java

diff --git a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/package-info.java b/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/package-info.java
deleted file mode 100644
index a9ab5f92..0000000
--- a/serialization/serialization-runtime/src/main/java/androidx/serialization/runtime/internal/package-info.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Internal API for generated serialization code.
- * <p>
- * The Serialization annotation processor generates stateless singleton implementations of
- * {@link androidx.serialization.runtime.internal.SerializerV1} for message classes and unions
- * and {@link androidx.serialization.runtime.internal.EnumSerializerV1} for enum classes. Each
- * implementation is placed in the same package as the source class with a name derived by
- * replacing the {@code .} of nested classes with {@code _} and adding a {@code Serializer} suffix.
- * In Java, serializers expose a singleton instance on a static final {@code INSTANCE} field. In
- * Kotlin, they are implemented as an object declaration.
- * <p>
- * Message serializers consume {@link androidx.serialization.runtime.internal.EncoderV1} and
- * {@link androidx.serialization.runtime.internal.DecoderV1}, which are provided by serialization
- * backends. This avoids serializers having a dependencies on a specific backend.
- * <p>
- * Every interface in this package has a version number suffix. This allows new methods to be
- * added without breaking binary compatibility with existing generated code, even for Java 7
- * targets without default methods. To add to an interface, add a new interface with an
- * incremented version number which extends the existing interface.
- */
-@RestrictTo(LIBRARY_GROUP_PREFIX)
-package androidx.serialization.runtime.internal;
-
-import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX;
-
-import androidx.annotation.RestrictTo;

serialization/serialization-runtime/src/test/java/androidx/serialization/runtime/internal/EmptyDecoderTest.java

diff --git a/serialization/serialization-runtime/src/test/java/androidx/serialization/runtime/internal/EmptyDecoderTest.java b/serialization/serialization-runtime/src/test/java/androidx/serialization/runtime/internal/EmptyDecoderTest.java
deleted file mode 100644
index 10eb0a5..0000000
--- a/serialization/serialization-runtime/src/test/java/androidx/serialization/runtime/internal/EmptyDecoderTest.java
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.runtime.internal;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.junit.Test;
-
-import java.util.NoSuchElementException;
-
-/**
- * Unit tests for {@link EmptyDecoder}.
- */
-public final class EmptyDecoderTest {
-    @NonNull
-    private static final EmptyDecoder INSTANCE = EmptyDecoder.INSTANCE;
-
-    @Test
-    public void testHasNextField() {
-        assertThat(INSTANCE.hasNextField()).isFalse();
-    }
-
-    @Test
-    public void testNextFieldId() {
-        assertThat(runCatching(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.nextFieldId();
-            }
-        })).isInstanceOf(NoSuchElementException.class);
-    }
-
-    @Test
-    public void testDecodeMessage() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeMessage(SERIALIZER, null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedMessage() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedMessage(
-                        SERIALIZER,
-                        null,
-                        SerializationRuntime.getListFactory()
-                );
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeEnum() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeEnum(ENUM_SERIALIZER);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedEnum() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedEnum(
-                        ENUM_SERIALIZER,
-                        null,
-                        SerializationRuntime.<TestEnum>getListFactory()
-                );
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeBool() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeBool();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedBoolArray() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedBool(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedBoolCollection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedBool(null, SerializationRuntime.<Boolean>getListFactory());
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeBytes() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeBytes();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedBytesCollection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedBytes(null, SerializationRuntime.<byte[]>getListFactory());
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeDouble() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeDouble();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedDoubleArray() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedDouble(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedDoubleCollection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedDouble(null, SerializationRuntime.<Double>getListFactory());
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeFloat() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeFloat();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedFloatArray() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedFloat(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedFloatCollection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedFloat(null, SerializationRuntime.<Float>getListFactory());
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeInt32() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeInt32();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedInt32Array() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedInt32(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedInt32Collection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedInt32(null, SerializationRuntime.<Integer>getListFactory());
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeSInt32() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeSInt32();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedSInt32Array() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedSInt32(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedSInt32Collection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedSInt32(null, SerializationRuntime.<Integer>getListFactory());
-            }
-        });
-    }
-
-
-    @Test
-    public void testDecodeUInt32() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeUInt32();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedUInt32Array() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedUInt32(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedUInt32Collection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedUInt32(null, SerializationRuntime.<Integer>getListFactory());
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeFixed32() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeFixed32();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedFixed32Array() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedFixed32(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedFixed32Collection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedFixed32(
-                        null,
-                        SerializationRuntime.<Integer>getListFactory()
-                );
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeInt64() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeInt64();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedInt64Array() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedInt64(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedInt64Collection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedInt64(null, SerializationRuntime.<Long>getListFactory());
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeSInt64() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeSInt64();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedSInt64Array() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedSInt64(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedSInt64Collection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedSInt64(null, SerializationRuntime.<Long>getListFactory());
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeUInt64() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeUInt64();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedUInt64Array() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedUInt64(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedUInt64Collection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedUInt64(null, SerializationRuntime.<Long>getListFactory());
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeFixed64() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeFixed64();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedFixed64Array() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedFixed64(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedFixed64Collection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedFixed64(null, SerializationRuntime.<Long>getListFactory());
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeString() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeString();
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedStringArray() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedString(null);
-            }
-        });
-    }
-
-    @Test
-    public void testDecodeRepeatedStringCollection() {
-        assertThrowsEmptyDecoderException(new Runnable() {
-            @Override
-            public void run() {
-                INSTANCE.decodeRepeatedString(null, SerializationRuntime.<String>getListFactory());
-            }
-        });
-    }
-
-    private static void assertThrowsEmptyDecoderException(@NonNull Runnable runnable) {
-        RuntimeException exception = runCatching(runnable);
-        assertThat(exception).isInstanceOf(IllegalStateException.class);
-        assertThat(exception).hasMessageThat().isEqualTo("Decoder is empty");
-    }
-
-    @Nullable
-    private static RuntimeException runCatching(@NonNull Runnable runnable) {
-        try {
-            runnable.run();
-        } catch (RuntimeException exception) {
-            return exception;
-        }
-        return null;
-    }
-
-    private enum TestEnum {
-        TEST
-    }
-
-    @NonNull
-    private static final EnumSerializerV1<TestEnum> ENUM_SERIALIZER =
-            new EnumSerializerV1<TestEnum>() {
-                @Override
-                public int encode(@NonNull TestEnum value) {
-                    return 0;
-                }
-
-                @NonNull
-                @Override
-                public TestEnum decode(int valueId) {
-                    return TestEnum.TEST;
-                }
-            };
-
-    @NonNull
-    private static final SerializerV1<Object> SERIALIZER = new SerializerV1<Object>() {
-        @Override
-        public void encode(@NonNull EncoderV1 encoder, @NonNull Object message) {
-        }
-
-        @NonNull
-        @Override
-        public Object decode(@NonNull DecoderV1 decoder, @Nullable Object mergeFrom) {
-            return new Object();
-        }
-    };
-}

serialization/serialization-runtime/src/test/java/androidx/serialization/runtime/internal/SerializationRuntimeTest.java

diff --git a/serialization/serialization-runtime/src/test/java/androidx/serialization/runtime/internal/SerializationRuntimeTest.java b/serialization/serialization-runtime/src/test/java/androidx/serialization/runtime/internal/SerializationRuntimeTest.java
deleted file mode 100644
index c49f87f..0000000
--- a/serialization/serialization-runtime/src/test/java/androidx/serialization/runtime/internal/SerializationRuntimeTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.serialization.runtime.internal;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-
-/**
- * Unit tests for {@link SerializationRuntime}.
- */
-public final class SerializationRuntimeTest {
-    @Test
-    public void testDefaultInstanceOf() {
-        assertThat(SerializationRuntime.defaultInstanceOf(FooSerializer.INSTANCE))
-                .isInstanceOf(Foo.class);
-
-        assertThat(SerializationRuntime.defaultInstanceOf(FooSerializer.INSTANCE).getBar())
-                .isEqualTo(0);
-    }
-
-    @Test
-    public void testGetListFactory() {
-        assertThat(SerializationRuntime.getListFactory().create(0))
-                .isSameInstanceAs(Collections.emptyList());
-
-        assertThat(SerializationRuntime.getListFactory().create(1))
-                .isInstanceOf(ArrayList.class);
-    }
-
-    @Test
-    public void testGetSetFactory() {
-        assertThat(SerializationRuntime.getSetFactory().create(0))
-                .isSameInstanceAs(Collections.emptySet());
-
-        assertThat(SerializationRuntime.getSetFactory().create(1))
-                .isInstanceOf(LinkedHashSet.class);
-    }
-
-    private static final class Foo {
-        private int mBar;
-
-        Foo(int bar) {
-            mBar = bar;
-        }
-
-        public int getBar() {
-            return mBar;
-        }
-    }
-
-    private static final class FooSerializer implements SerializerV1<Foo> {
-        @NonNull
-        public static final FooSerializer INSTANCE = new FooSerializer();
-
-        @Override
-        public void encode(@NonNull EncoderV1 encoder, @NonNull Foo message) {
-            encoder.encodeInt32(1, message.getBar());
-        }
-
-        @NonNull
-        @Override
-        public Foo decode(@NonNull DecoderV1 decoder, @Nullable Foo mergeFrom) {
-            int bar = 0;
-
-            while (decoder.hasNextField()) {
-                if (decoder.nextFieldId() == 1) {
-                    bar = decoder.decodeInt32();
-                }
-            }
-
-            return new Foo(bar);
-        }
-    }
-}

serialization/serialization/api/current.txt

diff --git a/serialization/serialization/api/current.txt b/serialization/serialization/api/current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/serialization/serialization/api/current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

serialization/serialization/api/public_plus_experimental_current.txt

diff --git a/serialization/serialization/api/public_plus_experimental_current.txt b/serialization/serialization/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/serialization/serialization/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

serialization/serialization/api/restricted_current.txt

diff --git a/serialization/serialization/api/restricted_current.txt b/serialization/serialization/api/restricted_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/serialization/serialization/api/restricted_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0

serialization/serialization/build.gradle

diff --git a/serialization/serialization/build.gradle b/serialization/serialization/build.gradle
deleted file mode 100644
index 9b18f7a..0000000
--- a/serialization/serialization/build.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
-import androidx.build.Publish
-
-plugins {
-    id("AndroidXPlugin")
-    id("com.android.library")
-}
-
-dependencies {
-    api(project(":serialization:serialization-annotation"))
-    api(project(":serialization:serialization-runtime"))
-    api(project(":serialization:serialization-runtime-parcel"))
-    api(project(":serialization:serialization-runtime-proto"))
-}
-
-android {
-    defaultConfig {
-        minSdkVersion 14
-    }
-
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
-}
-
-androidx {
-    name = "AndroidX Serialization"
-    publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenVersion = LibraryVersions.SERIALIZATION
-    mavenGroup = LibraryGroups.SERIALIZATION
-    inceptionYear = "2020"
-    description = "A lightweight serialization solution for AndroidX libraries"
-}

serialization/serialization/lint-baseline.xml

diff --git a/serialization/serialization/lint-baseline.xml b/serialization/serialization/lint-baseline.xml
deleted file mode 100644
index 8f1aa4b..0000000
--- a/serialization/serialization/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta02" client="gradle" variant="debug" version="4.2.0-beta02">
-
-</issues>

serialization/serialization/src/main/AndroidManifest.xml

diff --git a/serialization/serialization/src/main/AndroidManifest.xml b/serialization/serialization/src/main/AndroidManifest.xml
deleted file mode 100644
index c7a6c36..0000000
--- a/serialization/serialization/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<manifest package="androidx.serialization"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-</manifest>
\ No newline at end of file

settings.gradle

diff --git a/settings.gradle b/settings.gradle
index a72757e..3fe280c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -232,6 +232,7 @@
 includeProject(":compose:animation", "compose/animation", [BuildType.COMPOSE])
 includeProject(":compose:animation:animation", "compose/animation/animation", [BuildType.COMPOSE])
 includeProject(":compose:animation:animation-core", "compose/animation/animation-core", [BuildType.COMPOSE])
+includeProject(":compose:animation:animation-core-lint", "compose/animation/animation-core-lint", [BuildType.COMPOSE])
 includeProject(":compose:animation:animation-core:animation-core-benchmark", "compose/animation/animation-core/benchmark", [BuildType.COMPOSE])
 includeProject(":compose:animation:animation-core:animation-core-samples", "compose/animation/animation-core/samples", [BuildType.COMPOSE])
 includeProject(":compose:animation:animation:integration-tests:animation-demos", "compose/animation/animation/integration-tests/animation-demos", [BuildType.COMPOSE])
@@ -257,7 +258,6 @@
 includeProject(":compose:foundation:foundation:integration-tests:foundation-demos", "compose/foundation/foundation/integration-tests/foundation-demos", [BuildType.COMPOSE])
 includeProject(":compose:foundation:foundation:foundation-samples", "compose/foundation/foundation/samples", [BuildType.COMPOSE])
 includeProject(":compose:integration-tests", "compose/integration-tests", [BuildType.COMPOSE])
-includeProject(":compose:integration-tests:benchmark", "compose/integration-tests/benchmark", [BuildType.COMPOSE])
 includeProject(":compose:integration-tests:demos", "compose/integration-tests/demos", [BuildType.COMPOSE])
 includeProject(":compose:integration-tests:demos:common", "compose/integration-tests/demos/common", [BuildType.COMPOSE])
 includeProject(":compose:integration-tests:docs-snippets", "compose/integration-tests/docs-snippets", [BuildType.COMPOSE])
@@ -388,9 +388,6 @@
 includeProject(":inspection:inspection-gradle-plugin", "inspection/inspection-gradle-plugin", [BuildType.MAIN])
 includeProject(":inspection:inspection-testing", "inspection/inspection-testing", [BuildType.MAIN, BuildType.COMPOSE])
 includeProject(":interpolator:interpolator", "interpolator/interpolator", [BuildType.MAIN])
-includeProject(":ipc:ipc-annotations", "ipc/ipc-annotations", [BuildType.MAIN])
-includeProject(":ipc:ipc-compiler", "ipc/ipc-compiler", [BuildType.MAIN])
-includeProject(":ipc:ipc-runtime", "ipc/ipc-runtime", [BuildType.MAIN])
 includeProject(":jetifier-core", "jetifier/jetifier/core", [BuildType.MAIN])
 includeProject(":jetifier-preprocessor", "jetifier/jetifier/preprocessor", [BuildType.MAIN])
 includeProject(":jetifier-processor", "jetifier/jetifier/processor", [BuildType.MAIN])
@@ -513,12 +510,6 @@
 includeProject(":security:security-crypto", "security/crypto", [BuildType.MAIN])
 includeProject(":security:security-crypto-ktx", "security/security-crypto-ktx", [BuildType.MAIN])
 includeProject(":security:security-identity-credential", "security/identity-credential", [BuildType.MAIN])
-includeProject(":serialization:serialization", "serialization/serialization", [BuildType.MAIN])
-includeProject(":serialization:serialization-annotation", "serialization/serialization-annotation", [BuildType.MAIN])
-includeProject(":serialization:serialization-compiler", "serialization/serialization-compiler", [BuildType.MAIN])
-includeProject(":serialization:serialization-runtime", "serialization/serialization-runtime", [BuildType.MAIN])
-includeProject(":serialization:serialization-runtime-parcel", "serialization/serialization-runtime-parcel", [BuildType.MAIN])
-includeProject(":serialization:serialization-runtime-proto", "serialization/serialization-runtime-proto", [BuildType.MAIN])
 includeProject(":sharetarget:integration-tests:testapp", "sharetarget/integration-tests/testapp", [BuildType.MAIN])
 includeProject(":sharetarget:sharetarget", "sharetarget/sharetarget", [BuildType.MAIN])
 includeProject(":slice-benchmark", "slices/benchmark", [BuildType.MAIN])
@@ -572,9 +563,9 @@
 includeProject(":wear:wear-ongoing", "wear/wear-ongoing", [BuildType.MAIN, BuildType.WEAR])
 includeProject(":wear:wear-phone-interactions", "wear/wear-phone-interactions", [BuildType.MAIN, BuildType.WEAR])
 includeProject(":wear:wear-remote-interactions", "wear/wear-remote-interactions", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:wear-tiles", "wear/wear-tiles", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:wear-tiles-proto", "wear/wear-tiles-proto", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:wear-tiles-renderer", "wear/wear-tiles-renderer", [BuildType.MAIN, BuildType.WEAR])
+includeProject(":wear:tiles:tiles", "wear/tiles/tiles", [BuildType.MAIN, BuildType.WEAR])
+includeProject(":wear:tiles:tiles-proto", "wear/tiles/tiles-proto", [BuildType.MAIN, BuildType.WEAR])
+includeProject(":wear:tiles:tiles-renderer", "wear/tiles/tiles-renderer", [BuildType.MAIN, BuildType.WEAR])
 includeProject(":wear:wear-watchface", "wear/wear-watchface", [BuildType.MAIN, BuildType.WEAR])
 includeProject(":wear:wear-watchface-complications-rendering", "wear/wear-watchface-complications-rendering", [BuildType.MAIN, BuildType.WEAR])
 includeProject(":wear:wear-watchface-client", "wear/wear-watchface-client", [BuildType.MAIN, BuildType.WEAR])
@@ -690,7 +681,8 @@
 
 includeProject(":icing", new File(externalRoot, "icing"), [BuildType.MAIN])
 includeProject(":icing:nativeLib", new File(externalRoot, "icing/nativeLib"), [BuildType.MAIN])
-includeProject(":noto-emoji-compat", new File(externalRoot, "noto-fonts/emoji-compat"), [BuildType.MAIN])
+includeProject(":noto-emoji-compat-font", new File(externalRoot, "noto-fonts/emoji-compat"), [BuildType.MAIN])
+includeProject(":noto-emoji-compat-flatbuffers", new File(externalRoot, "noto-fonts/emoji-compat-flatbuffers"), [BuildType.MAIN])
 
 if (isAllProjects()) {
     includeProject(":docs-tip-of-tree", "docs-tip-of-tree")

startup/startup-runtime/api/current.txt

diff --git a/startup/startup-runtime/api/current.txt b/startup/startup-runtime/api/current.txt
index 847659c..434ba26 100644
--- a/startup/startup-runtime/api/current.txt
+++ b/startup/startup-runtime/api/current.txt
@@ -7,6 +7,16 @@
     method public boolean isEagerlyInitialized(Class<? extends androidx.startup.Initializer<?>>);
   }
 
+  public class InitializationProvider extends android.content.ContentProvider {
+    ctor public InitializationProvider();
+    method public final int delete(android.net.Uri, String?, String![]?);
+    method public final String? getType(android.net.Uri);
+    method public final android.net.Uri? insert(android.net.Uri, android.content.ContentValues?);
+    method public final boolean onCreate();
+    method public final android.database.Cursor? query(android.net.Uri, String![]?, String?, String![]?, String?);
+    method public final int update(android.net.Uri, android.content.ContentValues?, String?, String![]?);
+  }
+
   public interface Initializer<T> {
     method public T create(android.content.Context);
     method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();

startup/startup-runtime/api/public_plus_experimental_current.txt

diff --git a/startup/startup-runtime/api/public_plus_experimental_current.txt b/startup/startup-runtime/api/public_plus_experimental_current.txt
index 847659c..434ba26 100644
--- a/startup/startup-runtime/api/public_plus_experimental_current.txt
+++ b/startup/startup-runtime/api/public_plus_experimental_current.txt
@@ -7,6 +7,16 @@
     method public boolean isEagerlyInitialized(Class<? extends androidx.startup.Initializer<?>>);
   }
 
+  public class InitializationProvider extends android.content.ContentProvider {
+    ctor public InitializationProvider();
+    method public final int delete(android.net.Uri, String?, String![]?);
+    method public final String? getType(android.net.Uri);
+    method public final android.net.Uri? insert(android.net.Uri, android.content.ContentValues?);
+    method public final boolean onCreate();
+    method public final android.database.Cursor? query(android.net.Uri, String![]?, String?, String![]?, String?);
+    method public final int update(android.net.Uri, android.content.ContentValues?, String?, String![]?);
+  }
+
   public interface Initializer<T> {
     method public T create(android.content.Context);
     method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();

startup/startup-runtime/api/restricted_current.txt

diff --git a/startup/startup-runtime/api/restricted_current.txt b/startup/startup-runtime/api/restricted_current.txt
index 847659c..434ba26 100644
--- a/startup/startup-runtime/api/restricted_current.txt
+++ b/startup/startup-runtime/api/restricted_current.txt
@@ -7,6 +7,16 @@
     method public boolean isEagerlyInitialized(Class<? extends androidx.startup.Initializer<?>>);
   }
 
+  public class InitializationProvider extends android.content.ContentProvider {
+    ctor public InitializationProvider();
+    method public final int delete(android.net.Uri, String?, String![]?);
+    method public final String? getType(android.net.Uri);
+    method public final android.net.Uri? insert(android.net.Uri, android.content.ContentValues?);
+    method public final boolean onCreate();
+    method public final android.database.Cursor? query(android.net.Uri, String![]?, String?, String![]?, String?);
+    method public final int update(android.net.Uri, android.content.ContentValues?, String?, String![]?);
+  }
+
   public interface Initializer<T> {
     method public T create(android.content.Context);
     method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();

startup/startup-runtime/src/main/java/androidx/startup/InitializationProvider.java

diff --git a/startup/startup-runtime/src/main/java/androidx/startup/InitializationProvider.java b/startup/startup-runtime/src/main/java/androidx/startup/InitializationProvider.java
index 4d07b2a..a14ce54 100644
--- a/startup/startup-runtime/src/main/java/androidx/startup/InitializationProvider.java
+++ b/startup/startup-runtime/src/main/java/androidx/startup/InitializationProvider.java
@@ -25,18 +25,14 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
 
 /**
  * The {@link ContentProvider} which discovers {@link Initializer}s in an application and
  * initializes them before {@link Application#onCreate()}.
- *
- * @hide
  */
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class InitializationProvider extends ContentProvider {
+public class InitializationProvider extends ContentProvider {
     @Override
-    public boolean onCreate() {
+    public final boolean onCreate() {
         Context context = getContext();
         if (context != null) {
             AppInitializer.getInstance(context).discoverAndInitialize();
@@ -48,7 +44,7 @@
 
     @Nullable
     @Override
-    public Cursor query(
+    public final Cursor query(
             @NonNull Uri uri,
             @Nullable String[] projection,
             @Nullable String selection,
@@ -59,18 +55,18 @@
 
     @Nullable
     @Override
-    public String getType(@NonNull Uri uri) {
+    public final String getType(@NonNull Uri uri) {
         throw new IllegalStateException("Not allowed.");
     }
 
     @Nullable
     @Override
-    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+    public final Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
         throw new IllegalStateException("Not allowed.");
     }
 
     @Override
-    public int delete(
+    public final int delete(
             @NonNull Uri uri,
             @Nullable String selection,
             @Nullable String[] selectionArgs) {
@@ -78,7 +74,7 @@
     }
 
     @Override
-    public int update(
+    public final int update(
             @NonNull Uri uri,
             @Nullable ContentValues values,
             @Nullable String selection,

swiperefreshlayout/OWNERS

diff --git a/swiperefreshlayout/OWNERS b/swiperefreshlayout/OWNERS
index f92940c..8fbda65 100644
--- a/swiperefreshlayout/OWNERS
+++ b/swiperefreshlayout/OWNERS
@@ -1 +1 @@
-shepshapard@google.com
\ No newline at end of file
+aelias@google.com
\ No newline at end of file

text/text/src/main/java/androidx/compose/ui/text/android/CharSequenceCharacterIterator.kt

diff --git a/text/text/src/main/java/androidx/compose/ui/text/android/CharSequenceCharacterIterator.kt b/text/text/src/main/java/androidx/compose/ui/text/android/CharSequenceCharacterIterator.kt
index b1fc875..942c5fd 100644
--- a/text/text/src/main/java/androidx/compose/ui/text/android/CharSequenceCharacterIterator.kt
+++ b/text/text/src/main/java/androidx/compose/ui/text/android/CharSequenceCharacterIterator.kt
@@ -55,7 +55,7 @@
      *
      * @return the last character in the text, or [java.text.CharacterIterator.DONE] if the
      * text is empty
-     * @see .getEndIndex
+     * @see CharSequenceCharacterIterator.getEndIndex
      */
     override fun last(): Char {
         return if (start == end) {
@@ -73,7 +73,7 @@
      * @return the character at the current position or [java.text.CharacterIterator.DONE]
      * if the current
      * position is off the end of the text.
-     * @see .getIndex
+     * @see CharSequenceCharacterIterator.getIndex
      */
     override fun current(): Char {
         return if (index == end) CharacterIterator.DONE else charSequence[index]

ui/ui-animation-tooling-internal/api/1.0.0-beta04.txt

diff --git a/ui/ui-animation-tooling-internal/api/1.0.0-beta04.txt b/ui/ui-animation-tooling-internal/api/1.0.0-beta04.txt
new file mode 100644
index 0000000..f54cae5f
--- /dev/null
+++ b/ui/ui-animation-tooling-internal/api/1.0.0-beta04.txt
@@ -0,0 +1,32 @@
+// Signature format: 4.0
+package androidx.compose.animation.tooling {
+
+  public final class ComposeAnimatedProperty {
+    ctor public ComposeAnimatedProperty(String label, Object value);
+    method public String component1();
+    method public Object component2();
+    method public androidx.compose.animation.tooling.ComposeAnimatedProperty copy(String label, Object value);
+    method public String getLabel();
+    method public Object getValue();
+    property public final String label;
+    property public final Object value;
+  }
+
+  public interface ComposeAnimation {
+    method public Object getAnimationObject();
+    method public default String? getLabel();
+    method public default java.util.Set<java.lang.Object> getStates();
+    method public androidx.compose.animation.tooling.ComposeAnimationType getType();
+    property public abstract Object animationObject;
+    property public default String? label;
+    property public default java.util.Set<java.lang.Object> states;
+    property public abstract androidx.compose.animation.tooling.ComposeAnimationType type;
+  }
+
+  public enum ComposeAnimationType {
+    enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType ANIMATED_VALUE;
+    enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType TRANSITION_ANIMATION;
+  }
+
+}
+

ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta04.txt

diff --git a/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta04.txt b/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta04.txt
new file mode 100644
index 0000000..f54cae5f
--- /dev/null
+++ b/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta04.txt
@@ -0,0 +1,32 @@
+// Signature format: 4.0
+package androidx.compose.animation.tooling {
+
+  public final class ComposeAnimatedProperty {
+    ctor public ComposeAnimatedProperty(String label, Object value);
+    method public String component1();
+    method public Object component2();
+    method public androidx.compose.animation.tooling.ComposeAnimatedProperty copy(String label, Object value);
+    method public String getLabel();
+    method public Object getValue();
+    property public final String label;
+    property public final Object value;
+  }
+
+  public interface ComposeAnimation {
+    method public Object getAnimationObject();
+    method public default String? getLabel();
+    method public default java.util.Set<java.lang.Object> getStates();
+    method public androidx.compose.animation.tooling.ComposeAnimationType getType();
+    property public abstract Object animationObject;
+    property public default String? label;
+    property public default java.util.Set<java.lang.Object> states;
+    property public abstract androidx.compose.animation.tooling.ComposeAnimationType type;
+  }
+
+  public enum ComposeAnimationType {
+    enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType ANIMATED_VALUE;
+    enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType TRANSITION_ANIMATION;
+  }
+
+}
+

ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta04.txt

diff --git a/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta04.txt b/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta04.txt
new file mode 100644
index 0000000..f54cae5f
--- /dev/null
+++ b/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta04.txt
@@ -0,0 +1,32 @@
+// Signature format: 4.0
+package androidx.compose.animation.tooling {
+
+  public final class ComposeAnimatedProperty {
+    ctor public ComposeAnimatedProperty(String label, Object value);
+    method public String component1();
+    method public Object component2();
+    method public androidx.compose.animation.tooling.ComposeAnimatedProperty copy(String label, Object value);
+    method public String getLabel();
+    method public Object getValue();
+    property public final String label;
+    property public final Object value;
+  }
+
+  public interface ComposeAnimation {
+    method public Object getAnimationObject();
+    method public default String? getLabel();
+    method public default java.util.Set<java.lang.Object> getStates();
+    method public androidx.compose.animation.tooling.ComposeAnimationType getType();
+    property public abstract Object animationObject;
+    property public default String? label;
+    property public default java.util.Set<java.lang.Object> states;
+    property public abstract androidx.compose.animation.tooling.ComposeAnimationType type;
+  }
+
+  public enum ComposeAnimationType {
+    enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType ANIMATED_VALUE;
+    enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType TRANSITION_ANIMATION;
+  }
+
+}
+

wear/tiles/tiles-proto/api/current.txt

diff --git a/wear/wear-tiles-proto/api/current.txt b/wear/tiles/tiles-proto/api/current.txt
similarity index 100%
rename from wear/wear-tiles-proto/api/current.txt
rename to wear/tiles/tiles-proto/api/current.txt

wear/tiles/tiles-proto/api/public_plus_experimental_current.txt

diff --git a/wear/wear-tiles-proto/api/public_plus_experimental_current.txt b/wear/tiles/tiles-proto/api/public_plus_experimental_current.txt
similarity index 100%
rename from wear/wear-tiles-proto/api/public_plus_experimental_current.txt
rename to wear/tiles/tiles-proto/api/public_plus_experimental_current.txt

wear/tiles/tiles-proto/api/restricted_current.txt

diff --git a/wear/wear-tiles-proto/api/restricted_current.txt b/wear/tiles/tiles-proto/api/restricted_current.txt
similarity index 100%
rename from wear/wear-tiles-proto/api/restricted_current.txt
rename to wear/tiles/tiles-proto/api/restricted_current.txt

wear/tiles/tiles-proto/build.gradle

diff --git a/wear/wear-tiles-proto/build.gradle b/wear/tiles/tiles-proto/build.gradle
similarity index 98%
rename from wear/wear-tiles-proto/build.gradle
rename to wear/tiles/tiles-proto/build.gradle
index 941c572..f9ab9c2 100644
--- a/wear/wear-tiles-proto/build.gradle
+++ b/wear/tiles/tiles-proto/build.gradle
@@ -107,7 +107,7 @@
 androidx {
     name = "Wear Tiles Proto"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR
+    mavenGroup = LibraryGroups.WEAR_TILES
     mavenVersion = LibraryVersions.WEAR_TILES
     inceptionYear = "2020"
     description = "Jarjar the generated proto and proto-lite dependency for use by " +

wear/tiles/tiles-proto/lint-baseline.xml

diff --git a/wear/wear-tiles-proto/lint-baseline.xml b/wear/tiles/tiles-proto/lint-baseline.xml
similarity index 74%
rename from wear/wear-tiles-proto/lint-baseline.xml
rename to wear/tiles/tiles-proto/lint-baseline.xml
index 970f78d..f610889 100644
--- a/wear/wear-tiles-proto/lint-baseline.xml
+++ b/wear/tiles/tiles-proto/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta04" client="gradle" version="4.2.0-beta04">
+<issues format="5" by="lint 4.2.0-beta06" client="gradle" version="4.2.0-beta06">
 
     <issue
         id="UnknownNullness"
@@ -7,7 +7,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -18,7 +18,7 @@
         errorLine1="    java.lang.String getPackageName();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="23"
             column="5"/>
     </issue>
@@ -29,7 +29,7 @@
         errorLine1="    com.google.protobuf.ByteString"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="32"
             column="5"/>
     </issue>
@@ -40,7 +40,7 @@
         errorLine1="    java.lang.String getClassName();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="44"
             column="5"/>
     </issue>
@@ -51,7 +51,7 @@
         errorLine1="    com.google.protobuf.ByteString"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="54"
             column="5"/>
     </issue>
@@ -62,7 +62,7 @@
         errorLine1="    public java.lang.String getPackageName() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="84"
             column="12"/>
     </issue>
@@ -73,7 +73,7 @@
         errorLine1="    public com.google.protobuf.ByteString"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="96"
             column="12"/>
     </issue>
@@ -84,7 +84,7 @@
         errorLine1="    public java.lang.String getClassName() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="157"
             column="12"/>
     </issue>
@@ -95,7 +95,7 @@
         errorLine1="    public com.google.protobuf.ByteString"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="170"
             column="12"/>
     </issue>
@@ -106,7 +106,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="222"
             column="19"/>
     </issue>
@@ -117,7 +117,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="223"
             column="9"/>
     </issue>
@@ -128,7 +128,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="228"
             column="19"/>
     </issue>
@@ -139,7 +139,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="229"
             column="9"/>
     </issue>
@@ -150,7 +150,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="230"
             column="9"/>
     </issue>
@@ -161,7 +161,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="235"
             column="19"/>
     </issue>
@@ -172,7 +172,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="236"
             column="9"/>
     </issue>
@@ -183,7 +183,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="241"
             column="19"/>
     </issue>
@@ -194,7 +194,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="242"
             column="9"/>
     </issue>
@@ -205,7 +205,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="243"
             column="9"/>
     </issue>
@@ -216,7 +216,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="248"
             column="19"/>
     </issue>
@@ -227,7 +227,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom(byte[] data)"
         errorLine2="                                                                                  ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="248"
             column="83"/>
     </issue>
@@ -238,7 +238,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="253"
             column="19"/>
     </issue>
@@ -249,7 +249,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="254"
             column="9"/>
     </issue>
@@ -260,7 +260,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="255"
             column="9"/>
     </issue>
@@ -271,7 +271,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="260"
             column="19"/>
     </issue>
@@ -282,7 +282,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="260"
             column="83"/>
     </issue>
@@ -293,7 +293,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="265"
             column="19"/>
     </issue>
@@ -304,7 +304,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="266"
             column="9"/>
     </issue>
@@ -315,7 +315,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="267"
             column="9"/>
     </issue>
@@ -326,7 +326,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="272"
             column="19"/>
     </issue>
@@ -337,7 +337,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="272"
             column="92"/>
     </issue>
@@ -348,7 +348,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="276"
             column="19"/>
     </issue>
@@ -359,7 +359,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="277"
             column="9"/>
     </issue>
@@ -370,7 +370,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="278"
             column="9"/>
     </issue>
@@ -381,7 +381,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="282"
             column="19"/>
     </issue>
@@ -392,7 +392,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="283"
             column="9"/>
     </issue>
@@ -403,7 +403,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="288"
             column="19"/>
     </issue>
@@ -414,7 +414,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="289"
             column="9"/>
     </issue>
@@ -425,7 +425,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="290"
             column="9"/>
     </issue>
@@ -436,7 +436,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="296"
             column="19"/>
     </issue>
@@ -447,7 +447,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ActionProto.AndroidActivity prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="299"
             column="19"/>
     </issue>
@@ -458,7 +458,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ActionProto.AndroidActivity prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="299"
             column="38"/>
     </issue>
@@ -469,7 +469,7 @@
         errorLine1="      public java.lang.String getPackageName() {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="330"
             column="14"/>
     </issue>
@@ -480,7 +480,7 @@
         errorLine1="      public com.google.protobuf.ByteString"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="342"
             column="14"/>
     </issue>
@@ -491,7 +491,7 @@
         errorLine1="      public Builder setPackageName("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="355"
             column="14"/>
     </issue>
@@ -502,7 +502,7 @@
         errorLine1="          java.lang.String value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="356"
             column="11"/>
     </issue>
@@ -513,7 +513,7 @@
         errorLine1="      public Builder clearPackageName() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="369"
             column="14"/>
     </issue>
@@ -524,7 +524,7 @@
         errorLine1="      public Builder setPackageNameBytes("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="383"
             column="14"/>
     </issue>
@@ -535,7 +535,7 @@
         errorLine1="          com.google.protobuf.ByteString value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="384"
             column="11"/>
     </issue>
@@ -546,7 +546,7 @@
         errorLine1="      public java.lang.String getClassName() {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="400"
             column="14"/>
     </issue>
@@ -557,7 +557,7 @@
         errorLine1="      public com.google.protobuf.ByteString"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="413"
             column="14"/>
     </issue>
@@ -568,7 +568,7 @@
         errorLine1="      public Builder setClassName("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="427"
             column="14"/>
     </issue>
@@ -579,7 +579,7 @@
         errorLine1="          java.lang.String value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="428"
             column="11"/>
     </issue>
@@ -590,7 +590,7 @@
         errorLine1="      public Builder clearClassName() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="442"
             column="14"/>
     </issue>
@@ -601,7 +601,7 @@
         errorLine1="      public Builder setClassNameBytes("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="457"
             column="14"/>
     </issue>
@@ -612,7 +612,7 @@
         errorLine1="          com.google.protobuf.ByteString value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="458"
             column="11"/>
     </issue>
@@ -623,7 +623,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="468"
             column="21"/>
     </issue>
@@ -634,7 +634,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="469"
             column="9"/>
     </issue>
@@ -645,7 +645,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="470"
             column="9"/>
     </issue>
@@ -656,7 +656,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="470"
             column="32"/>
     </issue>
@@ -667,7 +667,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.AndroidActivity getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="529"
             column="19"/>
     </issue>
@@ -678,7 +678,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;AndroidActivity> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="535"
             column="19"/>
     </issue>
@@ -689,7 +689,7 @@
         errorLine1="    androidx.wear.tiles.proto.ActionProto.AndroidActivity getAndroidActivity();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="561"
             column="5"/>
     </issue>
@@ -700,7 +700,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ActionProto.AndroidActivity getAndroidActivity() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="600"
             column="12"/>
     </issue>
@@ -711,7 +711,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="661"
             column="19"/>
     </issue>
@@ -722,7 +722,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="662"
             column="9"/>
     </issue>
@@ -733,7 +733,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="667"
             column="19"/>
     </issue>
@@ -744,7 +744,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="668"
             column="9"/>
     </issue>
@@ -755,7 +755,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="669"
             column="9"/>
     </issue>
@@ -766,7 +766,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="674"
             column="19"/>
     </issue>
@@ -777,7 +777,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="675"
             column="9"/>
     </issue>
@@ -788,7 +788,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="680"
             column="19"/>
     </issue>
@@ -799,7 +799,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="681"
             column="9"/>
     </issue>
@@ -810,7 +810,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="682"
             column="9"/>
     </issue>
@@ -821,7 +821,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="687"
             column="19"/>
     </issue>
@@ -832,7 +832,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom(byte[] data)"
         errorLine2="                                                                               ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="687"
             column="80"/>
     </issue>
@@ -843,7 +843,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="692"
             column="19"/>
     </issue>
@@ -854,7 +854,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="693"
             column="9"/>
     </issue>
@@ -865,7 +865,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="694"
             column="9"/>
     </issue>
@@ -876,7 +876,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="699"
             column="19"/>
     </issue>
@@ -887,7 +887,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom(java.io.InputStream input)"
         errorLine2="                                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="699"
             column="80"/>
     </issue>
@@ -898,7 +898,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="704"
             column="19"/>
     </issue>
@@ -909,7 +909,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="705"
             column="9"/>
     </issue>
@@ -920,7 +920,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="706"
             column="9"/>
     </issue>
@@ -931,7 +931,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="711"
             column="19"/>
     </issue>
@@ -942,7 +942,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="711"
             column="89"/>
     </issue>
@@ -953,7 +953,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="715"
             column="19"/>
     </issue>
@@ -964,7 +964,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="716"
             column="9"/>
     </issue>
@@ -975,7 +975,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="717"
             column="9"/>
     </issue>
@@ -986,7 +986,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="721"
             column="19"/>
     </issue>
@@ -997,7 +997,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="722"
             column="9"/>
     </issue>
@@ -1008,7 +1008,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="727"
             column="19"/>
     </issue>
@@ -1019,7 +1019,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="728"
             column="9"/>
     </issue>
@@ -1030,7 +1030,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="729"
             column="9"/>
     </issue>
@@ -1041,7 +1041,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="735"
             column="19"/>
     </issue>
@@ -1052,7 +1052,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ActionProto.LaunchAction prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="738"
             column="19"/>
     </issue>
@@ -1063,7 +1063,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ActionProto.LaunchAction prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="738"
             column="38"/>
     </issue>
@@ -1074,7 +1074,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ActionProto.AndroidActivity getAndroidActivity() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="781"
             column="14"/>
     </issue>
@@ -1085,7 +1085,7 @@
         errorLine1="      public Builder setAndroidActivity(androidx.wear.tiles.proto.ActionProto.AndroidActivity value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="791"
             column="14"/>
     </issue>
@@ -1096,7 +1096,7 @@
         errorLine1="      public Builder setAndroidActivity(androidx.wear.tiles.proto.ActionProto.AndroidActivity value) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="791"
             column="41"/>
     </issue>
@@ -1107,7 +1107,7 @@
         errorLine1="      public Builder setAndroidActivity("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="803"
             column="14"/>
     </issue>
@@ -1118,7 +1118,7 @@
         errorLine1="          androidx.wear.tiles.proto.ActionProto.AndroidActivity.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="804"
             column="11"/>
     </issue>
@@ -1129,7 +1129,7 @@
         errorLine1="      public Builder mergeAndroidActivity(androidx.wear.tiles.proto.ActionProto.AndroidActivity value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="816"
             column="14"/>
     </issue>
@@ -1140,7 +1140,7 @@
         errorLine1="      public Builder mergeAndroidActivity(androidx.wear.tiles.proto.ActionProto.AndroidActivity value) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="816"
             column="43"/>
     </issue>
@@ -1151,7 +1151,7 @@
         errorLine1="      public Builder clearAndroidActivity() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="828"
             column="14"/>
     </issue>
@@ -1162,7 +1162,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="837"
             column="21"/>
     </issue>
@@ -1173,7 +1173,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="838"
             column="9"/>
     </issue>
@@ -1184,7 +1184,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="839"
             column="9"/>
     </issue>
@@ -1195,7 +1195,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="839"
             column="32"/>
     </issue>
@@ -1206,7 +1206,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LaunchAction getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="896"
             column="19"/>
     </issue>
@@ -1217,7 +1217,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;LaunchAction> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="902"
             column="19"/>
     </issue>
@@ -1228,7 +1228,7 @@
         errorLine1="    androidx.wear.tiles.proto.StateProto.State getRequestState();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="930"
             column="5"/>
     </issue>
@@ -1239,7 +1239,7 @@
         errorLine1="    public androidx.wear.tiles.proto.StateProto.State getRequestState() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="969"
             column="12"/>
     </issue>
@@ -1250,7 +1250,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1034"
             column="19"/>
     </issue>
@@ -1261,7 +1261,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1035"
             column="9"/>
     </issue>
@@ -1272,7 +1272,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1040"
             column="19"/>
     </issue>
@@ -1283,7 +1283,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1041"
             column="9"/>
     </issue>
@@ -1294,7 +1294,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1042"
             column="9"/>
     </issue>
@@ -1305,7 +1305,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1047"
             column="19"/>
     </issue>
@@ -1316,7 +1316,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1048"
             column="9"/>
     </issue>
@@ -1327,7 +1327,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1053"
             column="19"/>
     </issue>
@@ -1338,7 +1338,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1054"
             column="9"/>
     </issue>
@@ -1349,7 +1349,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1055"
             column="9"/>
     </issue>
@@ -1360,7 +1360,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1060"
             column="19"/>
     </issue>
@@ -1371,7 +1371,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom(byte[] data)"
         errorLine2="                                                                             ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1060"
             column="78"/>
     </issue>
@@ -1382,7 +1382,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1065"
             column="19"/>
     </issue>
@@ -1393,7 +1393,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1066"
             column="9"/>
     </issue>
@@ -1404,7 +1404,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1067"
             column="9"/>
     </issue>
@@ -1415,7 +1415,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1072"
             column="19"/>
     </issue>
@@ -1426,7 +1426,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom(java.io.InputStream input)"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1072"
             column="78"/>
     </issue>
@@ -1437,7 +1437,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1077"
             column="19"/>
     </issue>
@@ -1448,7 +1448,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1078"
             column="9"/>
     </issue>
@@ -1459,7 +1459,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1079"
             column="9"/>
     </issue>
@@ -1470,7 +1470,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1084"
             column="19"/>
     </issue>
@@ -1481,7 +1481,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1084"
             column="87"/>
     </issue>
@@ -1492,7 +1492,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1088"
             column="19"/>
     </issue>
@@ -1503,7 +1503,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1089"
             column="9"/>
     </issue>
@@ -1514,7 +1514,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1090"
             column="9"/>
     </issue>
@@ -1525,7 +1525,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1094"
             column="19"/>
     </issue>
@@ -1536,7 +1536,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1095"
             column="9"/>
     </issue>
@@ -1547,7 +1547,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1100"
             column="19"/>
     </issue>
@@ -1558,7 +1558,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1101"
             column="9"/>
     </issue>
@@ -1569,7 +1569,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1102"
             column="9"/>
     </issue>
@@ -1580,7 +1580,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1108"
             column="19"/>
     </issue>
@@ -1591,7 +1591,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ActionProto.LoadAction prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1111"
             column="19"/>
     </issue>
@@ -1602,7 +1602,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ActionProto.LoadAction prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1111"
             column="38"/>
     </issue>
@@ -1613,7 +1613,7 @@
         errorLine1="      public androidx.wear.tiles.proto.StateProto.State getRequestState() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1154"
             column="14"/>
     </issue>
@@ -1624,7 +1624,7 @@
         errorLine1="      public Builder setRequestState(androidx.wear.tiles.proto.StateProto.State value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1165"
             column="14"/>
     </issue>
@@ -1635,7 +1635,7 @@
         errorLine1="      public Builder setRequestState(androidx.wear.tiles.proto.StateProto.State value) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1165"
             column="38"/>
     </issue>
@@ -1646,7 +1646,7 @@
         errorLine1="      public Builder setRequestState("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1178"
             column="14"/>
     </issue>
@@ -1657,7 +1657,7 @@
         errorLine1="          androidx.wear.tiles.proto.StateProto.State.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1179"
             column="11"/>
     </issue>
@@ -1668,7 +1668,7 @@
         errorLine1="      public Builder mergeRequestState(androidx.wear.tiles.proto.StateProto.State value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1192"
             column="14"/>
     </issue>
@@ -1679,7 +1679,7 @@
         errorLine1="      public Builder mergeRequestState(androidx.wear.tiles.proto.StateProto.State value) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1192"
             column="40"/>
     </issue>
@@ -1690,7 +1690,7 @@
         errorLine1="      public Builder clearRequestState() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1205"
             column="14"/>
     </issue>
@@ -1701,7 +1701,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1214"
             column="21"/>
     </issue>
@@ -1712,7 +1712,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1215"
             column="9"/>
     </issue>
@@ -1723,7 +1723,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1216"
             column="9"/>
     </issue>
@@ -1734,7 +1734,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1216"
             column="32"/>
     </issue>
@@ -1745,7 +1745,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.LoadAction getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1273"
             column="19"/>
     </issue>
@@ -1756,7 +1756,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;LoadAction> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1279"
             column="19"/>
     </issue>
@@ -1767,7 +1767,7 @@
         errorLine1="    androidx.wear.tiles.proto.ActionProto.LaunchAction getLaunchAction();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1297"
             column="5"/>
     </issue>
@@ -1778,7 +1778,7 @@
         errorLine1="    androidx.wear.tiles.proto.ActionProto.LoadAction getLoadAction();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1308"
             column="5"/>
     </issue>
@@ -1789,7 +1789,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ActionProto.Action.ValueCase getValueCase();"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1310"
             column="12"/>
     </issue>
@@ -1800,7 +1800,7 @@
         errorLine1="      public static ValueCase valueOf(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1340"
             column="21"/>
     </issue>
@@ -1811,7 +1811,7 @@
         errorLine1="      public static ValueCase forNumber(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1344"
             column="21"/>
     </issue>
@@ -1822,7 +1822,7 @@
         errorLine1="    public ValueCase"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1358"
             column="12"/>
     </issue>
@@ -1833,7 +1833,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ActionProto.LaunchAction getLaunchAction() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1381"
             column="12"/>
     </issue>
@@ -1844,7 +1844,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ActionProto.LoadAction getLoadAction() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1443"
             column="12"/>
     </issue>
@@ -1855,7 +1855,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1493"
             column="19"/>
     </issue>
@@ -1866,7 +1866,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1494"
             column="9"/>
     </issue>
@@ -1877,7 +1877,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1499"
             column="19"/>
     </issue>
@@ -1888,7 +1888,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1500"
             column="9"/>
     </issue>
@@ -1899,7 +1899,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1501"
             column="9"/>
     </issue>
@@ -1910,7 +1910,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1506"
             column="19"/>
     </issue>
@@ -1921,7 +1921,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1507"
             column="9"/>
     </issue>
@@ -1932,7 +1932,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1512"
             column="19"/>
     </issue>
@@ -1943,7 +1943,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1513"
             column="9"/>
     </issue>
@@ -1954,7 +1954,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1514"
             column="9"/>
     </issue>
@@ -1965,7 +1965,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1519"
             column="19"/>
     </issue>
@@ -1976,7 +1976,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom(byte[] data)"
         errorLine2="                                                                         ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1519"
             column="74"/>
     </issue>
@@ -1987,7 +1987,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1524"
             column="19"/>
     </issue>
@@ -1998,7 +1998,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1525"
             column="9"/>
     </issue>
@@ -2009,7 +2009,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1526"
             column="9"/>
     </issue>
@@ -2020,7 +2020,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1531"
             column="19"/>
     </issue>
@@ -2031,7 +2031,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom(java.io.InputStream input)"
         errorLine2="                                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1531"
             column="74"/>
     </issue>
@@ -2042,7 +2042,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1536"
             column="19"/>
     </issue>
@@ -2053,7 +2053,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1537"
             column="9"/>
     </issue>
@@ -2064,7 +2064,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1538"
             column="9"/>
     </issue>
@@ -2075,7 +2075,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1543"
             column="19"/>
     </issue>
@@ -2086,7 +2086,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1543"
             column="83"/>
     </issue>
@@ -2097,7 +2097,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1547"
             column="19"/>
     </issue>
@@ -2108,7 +2108,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1548"
             column="9"/>
     </issue>
@@ -2119,7 +2119,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1549"
             column="9"/>
     </issue>
@@ -2130,7 +2130,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1553"
             column="19"/>
     </issue>
@@ -2141,7 +2141,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1554"
             column="9"/>
     </issue>
@@ -2152,7 +2152,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1559"
             column="19"/>
     </issue>
@@ -2163,7 +2163,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1560"
             column="9"/>
     </issue>
@@ -2174,7 +2174,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1561"
             column="9"/>
     </issue>
@@ -2185,7 +2185,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1567"
             column="19"/>
     </issue>
@@ -2196,7 +2196,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ActionProto.Action prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1570"
             column="19"/>
     </issue>
@@ -2207,7 +2207,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ActionProto.Action prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1570"
             column="38"/>
     </issue>
@@ -2218,7 +2218,7 @@
         errorLine1="      public ValueCase"
         errorLine2="             ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1592"
             column="14"/>
     </issue>
@@ -2229,7 +2229,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1597"
             column="14"/>
     </issue>
@@ -2240,7 +2240,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ActionProto.LaunchAction getLaunchAction() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1615"
             column="14"/>
     </issue>
@@ -2251,7 +2251,7 @@
         errorLine1="      public Builder setLaunchAction(androidx.wear.tiles.proto.ActionProto.LaunchAction value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1621"
             column="14"/>
     </issue>
@@ -2262,7 +2262,7 @@
         errorLine1="      public Builder setLaunchAction(androidx.wear.tiles.proto.ActionProto.LaunchAction value) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1621"
             column="38"/>
     </issue>
@@ -2273,7 +2273,7 @@
         errorLine1="      public Builder setLaunchAction("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1629"
             column="14"/>
     </issue>
@@ -2284,7 +2284,7 @@
         errorLine1="          androidx.wear.tiles.proto.ActionProto.LaunchAction.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1630"
             column="11"/>
     </issue>
@@ -2295,7 +2295,7 @@
         errorLine1="      public Builder mergeLaunchAction(androidx.wear.tiles.proto.ActionProto.LaunchAction value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1638"
             column="14"/>
     </issue>
@@ -2306,7 +2306,7 @@
         errorLine1="      public Builder mergeLaunchAction(androidx.wear.tiles.proto.ActionProto.LaunchAction value) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1638"
             column="40"/>
     </issue>
@@ -2317,7 +2317,7 @@
         errorLine1="      public Builder clearLaunchAction() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1646"
             column="14"/>
     </issue>
@@ -2328,7 +2328,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ActionProto.LoadAction getLoadAction() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1663"
             column="14"/>
     </issue>
@@ -2339,7 +2339,7 @@
         errorLine1="      public Builder setLoadAction(androidx.wear.tiles.proto.ActionProto.LoadAction value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1669"
             column="14"/>
     </issue>
@@ -2350,7 +2350,7 @@
         errorLine1="      public Builder setLoadAction(androidx.wear.tiles.proto.ActionProto.LoadAction value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1669"
             column="36"/>
     </issue>
@@ -2361,7 +2361,7 @@
         errorLine1="      public Builder setLoadAction("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1677"
             column="14"/>
     </issue>
@@ -2372,7 +2372,7 @@
         errorLine1="          androidx.wear.tiles.proto.ActionProto.LoadAction.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1678"
             column="11"/>
     </issue>
@@ -2383,7 +2383,7 @@
         errorLine1="      public Builder mergeLoadAction(androidx.wear.tiles.proto.ActionProto.LoadAction value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1686"
             column="14"/>
     </issue>
@@ -2394,7 +2394,7 @@
         errorLine1="      public Builder mergeLoadAction(androidx.wear.tiles.proto.ActionProto.LoadAction value) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1686"
             column="38"/>
     </issue>
@@ -2405,7 +2405,7 @@
         errorLine1="      public Builder clearLoadAction() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1694"
             column="14"/>
     </issue>
@@ -2416,7 +2416,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1704"
             column="21"/>
     </issue>
@@ -2427,7 +2427,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1705"
             column="9"/>
     </issue>
@@ -2438,7 +2438,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1706"
             column="9"/>
     </issue>
@@ -2449,7 +2449,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1706"
             column="32"/>
     </issue>
@@ -2460,7 +2460,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ActionProto.Action getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1767"
             column="19"/>
     </issue>
@@ -2471,7 +2471,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Action> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ActionProto.java"
             line="1773"
             column="19"/>
     </issue>
@@ -2482,7 +2482,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -2493,7 +2493,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="77"
             column="19"/>
     </issue>
@@ -2504,7 +2504,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="78"
             column="9"/>
     </issue>
@@ -2515,7 +2515,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="83"
             column="19"/>
     </issue>
@@ -2526,7 +2526,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="84"
             column="9"/>
     </issue>
@@ -2537,7 +2537,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="85"
             column="9"/>
     </issue>
@@ -2548,7 +2548,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="90"
             column="19"/>
     </issue>
@@ -2559,7 +2559,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="91"
             column="9"/>
     </issue>
@@ -2570,7 +2570,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="96"
             column="19"/>
     </issue>
@@ -2581,7 +2581,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="97"
             column="9"/>
     </issue>
@@ -2592,7 +2592,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="98"
             column="9"/>
     </issue>
@@ -2603,7 +2603,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="103"
             column="19"/>
     </issue>
@@ -2614,7 +2614,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom(byte[] data)"
         errorLine2="                                                                           ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="103"
             column="76"/>
     </issue>
@@ -2625,7 +2625,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="108"
             column="19"/>
     </issue>
@@ -2636,7 +2636,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="109"
             column="9"/>
     </issue>
@@ -2647,7 +2647,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="110"
             column="9"/>
     </issue>
@@ -2658,7 +2658,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="115"
             column="19"/>
     </issue>
@@ -2669,7 +2669,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="115"
             column="76"/>
     </issue>
@@ -2680,7 +2680,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="120"
             column="19"/>
     </issue>
@@ -2691,7 +2691,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="121"
             column="9"/>
     </issue>
@@ -2702,7 +2702,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="122"
             column="9"/>
     </issue>
@@ -2713,7 +2713,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="127"
             column="19"/>
     </issue>
@@ -2724,7 +2724,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="127"
             column="85"/>
     </issue>
@@ -2735,7 +2735,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="131"
             column="19"/>
     </issue>
@@ -2746,7 +2746,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="132"
             column="9"/>
     </issue>
@@ -2757,7 +2757,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="133"
             column="9"/>
     </issue>
@@ -2768,7 +2768,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="137"
             column="19"/>
     </issue>
@@ -2779,7 +2779,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="138"
             column="9"/>
     </issue>
@@ -2790,7 +2790,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="143"
             column="19"/>
     </issue>
@@ -2801,7 +2801,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="144"
             column="9"/>
     </issue>
@@ -2812,7 +2812,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="145"
             column="9"/>
     </issue>
@@ -2823,7 +2823,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="151"
             column="19"/>
     </issue>
@@ -2834,7 +2834,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ColorProto.ColorProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="154"
             column="19"/>
     </issue>
@@ -2845,7 +2845,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ColorProto.ColorProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="154"
             column="38"/>
     </issue>
@@ -2856,7 +2856,7 @@
         errorLine1="      public Builder setArgb(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="197"
             column="14"/>
     </issue>
@@ -2867,7 +2867,7 @@
         errorLine1="      public Builder clearArgb() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="210"
             column="14"/>
     </issue>
@@ -2878,7 +2878,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="220"
             column="21"/>
     </issue>
@@ -2889,7 +2889,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="221"
             column="9"/>
     </issue>
@@ -2900,7 +2900,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="222"
             column="9"/>
     </issue>
@@ -2911,7 +2911,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="222"
             column="32"/>
     </issue>
@@ -2922,7 +2922,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ColorProto.ColorProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="279"
             column="19"/>
     </issue>
@@ -2933,7 +2933,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ColorProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ColorProto.java"
             line="285"
             column="19"/>
     </issue>
@@ -2944,7 +2944,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -2955,7 +2955,7 @@
         errorLine1="    public static DevicePlatform valueOf(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="72"
             column="19"/>
     </issue>
@@ -2966,7 +2966,7 @@
         errorLine1="    public static DevicePlatform forNumber(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="76"
             column="19"/>
     </issue>
@@ -2977,7 +2977,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumLiteMap&lt;DevicePlatform>"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="84"
             column="19"/>
     </issue>
@@ -2988,7 +2988,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumVerifier "
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="97"
             column="19"/>
     </issue>
@@ -2999,7 +2999,7 @@
         errorLine1="    public static ScreenShape valueOf(int value) {"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="197"
             column="19"/>
     </issue>
@@ -3010,7 +3010,7 @@
         errorLine1="    public static ScreenShape forNumber(int value) {"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="201"
             column="19"/>
     </issue>
@@ -3021,7 +3021,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumLiteMap&lt;ScreenShape>"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="210"
             column="19"/>
     </issue>
@@ -3032,7 +3032,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumVerifier "
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="223"
             column="19"/>
     </issue>
@@ -3043,7 +3043,7 @@
         errorLine1="    androidx.wear.tiles.proto.DeviceParametersProto.DevicePlatform getDevicePlatform();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="298"
             column="5"/>
     </issue>
@@ -3054,7 +3054,7 @@
         errorLine1="    androidx.wear.tiles.proto.DeviceParametersProto.ScreenShape getScreenShape();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="317"
             column="5"/>
     </issue>
@@ -3065,7 +3065,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DeviceParametersProto.DevicePlatform getDevicePlatform() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="475"
             column="12"/>
     </issue>
@@ -3076,7 +3076,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DeviceParametersProto.ScreenShape getScreenShape() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="540"
             column="12"/>
     </issue>
@@ -3087,7 +3087,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="582"
             column="19"/>
     </issue>
@@ -3098,7 +3098,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="583"
             column="9"/>
     </issue>
@@ -3109,7 +3109,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="588"
             column="19"/>
     </issue>
@@ -3120,7 +3120,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="589"
             column="9"/>
     </issue>
@@ -3131,7 +3131,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="590"
             column="9"/>
     </issue>
@@ -3142,7 +3142,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="595"
             column="19"/>
     </issue>
@@ -3153,7 +3153,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="596"
             column="9"/>
     </issue>
@@ -3164,7 +3164,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="601"
             column="19"/>
     </issue>
@@ -3175,7 +3175,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="602"
             column="9"/>
     </issue>
@@ -3186,7 +3186,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="603"
             column="9"/>
     </issue>
@@ -3197,7 +3197,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="608"
             column="19"/>
     </issue>
@@ -3208,7 +3208,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom(byte[] data)"
         errorLine2="                                                                                             ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="608"
             column="94"/>
     </issue>
@@ -3219,7 +3219,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="613"
             column="19"/>
     </issue>
@@ -3230,7 +3230,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="614"
             column="9"/>
     </issue>
@@ -3241,7 +3241,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="615"
             column="9"/>
     </issue>
@@ -3252,7 +3252,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="620"
             column="19"/>
     </issue>
@@ -3263,7 +3263,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="620"
             column="94"/>
     </issue>
@@ -3274,7 +3274,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="625"
             column="19"/>
     </issue>
@@ -3285,7 +3285,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="626"
             column="9"/>
     </issue>
@@ -3296,7 +3296,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="627"
             column="9"/>
     </issue>
@@ -3307,7 +3307,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="632"
             column="19"/>
     </issue>
@@ -3318,7 +3318,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="632"
             column="103"/>
     </issue>
@@ -3329,7 +3329,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="636"
             column="19"/>
     </issue>
@@ -3340,7 +3340,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="637"
             column="9"/>
     </issue>
@@ -3351,7 +3351,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="638"
             column="9"/>
     </issue>
@@ -3362,7 +3362,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="642"
             column="19"/>
     </issue>
@@ -3373,7 +3373,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="643"
             column="9"/>
     </issue>
@@ -3384,7 +3384,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="648"
             column="19"/>
     </issue>
@@ -3395,7 +3395,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="649"
             column="9"/>
     </issue>
@@ -3406,7 +3406,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="650"
             column="9"/>
     </issue>
@@ -3417,7 +3417,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="656"
             column="19"/>
     </issue>
@@ -3428,7 +3428,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="659"
             column="19"/>
     </issue>
@@ -3439,7 +3439,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="659"
             column="38"/>
     </issue>
@@ -3450,7 +3450,7 @@
         errorLine1="      public Builder setScreenWidthDp(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="704"
             column="14"/>
     </issue>
@@ -3461,7 +3461,7 @@
         errorLine1="      public Builder clearScreenWidthDp() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="717"
             column="14"/>
     </issue>
@@ -3472,7 +3472,7 @@
         errorLine1="      public Builder setScreenHeightDp(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="744"
             column="14"/>
     </issue>
@@ -3483,7 +3483,7 @@
         errorLine1="      public Builder clearScreenHeightDp() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="757"
             column="14"/>
     </issue>
@@ -3494,7 +3494,7 @@
         errorLine1="      public Builder setScreenDensity(float value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="786"
             column="14"/>
     </issue>
@@ -3505,7 +3505,7 @@
         errorLine1="      public Builder clearScreenDensity() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="800"
             column="14"/>
     </issue>
@@ -3516,7 +3516,7 @@
         errorLine1="      public Builder setDevicePlatformValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="827"
             column="14"/>
     </issue>
@@ -3527,7 +3527,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DeviceParametersProto.DevicePlatform getDevicePlatform() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="841"
             column="14"/>
     </issue>
@@ -3538,7 +3538,7 @@
         errorLine1="      public Builder setDevicePlatform(androidx.wear.tiles.proto.DeviceParametersProto.DevicePlatform value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="853"
             column="14"/>
     </issue>
@@ -3549,7 +3549,7 @@
         errorLine1="      public Builder setDevicePlatform(androidx.wear.tiles.proto.DeviceParametersProto.DevicePlatform value) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="853"
             column="40"/>
     </issue>
@@ -3560,7 +3560,7 @@
         errorLine1="      public Builder clearDevicePlatform() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="866"
             column="14"/>
     </issue>
@@ -3571,7 +3571,7 @@
         errorLine1="      public Builder setScreenShapeValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="893"
             column="14"/>
     </issue>
@@ -3582,7 +3582,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DeviceParametersProto.ScreenShape getScreenShape() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="907"
             column="14"/>
     </issue>
@@ -3593,7 +3593,7 @@
         errorLine1="      public Builder setScreenShape(androidx.wear.tiles.proto.DeviceParametersProto.ScreenShape value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="919"
             column="14"/>
     </issue>
@@ -3604,7 +3604,7 @@
         errorLine1="      public Builder setScreenShape(androidx.wear.tiles.proto.DeviceParametersProto.ScreenShape value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="919"
             column="37"/>
     </issue>
@@ -3615,7 +3615,7 @@
         errorLine1="      public Builder clearScreenShape() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="932"
             column="14"/>
     </issue>
@@ -3626,7 +3626,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="942"
             column="21"/>
     </issue>
@@ -3637,7 +3637,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="943"
             column="9"/>
     </issue>
@@ -3648,7 +3648,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="944"
             column="9"/>
     </issue>
@@ -3659,7 +3659,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="944"
             column="32"/>
     </issue>
@@ -3670,7 +3670,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="1006"
             column="19"/>
     </issue>
@@ -3681,7 +3681,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;DeviceParameters> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DeviceParametersProto.java"
             line="1012"
             column="19"/>
     </issue>
@@ -3692,7 +3692,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -3703,7 +3703,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="77"
             column="19"/>
     </issue>
@@ -3714,7 +3714,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="78"
             column="9"/>
     </issue>
@@ -3725,7 +3725,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="83"
             column="19"/>
     </issue>
@@ -3736,7 +3736,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="84"
             column="9"/>
     </issue>
@@ -3747,7 +3747,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="85"
             column="9"/>
     </issue>
@@ -3758,7 +3758,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="90"
             column="19"/>
     </issue>
@@ -3769,7 +3769,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="91"
             column="9"/>
     </issue>
@@ -3780,7 +3780,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="96"
             column="19"/>
     </issue>
@@ -3791,7 +3791,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="97"
             column="9"/>
     </issue>
@@ -3802,7 +3802,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="98"
             column="9"/>
     </issue>
@@ -3813,7 +3813,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="103"
             column="19"/>
     </issue>
@@ -3824,7 +3824,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom(byte[] data)"
         errorLine2="                                                                            ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="103"
             column="77"/>
     </issue>
@@ -3835,7 +3835,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="108"
             column="19"/>
     </issue>
@@ -3846,7 +3846,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="109"
             column="9"/>
     </issue>
@@ -3857,7 +3857,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="110"
             column="9"/>
     </issue>
@@ -3868,7 +3868,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="115"
             column="19"/>
     </issue>
@@ -3879,7 +3879,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="115"
             column="77"/>
     </issue>
@@ -3890,7 +3890,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="120"
             column="19"/>
     </issue>
@@ -3901,7 +3901,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="121"
             column="9"/>
     </issue>
@@ -3912,7 +3912,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="122"
             column="9"/>
     </issue>
@@ -3923,7 +3923,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="127"
             column="19"/>
     </issue>
@@ -3934,7 +3934,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="127"
             column="86"/>
     </issue>
@@ -3945,7 +3945,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="131"
             column="19"/>
     </issue>
@@ -3956,7 +3956,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="132"
             column="9"/>
     </issue>
@@ -3967,7 +3967,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="133"
             column="9"/>
     </issue>
@@ -3978,7 +3978,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="137"
             column="19"/>
     </issue>
@@ -3989,7 +3989,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="138"
             column="9"/>
     </issue>
@@ -4000,7 +4000,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="143"
             column="19"/>
     </issue>
@@ -4011,7 +4011,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="144"
             column="9"/>
     </issue>
@@ -4022,7 +4022,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="145"
             column="9"/>
     </issue>
@@ -4033,7 +4033,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="151"
             column="19"/>
     </issue>
@@ -4044,7 +4044,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.DpProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="154"
             column="19"/>
     </issue>
@@ -4055,7 +4055,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.DpProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="154"
             column="38"/>
     </issue>
@@ -4066,7 +4066,7 @@
         errorLine1="      public Builder setValue(float value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="197"
             column="14"/>
     </issue>
@@ -4077,7 +4077,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="210"
             column="14"/>
     </issue>
@@ -4088,7 +4088,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="220"
             column="21"/>
     </issue>
@@ -4099,7 +4099,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="221"
             column="9"/>
     </issue>
@@ -4110,7 +4110,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="222"
             column="9"/>
     </issue>
@@ -4121,7 +4121,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="222"
             column="32"/>
     </issue>
@@ -4132,7 +4132,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DpProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="279"
             column="19"/>
     </issue>
@@ -4143,7 +4143,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;DpProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="285"
             column="19"/>
     </issue>
@@ -4154,7 +4154,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="356"
             column="19"/>
     </issue>
@@ -4165,7 +4165,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="357"
             column="9"/>
     </issue>
@@ -4176,7 +4176,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="362"
             column="19"/>
     </issue>
@@ -4187,7 +4187,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="363"
             column="9"/>
     </issue>
@@ -4198,7 +4198,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="364"
             column="9"/>
     </issue>
@@ -4209,7 +4209,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="369"
             column="19"/>
     </issue>
@@ -4220,7 +4220,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="370"
             column="9"/>
     </issue>
@@ -4231,7 +4231,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="375"
             column="19"/>
     </issue>
@@ -4242,7 +4242,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="376"
             column="9"/>
     </issue>
@@ -4253,7 +4253,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="377"
             column="9"/>
     </issue>
@@ -4264,7 +4264,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="382"
             column="19"/>
     </issue>
@@ -4275,7 +4275,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(byte[] data)"
         errorLine2="                                                                            ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="382"
             column="77"/>
     </issue>
@@ -4286,7 +4286,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="387"
             column="19"/>
     </issue>
@@ -4297,7 +4297,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="388"
             column="9"/>
     </issue>
@@ -4308,7 +4308,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="389"
             column="9"/>
     </issue>
@@ -4319,7 +4319,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="394"
             column="19"/>
     </issue>
@@ -4330,7 +4330,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="394"
             column="77"/>
     </issue>
@@ -4341,7 +4341,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="399"
             column="19"/>
     </issue>
@@ -4352,7 +4352,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="400"
             column="9"/>
     </issue>
@@ -4363,7 +4363,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="401"
             column="9"/>
     </issue>
@@ -4374,7 +4374,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="406"
             column="19"/>
     </issue>
@@ -4385,7 +4385,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="406"
             column="86"/>
     </issue>
@@ -4396,7 +4396,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="410"
             column="19"/>
     </issue>
@@ -4407,7 +4407,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="411"
             column="9"/>
     </issue>
@@ -4418,7 +4418,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="412"
             column="9"/>
     </issue>
@@ -4429,7 +4429,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="416"
             column="19"/>
     </issue>
@@ -4440,7 +4440,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="417"
             column="9"/>
     </issue>
@@ -4451,7 +4451,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="422"
             column="19"/>
     </issue>
@@ -4462,7 +4462,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="423"
             column="9"/>
     </issue>
@@ -4473,7 +4473,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="424"
             column="9"/>
     </issue>
@@ -4484,7 +4484,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="430"
             column="19"/>
     </issue>
@@ -4495,7 +4495,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.SpProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="433"
             column="19"/>
     </issue>
@@ -4506,7 +4506,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.SpProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="433"
             column="38"/>
     </issue>
@@ -4514,10 +4514,10 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      public Builder setValue(int value) {"
+        errorLine1="      public Builder setValue(float value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="476"
             column="14"/>
     </issue>
@@ -4528,7 +4528,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="489"
             column="14"/>
     </issue>
@@ -4539,7 +4539,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="499"
             column="21"/>
     </issue>
@@ -4550,7 +4550,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="500"
             column="9"/>
     </issue>
@@ -4561,7 +4561,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="501"
             column="9"/>
     </issue>
@@ -4572,7 +4572,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="501"
             column="32"/>
     </issue>
@@ -4583,7 +4583,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="558"
             column="19"/>
     </issue>
@@ -4594,7 +4594,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;SpProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="564"
             column="19"/>
     </issue>
@@ -4605,7 +4605,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="635"
             column="19"/>
     </issue>
@@ -4616,7 +4616,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="636"
             column="9"/>
     </issue>
@@ -4627,7 +4627,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="641"
             column="19"/>
     </issue>
@@ -4638,7 +4638,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="642"
             column="9"/>
     </issue>
@@ -4649,7 +4649,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="643"
             column="9"/>
     </issue>
@@ -4660,7 +4660,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="648"
             column="19"/>
     </issue>
@@ -4671,7 +4671,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="649"
             column="9"/>
     </issue>
@@ -4682,7 +4682,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="654"
             column="19"/>
     </issue>
@@ -4693,7 +4693,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="655"
             column="9"/>
     </issue>
@@ -4704,7 +4704,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="656"
             column="9"/>
     </issue>
@@ -4715,7 +4715,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="661"
             column="19"/>
     </issue>
@@ -4726,7 +4726,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom(byte[] data)"
         errorLine2="                                                                            ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="661"
             column="77"/>
     </issue>
@@ -4737,7 +4737,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="666"
             column="19"/>
     </issue>
@@ -4748,7 +4748,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="667"
             column="9"/>
     </issue>
@@ -4759,7 +4759,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="668"
             column="9"/>
     </issue>
@@ -4770,7 +4770,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="673"
             column="19"/>
     </issue>
@@ -4781,7 +4781,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="673"
             column="77"/>
     </issue>
@@ -4792,7 +4792,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="678"
             column="19"/>
     </issue>
@@ -4803,7 +4803,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="679"
             column="9"/>
     </issue>
@@ -4814,7 +4814,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="680"
             column="9"/>
     </issue>
@@ -4825,7 +4825,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="685"
             column="19"/>
     </issue>
@@ -4836,7 +4836,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="685"
             column="86"/>
     </issue>
@@ -4847,7 +4847,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="689"
             column="19"/>
     </issue>
@@ -4858,7 +4858,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="690"
             column="9"/>
     </issue>
@@ -4869,7 +4869,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="691"
             column="9"/>
     </issue>
@@ -4880,7 +4880,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="695"
             column="19"/>
     </issue>
@@ -4891,7 +4891,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="696"
             column="9"/>
     </issue>
@@ -4902,7 +4902,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="701"
             column="19"/>
     </issue>
@@ -4913,7 +4913,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="702"
             column="9"/>
     </issue>
@@ -4924,7 +4924,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="703"
             column="9"/>
     </issue>
@@ -4935,7 +4935,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="709"
             column="19"/>
     </issue>
@@ -4946,7 +4946,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.EmProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="712"
             column="19"/>
     </issue>
@@ -4957,7 +4957,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.EmProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="712"
             column="38"/>
     </issue>
@@ -4968,7 +4968,7 @@
         errorLine1="      public Builder setValue(float value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="755"
             column="14"/>
     </issue>
@@ -4979,7 +4979,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="768"
             column="14"/>
     </issue>
@@ -4990,7 +4990,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="778"
             column="21"/>
     </issue>
@@ -5001,7 +5001,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="779"
             column="9"/>
     </issue>
@@ -5012,7 +5012,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="780"
             column="9"/>
     </issue>
@@ -5023,7 +5023,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="780"
             column="32"/>
     </issue>
@@ -5034,7 +5034,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.EmProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="837"
             column="19"/>
     </issue>
@@ -5045,7 +5045,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;EmProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="843"
             column="19"/>
     </issue>
@@ -5056,7 +5056,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="914"
             column="19"/>
     </issue>
@@ -5067,7 +5067,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="915"
             column="9"/>
     </issue>
@@ -5078,7 +5078,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="920"
             column="19"/>
     </issue>
@@ -5089,7 +5089,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="921"
             column="9"/>
     </issue>
@@ -5100,7 +5100,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="922"
             column="9"/>
     </issue>
@@ -5111,7 +5111,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="927"
             column="19"/>
     </issue>
@@ -5122,7 +5122,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="928"
             column="9"/>
     </issue>
@@ -5133,7 +5133,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="933"
             column="19"/>
     </issue>
@@ -5144,7 +5144,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="934"
             column="9"/>
     </issue>
@@ -5155,7 +5155,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="935"
             column="9"/>
     </issue>
@@ -5166,7 +5166,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="940"
             column="19"/>
     </issue>
@@ -5177,7 +5177,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom(byte[] data)"
         errorLine2="                                                                                 ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="940"
             column="82"/>
     </issue>
@@ -5188,7 +5188,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="945"
             column="19"/>
     </issue>
@@ -5199,7 +5199,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="946"
             column="9"/>
     </issue>
@@ -5210,7 +5210,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="947"
             column="9"/>
     </issue>
@@ -5221,7 +5221,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="952"
             column="19"/>
     </issue>
@@ -5232,7 +5232,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="952"
             column="82"/>
     </issue>
@@ -5243,7 +5243,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="957"
             column="19"/>
     </issue>
@@ -5254,7 +5254,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="958"
             column="9"/>
     </issue>
@@ -5265,7 +5265,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="959"
             column="9"/>
     </issue>
@@ -5276,7 +5276,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="964"
             column="19"/>
     </issue>
@@ -5287,7 +5287,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="964"
             column="91"/>
     </issue>
@@ -5298,7 +5298,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="968"
             column="19"/>
     </issue>
@@ -5309,7 +5309,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="969"
             column="9"/>
     </issue>
@@ -5320,7 +5320,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="970"
             column="9"/>
     </issue>
@@ -5331,7 +5331,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="974"
             column="19"/>
     </issue>
@@ -5342,7 +5342,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="975"
             column="9"/>
     </issue>
@@ -5353,7 +5353,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="980"
             column="19"/>
     </issue>
@@ -5364,7 +5364,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="981"
             column="9"/>
     </issue>
@@ -5375,7 +5375,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="982"
             column="9"/>
     </issue>
@@ -5386,7 +5386,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="988"
             column="19"/>
     </issue>
@@ -5397,7 +5397,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.DegreesProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="991"
             column="19"/>
     </issue>
@@ -5408,7 +5408,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.DegreesProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="991"
             column="38"/>
     </issue>
@@ -5419,7 +5419,7 @@
         errorLine1="      public Builder setValue(float value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1034"
             column="14"/>
     </issue>
@@ -5430,7 +5430,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1047"
             column="14"/>
     </issue>
@@ -5441,7 +5441,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1057"
             column="21"/>
     </issue>
@@ -5452,7 +5452,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1058"
             column="9"/>
     </issue>
@@ -5463,7 +5463,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1059"
             column="9"/>
     </issue>
@@ -5474,7 +5474,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1059"
             column="32"/>
     </issue>
@@ -5485,7 +5485,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.DegreesProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1116"
             column="19"/>
     </issue>
@@ -5496,7 +5496,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;DegreesProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1122"
             column="19"/>
     </issue>
@@ -5507,7 +5507,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1146"
             column="19"/>
     </issue>
@@ -5518,7 +5518,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1147"
             column="9"/>
     </issue>
@@ -5529,7 +5529,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1152"
             column="19"/>
     </issue>
@@ -5540,7 +5540,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1153"
             column="9"/>
     </issue>
@@ -5551,7 +5551,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1154"
             column="9"/>
     </issue>
@@ -5562,7 +5562,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1159"
             column="19"/>
     </issue>
@@ -5573,7 +5573,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1160"
             column="9"/>
     </issue>
@@ -5584,7 +5584,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1165"
             column="19"/>
     </issue>
@@ -5595,7 +5595,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1166"
             column="9"/>
     </issue>
@@ -5606,7 +5606,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1167"
             column="9"/>
     </issue>
@@ -5617,7 +5617,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1172"
             column="19"/>
     </issue>
@@ -5628,7 +5628,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom(byte[] data)"
         errorLine2="                                                                                           ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1172"
             column="92"/>
     </issue>
@@ -5639,7 +5639,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1177"
             column="19"/>
     </issue>
@@ -5650,7 +5650,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1178"
             column="9"/>
     </issue>
@@ -5661,7 +5661,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1179"
             column="9"/>
     </issue>
@@ -5672,7 +5672,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1184"
             column="19"/>
     </issue>
@@ -5683,7 +5683,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1184"
             column="92"/>
     </issue>
@@ -5694,7 +5694,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1189"
             column="19"/>
     </issue>
@@ -5705,7 +5705,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1190"
             column="9"/>
     </issue>
@@ -5716,7 +5716,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1191"
             column="9"/>
     </issue>
@@ -5727,7 +5727,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1196"
             column="19"/>
     </issue>
@@ -5738,7 +5738,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1196"
             column="101"/>
     </issue>
@@ -5749,7 +5749,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1200"
             column="19"/>
     </issue>
@@ -5760,7 +5760,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1201"
             column="9"/>
     </issue>
@@ -5771,7 +5771,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1202"
             column="9"/>
     </issue>
@@ -5782,7 +5782,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1206"
             column="19"/>
     </issue>
@@ -5793,7 +5793,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1207"
             column="9"/>
     </issue>
@@ -5804,7 +5804,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1212"
             column="19"/>
     </issue>
@@ -5815,7 +5815,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1213"
             column="9"/>
     </issue>
@@ -5826,7 +5826,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1214"
             column="9"/>
     </issue>
@@ -5837,7 +5837,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1220"
             column="19"/>
     </issue>
@@ -5848,7 +5848,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1223"
             column="19"/>
     </issue>
@@ -5859,7 +5859,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1223"
             column="38"/>
     </issue>
@@ -5870,7 +5870,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1250"
             column="21"/>
     </issue>
@@ -5881,7 +5881,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1251"
             column="9"/>
     </issue>
@@ -5892,7 +5892,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1252"
             column="9"/>
     </issue>
@@ -5903,7 +5903,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1252"
             column="32"/>
     </issue>
@@ -5914,7 +5914,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1306"
             column="19"/>
     </issue>
@@ -5925,7 +5925,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ExpandedDimensionProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1312"
             column="19"/>
     </issue>
@@ -5936,7 +5936,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1336"
             column="19"/>
     </issue>
@@ -5947,7 +5947,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1337"
             column="9"/>
     </issue>
@@ -5958,7 +5958,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1342"
             column="19"/>
     </issue>
@@ -5969,7 +5969,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1343"
             column="9"/>
     </issue>
@@ -5980,7 +5980,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1344"
             column="9"/>
     </issue>
@@ -5991,7 +5991,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1349"
             column="19"/>
     </issue>
@@ -6002,7 +6002,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1350"
             column="9"/>
     </issue>
@@ -6013,7 +6013,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1355"
             column="19"/>
     </issue>
@@ -6024,7 +6024,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1356"
             column="9"/>
     </issue>
@@ -6035,7 +6035,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1357"
             column="9"/>
     </issue>
@@ -6046,7 +6046,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1362"
             column="19"/>
     </issue>
@@ -6057,7 +6057,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom(byte[] data)"
         errorLine2="                                                                                          ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1362"
             column="91"/>
     </issue>
@@ -6068,7 +6068,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1367"
             column="19"/>
     </issue>
@@ -6079,7 +6079,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1368"
             column="9"/>
     </issue>
@@ -6090,7 +6090,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1369"
             column="9"/>
     </issue>
@@ -6101,7 +6101,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1374"
             column="19"/>
     </issue>
@@ -6112,7 +6112,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1374"
             column="91"/>
     </issue>
@@ -6123,7 +6123,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1379"
             column="19"/>
     </issue>
@@ -6134,7 +6134,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1380"
             column="9"/>
     </issue>
@@ -6145,7 +6145,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1381"
             column="9"/>
     </issue>
@@ -6156,7 +6156,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1386"
             column="19"/>
     </issue>
@@ -6167,7 +6167,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1386"
             column="100"/>
     </issue>
@@ -6178,7 +6178,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1390"
             column="19"/>
     </issue>
@@ -6189,7 +6189,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1391"
             column="9"/>
     </issue>
@@ -6200,7 +6200,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1392"
             column="9"/>
     </issue>
@@ -6211,7 +6211,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1396"
             column="19"/>
     </issue>
@@ -6222,7 +6222,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1397"
             column="9"/>
     </issue>
@@ -6233,7 +6233,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1402"
             column="19"/>
     </issue>
@@ -6244,7 +6244,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1403"
             column="9"/>
     </issue>
@@ -6255,7 +6255,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1404"
             column="9"/>
     </issue>
@@ -6266,7 +6266,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1410"
             column="19"/>
     </issue>
@@ -6277,7 +6277,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1413"
             column="19"/>
     </issue>
@@ -6288,7 +6288,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1413"
             column="38"/>
     </issue>
@@ -6299,7 +6299,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1440"
             column="21"/>
     </issue>
@@ -6310,7 +6310,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1441"
             column="9"/>
     </issue>
@@ -6321,7 +6321,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1442"
             column="9"/>
     </issue>
@@ -6332,7 +6332,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1442"
             column="32"/>
     </issue>
@@ -6343,7 +6343,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1496"
             column="19"/>
     </issue>
@@ -6354,7 +6354,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;WrappedDimensionProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1502"
             column="19"/>
     </issue>
@@ -6365,7 +6365,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1628"
             column="19"/>
     </issue>
@@ -6376,7 +6376,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1629"
             column="9"/>
     </issue>
@@ -6387,7 +6387,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1634"
             column="19"/>
     </issue>
@@ -6398,7 +6398,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1635"
             column="9"/>
     </issue>
@@ -6409,7 +6409,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1636"
             column="9"/>
     </issue>
@@ -6420,7 +6420,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1641"
             column="19"/>
     </issue>
@@ -6431,7 +6431,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1642"
             column="9"/>
     </issue>
@@ -6442,7 +6442,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1647"
             column="19"/>
     </issue>
@@ -6453,7 +6453,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1648"
             column="9"/>
     </issue>
@@ -6464,7 +6464,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1649"
             column="9"/>
     </issue>
@@ -6475,7 +6475,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1654"
             column="19"/>
     </issue>
@@ -6486,7 +6486,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom(byte[] data)"
         errorLine2="                                                                                               ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1654"
             column="96"/>
     </issue>
@@ -6497,7 +6497,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1659"
             column="19"/>
     </issue>
@@ -6508,7 +6508,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1660"
             column="9"/>
     </issue>
@@ -6519,7 +6519,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1661"
             column="9"/>
     </issue>
@@ -6530,7 +6530,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1666"
             column="19"/>
     </issue>
@@ -6541,7 +6541,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1666"
             column="96"/>
     </issue>
@@ -6552,7 +6552,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1671"
             column="19"/>
     </issue>
@@ -6563,7 +6563,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1672"
             column="9"/>
     </issue>
@@ -6574,7 +6574,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1673"
             column="9"/>
     </issue>
@@ -6585,7 +6585,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1678"
             column="19"/>
     </issue>
@@ -6596,7 +6596,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1678"
             column="105"/>
     </issue>
@@ -6607,7 +6607,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1682"
             column="19"/>
     </issue>
@@ -6618,7 +6618,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1683"
             column="9"/>
     </issue>
@@ -6629,7 +6629,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1684"
             column="9"/>
     </issue>
@@ -6640,7 +6640,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1688"
             column="19"/>
     </issue>
@@ -6651,7 +6651,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1689"
             column="9"/>
     </issue>
@@ -6662,7 +6662,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1694"
             column="19"/>
     </issue>
@@ -6673,7 +6673,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1695"
             column="9"/>
     </issue>
@@ -6684,7 +6684,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1696"
             column="9"/>
     </issue>
@@ -6695,7 +6695,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1702"
             column="19"/>
     </issue>
@@ -6706,7 +6706,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1705"
             column="19"/>
     </issue>
@@ -6717,7 +6717,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1705"
             column="38"/>
     </issue>
@@ -6728,7 +6728,7 @@
         errorLine1="      public Builder setAspectRatioWidth(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1755"
             column="14"/>
     </issue>
@@ -6739,7 +6739,7 @@
         errorLine1="      public Builder clearAspectRatioWidth() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1768"
             column="14"/>
     </issue>
@@ -6750,7 +6750,7 @@
         errorLine1="      public Builder setAspectRatioHeight(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1795"
             column="14"/>
     </issue>
@@ -6761,7 +6761,7 @@
         errorLine1="      public Builder clearAspectRatioHeight() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1808"
             column="14"/>
     </issue>
@@ -6772,7 +6772,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1818"
             column="21"/>
     </issue>
@@ -6783,7 +6783,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1819"
             column="9"/>
     </issue>
@@ -6794,7 +6794,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1820"
             column="9"/>
     </issue>
@@ -6805,7 +6805,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1820"
             column="32"/>
     </issue>
@@ -6816,7 +6816,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1879"
             column="19"/>
     </issue>
@@ -6827,7 +6827,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ProportionalDimensionProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1885"
             column="19"/>
     </issue>
@@ -6838,7 +6838,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getLinearDimension();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1903"
             column="5"/>
     </issue>
@@ -6849,7 +6849,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp getExpandedDimension();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1914"
             column="5"/>
     </issue>
@@ -6860,7 +6860,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp getWrappedDimension();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1925"
             column="5"/>
     </issue>
@@ -6871,7 +6871,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ContainerDimension.InnerCase getInnerCase();"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1927"
             column="12"/>
     </issue>
@@ -6882,7 +6882,7 @@
         errorLine1="      public static InnerCase valueOf(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1958"
             column="21"/>
     </issue>
@@ -6893,7 +6893,7 @@
         errorLine1="      public static InnerCase forNumber(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1962"
             column="21"/>
     </issue>
@@ -6904,7 +6904,7 @@
         errorLine1="    public InnerCase"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="1977"
             column="12"/>
     </issue>
@@ -6915,7 +6915,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getLinearDimension() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2000"
             column="12"/>
     </issue>
@@ -6926,7 +6926,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp getExpandedDimension() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2062"
             column="12"/>
     </issue>
@@ -6937,7 +6937,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp getWrappedDimension() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2124"
             column="12"/>
     </issue>
@@ -6948,7 +6948,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2174"
             column="19"/>
     </issue>
@@ -6959,7 +6959,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2175"
             column="9"/>
     </issue>
@@ -6970,7 +6970,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2180"
             column="19"/>
     </issue>
@@ -6981,7 +6981,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2181"
             column="9"/>
     </issue>
@@ -6992,7 +6992,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2182"
             column="9"/>
     </issue>
@@ -7003,7 +7003,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2187"
             column="19"/>
     </issue>
@@ -7014,7 +7014,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2188"
             column="9"/>
     </issue>
@@ -7025,7 +7025,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2193"
             column="19"/>
     </issue>
@@ -7036,7 +7036,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2194"
             column="9"/>
     </issue>
@@ -7047,7 +7047,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2195"
             column="9"/>
     </issue>
@@ -7058,7 +7058,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2200"
             column="19"/>
     </issue>
@@ -7069,7 +7069,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom(byte[] data)"
         errorLine2="                                                                                        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2200"
             column="89"/>
     </issue>
@@ -7080,7 +7080,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2205"
             column="19"/>
     </issue>
@@ -7091,7 +7091,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2206"
             column="9"/>
     </issue>
@@ -7102,7 +7102,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2207"
             column="9"/>
     </issue>
@@ -7113,7 +7113,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2212"
             column="19"/>
     </issue>
@@ -7124,7 +7124,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2212"
             column="89"/>
     </issue>
@@ -7135,7 +7135,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2217"
             column="19"/>
     </issue>
@@ -7146,7 +7146,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2218"
             column="9"/>
     </issue>
@@ -7157,7 +7157,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2219"
             column="9"/>
     </issue>
@@ -7168,7 +7168,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2224"
             column="19"/>
     </issue>
@@ -7179,7 +7179,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2224"
             column="98"/>
     </issue>
@@ -7190,7 +7190,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2228"
             column="19"/>
     </issue>
@@ -7201,7 +7201,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2229"
             column="9"/>
     </issue>
@@ -7212,7 +7212,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2230"
             column="9"/>
     </issue>
@@ -7223,7 +7223,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2234"
             column="19"/>
     </issue>
@@ -7234,7 +7234,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2235"
             column="9"/>
     </issue>
@@ -7245,7 +7245,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2240"
             column="19"/>
     </issue>
@@ -7256,7 +7256,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2241"
             column="9"/>
     </issue>
@@ -7267,7 +7267,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2242"
             column="9"/>
     </issue>
@@ -7278,7 +7278,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2248"
             column="19"/>
     </issue>
@@ -7289,7 +7289,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.ContainerDimension prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2251"
             column="19"/>
     </issue>
@@ -7300,7 +7300,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.ContainerDimension prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2251"
             column="38"/>
     </issue>
@@ -7311,7 +7311,7 @@
         errorLine1="      public InnerCase"
         errorLine2="             ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2273"
             column="14"/>
     </issue>
@@ -7322,7 +7322,7 @@
         errorLine1="      public Builder clearInner() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2278"
             column="14"/>
     </issue>
@@ -7333,7 +7333,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getLinearDimension() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2296"
             column="14"/>
     </issue>
@@ -7344,7 +7344,7 @@
         errorLine1="      public Builder setLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2302"
             column="14"/>
     </issue>
@@ -7355,7 +7355,7 @@
         errorLine1="      public Builder setLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2302"
             column="41"/>
     </issue>
@@ -7366,7 +7366,7 @@
         errorLine1="      public Builder setLinearDimension("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2310"
             column="14"/>
     </issue>
@@ -7377,7 +7377,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2311"
             column="11"/>
     </issue>
@@ -7388,7 +7388,7 @@
         errorLine1="      public Builder mergeLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2319"
             column="14"/>
     </issue>
@@ -7399,7 +7399,7 @@
         errorLine1="      public Builder mergeLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2319"
             column="43"/>
     </issue>
@@ -7410,7 +7410,7 @@
         errorLine1="      public Builder clearLinearDimension() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2327"
             column="14"/>
     </issue>
@@ -7421,7 +7421,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp getExpandedDimension() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2344"
             column="14"/>
     </issue>
@@ -7432,7 +7432,7 @@
         errorLine1="      public Builder setExpandedDimension(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2350"
             column="14"/>
     </issue>
@@ -7443,7 +7443,7 @@
         errorLine1="      public Builder setExpandedDimension(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp value) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2350"
             column="43"/>
     </issue>
@@ -7454,7 +7454,7 @@
         errorLine1="      public Builder setExpandedDimension("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2358"
             column="14"/>
     </issue>
@@ -7465,7 +7465,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2359"
             column="11"/>
     </issue>
@@ -7476,7 +7476,7 @@
         errorLine1="      public Builder mergeExpandedDimension(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2367"
             column="14"/>
     </issue>
@@ -7487,7 +7487,7 @@
         errorLine1="      public Builder mergeExpandedDimension(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp value) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2367"
             column="45"/>
     </issue>
@@ -7498,7 +7498,7 @@
         errorLine1="      public Builder clearExpandedDimension() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2375"
             column="14"/>
     </issue>
@@ -7509,7 +7509,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp getWrappedDimension() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2392"
             column="14"/>
     </issue>
@@ -7520,7 +7520,7 @@
         errorLine1="      public Builder setWrappedDimension(androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2398"
             column="14"/>
     </issue>
@@ -7531,7 +7531,7 @@
         errorLine1="      public Builder setWrappedDimension(androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp value) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2398"
             column="42"/>
     </issue>
@@ -7542,7 +7542,7 @@
         errorLine1="      public Builder setWrappedDimension("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2406"
             column="14"/>
     </issue>
@@ -7553,7 +7553,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2407"
             column="11"/>
     </issue>
@@ -7564,7 +7564,7 @@
         errorLine1="      public Builder mergeWrappedDimension(androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2415"
             column="14"/>
     </issue>
@@ -7575,7 +7575,7 @@
         errorLine1="      public Builder mergeWrappedDimension(androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp value) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2415"
             column="44"/>
     </issue>
@@ -7586,7 +7586,7 @@
         errorLine1="      public Builder clearWrappedDimension() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2423"
             column="14"/>
     </issue>
@@ -7597,7 +7597,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2433"
             column="21"/>
     </issue>
@@ -7608,7 +7608,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2434"
             column="9"/>
     </issue>
@@ -7619,7 +7619,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2435"
             column="9"/>
     </issue>
@@ -7630,7 +7630,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2435"
             column="32"/>
     </issue>
@@ -7641,7 +7641,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ContainerDimension getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2497"
             column="19"/>
     </issue>
@@ -7652,7 +7652,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ContainerDimension> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2503"
             column="19"/>
     </issue>
@@ -7663,7 +7663,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getLinearDimension();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2521"
             column="5"/>
     </issue>
@@ -7674,7 +7674,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp getExpandedDimension();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2532"
             column="5"/>
     </issue>
@@ -7685,7 +7685,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp getProportionalDimension();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2543"
             column="5"/>
     </issue>
@@ -7696,7 +7696,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ImageDimension.InnerCase getInnerCase();"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2545"
             column="12"/>
     </issue>
@@ -7707,7 +7707,7 @@
         errorLine1="      public static InnerCase valueOf(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2576"
             column="21"/>
     </issue>
@@ -7718,7 +7718,7 @@
         errorLine1="      public static InnerCase forNumber(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2580"
             column="21"/>
     </issue>
@@ -7729,7 +7729,7 @@
         errorLine1="    public InnerCase"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2595"
             column="12"/>
     </issue>
@@ -7740,7 +7740,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getLinearDimension() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2618"
             column="12"/>
     </issue>
@@ -7751,7 +7751,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp getExpandedDimension() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2680"
             column="12"/>
     </issue>
@@ -7762,7 +7762,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp getProportionalDimension() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2742"
             column="12"/>
     </issue>
@@ -7773,7 +7773,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2792"
             column="19"/>
     </issue>
@@ -7784,7 +7784,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2793"
             column="9"/>
     </issue>
@@ -7795,7 +7795,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2798"
             column="19"/>
     </issue>
@@ -7806,7 +7806,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2799"
             column="9"/>
     </issue>
@@ -7817,7 +7817,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2800"
             column="9"/>
     </issue>
@@ -7828,7 +7828,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2805"
             column="19"/>
     </issue>
@@ -7839,7 +7839,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2806"
             column="9"/>
     </issue>
@@ -7850,7 +7850,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2811"
             column="19"/>
     </issue>
@@ -7861,7 +7861,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2812"
             column="9"/>
     </issue>
@@ -7872,7 +7872,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2813"
             column="9"/>
     </issue>
@@ -7883,7 +7883,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2818"
             column="19"/>
     </issue>
@@ -7894,7 +7894,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom(byte[] data)"
         errorLine2="                                                                                    ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2818"
             column="85"/>
     </issue>
@@ -7905,7 +7905,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2823"
             column="19"/>
     </issue>
@@ -7916,7 +7916,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2824"
             column="9"/>
     </issue>
@@ -7927,7 +7927,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2825"
             column="9"/>
     </issue>
@@ -7938,7 +7938,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2830"
             column="19"/>
     </issue>
@@ -7949,7 +7949,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2830"
             column="85"/>
     </issue>
@@ -7960,7 +7960,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2835"
             column="19"/>
     </issue>
@@ -7971,7 +7971,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2836"
             column="9"/>
     </issue>
@@ -7982,7 +7982,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2837"
             column="9"/>
     </issue>
@@ -7993,7 +7993,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2842"
             column="19"/>
     </issue>
@@ -8004,7 +8004,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2842"
             column="94"/>
     </issue>
@@ -8015,7 +8015,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2846"
             column="19"/>
     </issue>
@@ -8026,7 +8026,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2847"
             column="9"/>
     </issue>
@@ -8037,7 +8037,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2848"
             column="9"/>
     </issue>
@@ -8048,7 +8048,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2852"
             column="19"/>
     </issue>
@@ -8059,7 +8059,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2853"
             column="9"/>
     </issue>
@@ -8070,7 +8070,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2858"
             column="19"/>
     </issue>
@@ -8081,7 +8081,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2859"
             column="9"/>
     </issue>
@@ -8092,7 +8092,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2860"
             column="9"/>
     </issue>
@@ -8103,7 +8103,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2866"
             column="19"/>
     </issue>
@@ -8114,7 +8114,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.ImageDimension prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2869"
             column="19"/>
     </issue>
@@ -8125,7 +8125,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.ImageDimension prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2869"
             column="38"/>
     </issue>
@@ -8136,7 +8136,7 @@
         errorLine1="      public InnerCase"
         errorLine2="             ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2891"
             column="14"/>
     </issue>
@@ -8147,7 +8147,7 @@
         errorLine1="      public Builder clearInner() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2896"
             column="14"/>
     </issue>
@@ -8158,7 +8158,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getLinearDimension() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2914"
             column="14"/>
     </issue>
@@ -8169,7 +8169,7 @@
         errorLine1="      public Builder setLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2920"
             column="14"/>
     </issue>
@@ -8180,7 +8180,7 @@
         errorLine1="      public Builder setLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2920"
             column="41"/>
     </issue>
@@ -8191,7 +8191,7 @@
         errorLine1="      public Builder setLinearDimension("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2928"
             column="14"/>
     </issue>
@@ -8202,7 +8202,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2929"
             column="11"/>
     </issue>
@@ -8213,7 +8213,7 @@
         errorLine1="      public Builder mergeLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2937"
             column="14"/>
     </issue>
@@ -8224,7 +8224,7 @@
         errorLine1="      public Builder mergeLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2937"
             column="43"/>
     </issue>
@@ -8235,7 +8235,7 @@
         errorLine1="      public Builder clearLinearDimension() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2945"
             column="14"/>
     </issue>
@@ -8246,7 +8246,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp getExpandedDimension() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2962"
             column="14"/>
     </issue>
@@ -8257,7 +8257,7 @@
         errorLine1="      public Builder setExpandedDimension(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2968"
             column="14"/>
     </issue>
@@ -8268,7 +8268,7 @@
         errorLine1="      public Builder setExpandedDimension(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp value) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2968"
             column="43"/>
     </issue>
@@ -8279,7 +8279,7 @@
         errorLine1="      public Builder setExpandedDimension("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2976"
             column="14"/>
     </issue>
@@ -8290,7 +8290,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2977"
             column="11"/>
     </issue>
@@ -8301,7 +8301,7 @@
         errorLine1="      public Builder mergeExpandedDimension(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2985"
             column="14"/>
     </issue>
@@ -8312,7 +8312,7 @@
         errorLine1="      public Builder mergeExpandedDimension(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp value) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2985"
             column="45"/>
     </issue>
@@ -8323,7 +8323,7 @@
         errorLine1="      public Builder clearExpandedDimension() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="2993"
             column="14"/>
     </issue>
@@ -8334,7 +8334,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp getProportionalDimension() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3010"
             column="14"/>
     </issue>
@@ -8345,7 +8345,7 @@
         errorLine1="      public Builder setProportionalDimension(androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3016"
             column="14"/>
     </issue>
@@ -8356,7 +8356,7 @@
         errorLine1="      public Builder setProportionalDimension(androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp value) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3016"
             column="47"/>
     </issue>
@@ -8367,7 +8367,7 @@
         errorLine1="      public Builder setProportionalDimension("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3024"
             column="14"/>
     </issue>
@@ -8378,7 +8378,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3025"
             column="11"/>
     </issue>
@@ -8389,7 +8389,7 @@
         errorLine1="      public Builder mergeProportionalDimension(androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3033"
             column="14"/>
     </issue>
@@ -8400,7 +8400,7 @@
         errorLine1="      public Builder mergeProportionalDimension(androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp value) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3033"
             column="49"/>
     </issue>
@@ -8411,7 +8411,7 @@
         errorLine1="      public Builder clearProportionalDimension() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3041"
             column="14"/>
     </issue>
@@ -8422,7 +8422,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3051"
             column="21"/>
     </issue>
@@ -8433,7 +8433,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3052"
             column="9"/>
     </issue>
@@ -8444,7 +8444,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3053"
             column="9"/>
     </issue>
@@ -8455,7 +8455,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3053"
             column="32"/>
     </issue>
@@ -8466,7 +8466,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.ImageDimension getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3115"
             column="19"/>
     </issue>
@@ -8477,7 +8477,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ImageDimension> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3121"
             column="19"/>
     </issue>
@@ -8488,7 +8488,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getLinearDimension();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3147"
             column="5"/>
     </issue>
@@ -8499,7 +8499,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.SpacerDimension.InnerCase getInnerCase();"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3149"
             column="12"/>
     </issue>
@@ -8510,7 +8510,7 @@
         errorLine1="      public static InnerCase valueOf(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3178"
             column="21"/>
     </issue>
@@ -8521,7 +8521,7 @@
         errorLine1="      public static InnerCase forNumber(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3182"
             column="21"/>
     </issue>
@@ -8532,7 +8532,7 @@
         errorLine1="    public InnerCase"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3195"
             column="12"/>
     </issue>
@@ -8543,7 +8543,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getLinearDimension() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3226"
             column="12"/>
     </issue>
@@ -8554,7 +8554,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3292"
             column="19"/>
     </issue>
@@ -8565,7 +8565,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3293"
             column="9"/>
     </issue>
@@ -8576,7 +8576,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3298"
             column="19"/>
     </issue>
@@ -8587,7 +8587,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3299"
             column="9"/>
     </issue>
@@ -8598,7 +8598,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3300"
             column="9"/>
     </issue>
@@ -8609,7 +8609,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3305"
             column="19"/>
     </issue>
@@ -8620,7 +8620,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3306"
             column="9"/>
     </issue>
@@ -8631,7 +8631,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3311"
             column="19"/>
     </issue>
@@ -8642,7 +8642,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3312"
             column="9"/>
     </issue>
@@ -8653,7 +8653,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3313"
             column="9"/>
     </issue>
@@ -8664,7 +8664,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3318"
             column="19"/>
     </issue>
@@ -8675,7 +8675,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom(byte[] data)"
         errorLine2="                                                                                     ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3318"
             column="86"/>
     </issue>
@@ -8686,7 +8686,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3323"
             column="19"/>
     </issue>
@@ -8697,7 +8697,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3324"
             column="9"/>
     </issue>
@@ -8708,7 +8708,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3325"
             column="9"/>
     </issue>
@@ -8719,7 +8719,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3330"
             column="19"/>
     </issue>
@@ -8730,7 +8730,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3330"
             column="86"/>
     </issue>
@@ -8741,7 +8741,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3335"
             column="19"/>
     </issue>
@@ -8752,7 +8752,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3336"
             column="9"/>
     </issue>
@@ -8763,7 +8763,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3337"
             column="9"/>
     </issue>
@@ -8774,7 +8774,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3342"
             column="19"/>
     </issue>
@@ -8785,7 +8785,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3342"
             column="95"/>
     </issue>
@@ -8796,7 +8796,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3346"
             column="19"/>
     </issue>
@@ -8807,7 +8807,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3347"
             column="9"/>
     </issue>
@@ -8818,7 +8818,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3348"
             column="9"/>
     </issue>
@@ -8829,7 +8829,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3352"
             column="19"/>
     </issue>
@@ -8840,7 +8840,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3353"
             column="9"/>
     </issue>
@@ -8851,7 +8851,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3358"
             column="19"/>
     </issue>
@@ -8862,7 +8862,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3359"
             column="9"/>
     </issue>
@@ -8873,7 +8873,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3360"
             column="9"/>
     </issue>
@@ -8884,7 +8884,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3366"
             column="19"/>
     </issue>
@@ -8895,7 +8895,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.SpacerDimension prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3369"
             column="19"/>
     </issue>
@@ -8906,7 +8906,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.DimensionProto.SpacerDimension prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3369"
             column="38"/>
     </issue>
@@ -8917,7 +8917,7 @@
         errorLine1="      public InnerCase"
         errorLine2="             ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3391"
             column="14"/>
     </issue>
@@ -8928,7 +8928,7 @@
         errorLine1="      public Builder clearInner() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3396"
             column="14"/>
     </issue>
@@ -8939,7 +8939,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getLinearDimension() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3422"
             column="14"/>
     </issue>
@@ -8950,7 +8950,7 @@
         errorLine1="      public Builder setLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3432"
             column="14"/>
     </issue>
@@ -8961,7 +8961,7 @@
         errorLine1="      public Builder setLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3432"
             column="41"/>
     </issue>
@@ -8972,7 +8972,7 @@
         errorLine1="      public Builder setLinearDimension("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3444"
             column="14"/>
     </issue>
@@ -8983,7 +8983,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3445"
             column="11"/>
     </issue>
@@ -8994,7 +8994,7 @@
         errorLine1="      public Builder mergeLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3457"
             column="14"/>
     </issue>
@@ -9005,7 +9005,7 @@
         errorLine1="      public Builder mergeLinearDimension(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3457"
             column="43"/>
     </issue>
@@ -9016,7 +9016,7 @@
         errorLine1="      public Builder clearLinearDimension() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3469"
             column="14"/>
     </issue>
@@ -9027,7 +9027,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3479"
             column="21"/>
     </issue>
@@ -9038,7 +9038,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3480"
             column="9"/>
     </issue>
@@ -9049,7 +9049,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3481"
             column="9"/>
     </issue>
@@ -9060,7 +9060,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3481"
             column="32"/>
     </issue>
@@ -9071,7 +9071,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpacerDimension getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3540"
             column="19"/>
     </issue>
@@ -9082,7 +9082,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;SpacerDimension> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="3546"
             column="19"/>
     </issue>
@@ -9093,7 +9093,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -9104,7 +9104,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="77"
             column="19"/>
     </issue>
@@ -9115,7 +9115,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="78"
             column="9"/>
     </issue>
@@ -9126,7 +9126,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="83"
             column="19"/>
     </issue>
@@ -9137,7 +9137,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="84"
             column="9"/>
     </issue>
@@ -9148,7 +9148,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="85"
             column="9"/>
     </issue>
@@ -9159,7 +9159,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="90"
             column="19"/>
     </issue>
@@ -9170,7 +9170,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="91"
             column="9"/>
     </issue>
@@ -9181,7 +9181,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="96"
             column="19"/>
     </issue>
@@ -9192,7 +9192,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="97"
             column="9"/>
     </issue>
@@ -9203,7 +9203,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="98"
             column="9"/>
     </issue>
@@ -9214,7 +9214,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="103"
             column="19"/>
     </issue>
@@ -9225,7 +9225,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom(byte[] data)"
         errorLine2="                                                                              ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="103"
             column="79"/>
     </issue>
@@ -9236,7 +9236,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="108"
             column="19"/>
     </issue>
@@ -9247,7 +9247,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="109"
             column="9"/>
     </issue>
@@ -9258,7 +9258,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="110"
             column="9"/>
     </issue>
@@ -9269,7 +9269,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="115"
             column="19"/>
     </issue>
@@ -9280,7 +9280,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom(java.io.InputStream input)"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="115"
             column="79"/>
     </issue>
@@ -9291,7 +9291,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="120"
             column="19"/>
     </issue>
@@ -9302,7 +9302,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="121"
             column="9"/>
     </issue>
@@ -9313,7 +9313,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="122"
             column="9"/>
     </issue>
@@ -9324,7 +9324,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="127"
             column="19"/>
     </issue>
@@ -9335,7 +9335,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="127"
             column="88"/>
     </issue>
@@ -9346,7 +9346,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="131"
             column="19"/>
     </issue>
@@ -9357,7 +9357,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="132"
             column="9"/>
     </issue>
@@ -9368,7 +9368,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="133"
             column="9"/>
     </issue>
@@ -9379,7 +9379,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="137"
             column="19"/>
     </issue>
@@ -9390,7 +9390,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="138"
             column="9"/>
     </issue>
@@ -9401,7 +9401,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="143"
             column="19"/>
     </issue>
@@ -9412,7 +9412,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="144"
             column="9"/>
     </issue>
@@ -9423,7 +9423,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="145"
             column="9"/>
     </issue>
@@ -9434,7 +9434,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="151"
             column="19"/>
     </issue>
@@ -9445,7 +9445,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.EventProto.TileAddEvent prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="154"
             column="19"/>
     </issue>
@@ -9456,7 +9456,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.EventProto.TileAddEvent prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="154"
             column="38"/>
     </issue>
@@ -9467,7 +9467,7 @@
         errorLine1="      public Builder setTileId(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="197"
             column="14"/>
     </issue>
@@ -9478,7 +9478,7 @@
         errorLine1="      public Builder clearTileId() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="210"
             column="14"/>
     </issue>
@@ -9489,7 +9489,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="220"
             column="21"/>
     </issue>
@@ -9500,7 +9500,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="221"
             column="9"/>
     </issue>
@@ -9511,7 +9511,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="222"
             column="9"/>
     </issue>
@@ -9522,7 +9522,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="222"
             column="32"/>
     </issue>
@@ -9533,7 +9533,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileAddEvent getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="279"
             column="19"/>
     </issue>
@@ -9544,7 +9544,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;TileAddEvent> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="285"
             column="19"/>
     </issue>
@@ -9555,7 +9555,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="356"
             column="19"/>
     </issue>
@@ -9566,7 +9566,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="357"
             column="9"/>
     </issue>
@@ -9577,7 +9577,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="362"
             column="19"/>
     </issue>
@@ -9588,7 +9588,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="363"
             column="9"/>
     </issue>
@@ -9599,7 +9599,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="364"
             column="9"/>
     </issue>
@@ -9610,7 +9610,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="369"
             column="19"/>
     </issue>
@@ -9621,7 +9621,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="370"
             column="9"/>
     </issue>
@@ -9632,7 +9632,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="375"
             column="19"/>
     </issue>
@@ -9643,7 +9643,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="376"
             column="9"/>
     </issue>
@@ -9654,7 +9654,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="377"
             column="9"/>
     </issue>
@@ -9665,7 +9665,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="382"
             column="19"/>
     </issue>
@@ -9676,7 +9676,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom(byte[] data)"
         errorLine2="                                                                                 ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="382"
             column="82"/>
     </issue>
@@ -9687,7 +9687,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="387"
             column="19"/>
     </issue>
@@ -9698,7 +9698,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="388"
             column="9"/>
     </issue>
@@ -9709,7 +9709,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="389"
             column="9"/>
     </issue>
@@ -9720,7 +9720,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="394"
             column="19"/>
     </issue>
@@ -9731,7 +9731,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="394"
             column="82"/>
     </issue>
@@ -9742,7 +9742,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="399"
             column="19"/>
     </issue>
@@ -9753,7 +9753,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="400"
             column="9"/>
     </issue>
@@ -9764,7 +9764,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="401"
             column="9"/>
     </issue>
@@ -9775,7 +9775,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="406"
             column="19"/>
     </issue>
@@ -9786,7 +9786,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="406"
             column="91"/>
     </issue>
@@ -9797,7 +9797,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="410"
             column="19"/>
     </issue>
@@ -9808,7 +9808,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="411"
             column="9"/>
     </issue>
@@ -9819,7 +9819,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="412"
             column="9"/>
     </issue>
@@ -9830,7 +9830,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="416"
             column="19"/>
     </issue>
@@ -9841,7 +9841,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="417"
             column="9"/>
     </issue>
@@ -9852,7 +9852,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="422"
             column="19"/>
     </issue>
@@ -9863,7 +9863,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="423"
             column="9"/>
     </issue>
@@ -9874,7 +9874,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="424"
             column="9"/>
     </issue>
@@ -9885,7 +9885,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="430"
             column="19"/>
     </issue>
@@ -9896,7 +9896,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.EventProto.TileRemoveEvent prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="433"
             column="19"/>
     </issue>
@@ -9907,7 +9907,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.EventProto.TileRemoveEvent prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="433"
             column="38"/>
     </issue>
@@ -9918,7 +9918,7 @@
         errorLine1="      public Builder setTileId(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="476"
             column="14"/>
     </issue>
@@ -9929,7 +9929,7 @@
         errorLine1="      public Builder clearTileId() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="489"
             column="14"/>
     </issue>
@@ -9940,7 +9940,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="499"
             column="21"/>
     </issue>
@@ -9951,7 +9951,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="500"
             column="9"/>
     </issue>
@@ -9962,7 +9962,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="501"
             column="9"/>
     </issue>
@@ -9973,7 +9973,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="501"
             column="32"/>
     </issue>
@@ -9984,7 +9984,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileRemoveEvent getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="558"
             column="19"/>
     </issue>
@@ -9995,7 +9995,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;TileRemoveEvent> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="564"
             column="19"/>
     </issue>
@@ -10006,7 +10006,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="636"
             column="19"/>
     </issue>
@@ -10017,7 +10017,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="637"
             column="9"/>
     </issue>
@@ -10028,7 +10028,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="642"
             column="19"/>
     </issue>
@@ -10039,7 +10039,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="643"
             column="9"/>
     </issue>
@@ -10050,7 +10050,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="644"
             column="9"/>
     </issue>
@@ -10061,7 +10061,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="649"
             column="19"/>
     </issue>
@@ -10072,7 +10072,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="650"
             column="9"/>
     </issue>
@@ -10083,7 +10083,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="655"
             column="19"/>
     </issue>
@@ -10094,7 +10094,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="656"
             column="9"/>
     </issue>
@@ -10105,7 +10105,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="657"
             column="9"/>
     </issue>
@@ -10116,7 +10116,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="662"
             column="19"/>
     </issue>
@@ -10127,7 +10127,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom(byte[] data)"
         errorLine2="                                                                                ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="662"
             column="81"/>
     </issue>
@@ -10138,7 +10138,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="667"
             column="19"/>
     </issue>
@@ -10149,7 +10149,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="668"
             column="9"/>
     </issue>
@@ -10160,7 +10160,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="669"
             column="9"/>
     </issue>
@@ -10171,7 +10171,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="674"
             column="19"/>
     </issue>
@@ -10182,7 +10182,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="674"
             column="81"/>
     </issue>
@@ -10193,7 +10193,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="679"
             column="19"/>
     </issue>
@@ -10204,7 +10204,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="680"
             column="9"/>
     </issue>
@@ -10215,7 +10215,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="681"
             column="9"/>
     </issue>
@@ -10226,7 +10226,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="686"
             column="19"/>
     </issue>
@@ -10237,7 +10237,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="686"
             column="90"/>
     </issue>
@@ -10248,7 +10248,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="690"
             column="19"/>
     </issue>
@@ -10259,7 +10259,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="691"
             column="9"/>
     </issue>
@@ -10270,7 +10270,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="692"
             column="9"/>
     </issue>
@@ -10281,7 +10281,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="696"
             column="19"/>
     </issue>
@@ -10292,7 +10292,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="697"
             column="9"/>
     </issue>
@@ -10303,7 +10303,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="702"
             column="19"/>
     </issue>
@@ -10314,7 +10314,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="703"
             column="9"/>
     </issue>
@@ -10325,7 +10325,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="704"
             column="9"/>
     </issue>
@@ -10336,7 +10336,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="710"
             column="19"/>
     </issue>
@@ -10347,7 +10347,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.EventProto.TileEnterEvent prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="713"
             column="19"/>
     </issue>
@@ -10358,7 +10358,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.EventProto.TileEnterEvent prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="713"
             column="38"/>
     </issue>
@@ -10369,7 +10369,7 @@
         errorLine1="      public Builder setTileId(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="757"
             column="14"/>
     </issue>
@@ -10380,7 +10380,7 @@
         errorLine1="      public Builder clearTileId() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="770"
             column="14"/>
     </issue>
@@ -10391,7 +10391,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="780"
             column="21"/>
     </issue>
@@ -10402,7 +10402,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="781"
             column="9"/>
     </issue>
@@ -10413,7 +10413,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="782"
             column="9"/>
     </issue>
@@ -10424,7 +10424,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="782"
             column="32"/>
     </issue>
@@ -10435,7 +10435,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileEnterEvent getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="839"
             column="19"/>
     </issue>
@@ -10446,7 +10446,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;TileEnterEvent> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="845"
             column="19"/>
     </issue>
@@ -10457,7 +10457,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="917"
             column="19"/>
     </issue>
@@ -10468,7 +10468,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="918"
             column="9"/>
     </issue>
@@ -10479,7 +10479,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="923"
             column="19"/>
     </issue>
@@ -10490,7 +10490,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="924"
             column="9"/>
     </issue>
@@ -10501,7 +10501,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="925"
             column="9"/>
     </issue>
@@ -10512,7 +10512,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="930"
             column="19"/>
     </issue>
@@ -10523,7 +10523,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="931"
             column="9"/>
     </issue>
@@ -10534,7 +10534,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="936"
             column="19"/>
     </issue>
@@ -10545,7 +10545,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="937"
             column="9"/>
     </issue>
@@ -10556,7 +10556,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="938"
             column="9"/>
     </issue>
@@ -10567,7 +10567,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="943"
             column="19"/>
     </issue>
@@ -10578,7 +10578,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom(byte[] data)"
         errorLine2="                                                                                ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="943"
             column="81"/>
     </issue>
@@ -10589,7 +10589,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="948"
             column="19"/>
     </issue>
@@ -10600,7 +10600,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="949"
             column="9"/>
     </issue>
@@ -10611,7 +10611,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="950"
             column="9"/>
     </issue>
@@ -10622,7 +10622,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="955"
             column="19"/>
     </issue>
@@ -10633,7 +10633,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="955"
             column="81"/>
     </issue>
@@ -10644,7 +10644,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="960"
             column="19"/>
     </issue>
@@ -10655,7 +10655,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="961"
             column="9"/>
     </issue>
@@ -10666,7 +10666,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="962"
             column="9"/>
     </issue>
@@ -10677,7 +10677,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="967"
             column="19"/>
     </issue>
@@ -10688,7 +10688,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="967"
             column="90"/>
     </issue>
@@ -10699,7 +10699,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="971"
             column="19"/>
     </issue>
@@ -10710,7 +10710,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="972"
             column="9"/>
     </issue>
@@ -10721,7 +10721,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="973"
             column="9"/>
     </issue>
@@ -10732,7 +10732,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="977"
             column="19"/>
     </issue>
@@ -10743,7 +10743,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="978"
             column="9"/>
     </issue>
@@ -10754,7 +10754,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="983"
             column="19"/>
     </issue>
@@ -10765,7 +10765,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="984"
             column="9"/>
     </issue>
@@ -10776,7 +10776,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="985"
             column="9"/>
     </issue>
@@ -10787,7 +10787,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="991"
             column="19"/>
     </issue>
@@ -10798,7 +10798,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.EventProto.TileLeaveEvent prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="994"
             column="19"/>
     </issue>
@@ -10809,7 +10809,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.EventProto.TileLeaveEvent prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="994"
             column="38"/>
     </issue>
@@ -10820,7 +10820,7 @@
         errorLine1="      public Builder setTileId(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="1038"
             column="14"/>
     </issue>
@@ -10831,7 +10831,7 @@
         errorLine1="      public Builder clearTileId() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="1051"
             column="14"/>
     </issue>
@@ -10842,7 +10842,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="1061"
             column="21"/>
     </issue>
@@ -10853,7 +10853,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="1062"
             column="9"/>
     </issue>
@@ -10864,7 +10864,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="1063"
             column="9"/>
     </issue>
@@ -10875,7 +10875,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="1063"
             column="32"/>
     </issue>
@@ -10886,7 +10886,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.EventProto.TileLeaveEvent getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="1120"
             column="19"/>
     </issue>
@@ -10897,7 +10897,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;TileLeaveEvent> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/EventProto.java"
             line="1126"
             column="19"/>
     </issue>
@@ -10908,7 +10908,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -10919,7 +10919,7 @@
         errorLine1="    public static HorizontalAlignment valueOf(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="140"
             column="19"/>
     </issue>
@@ -10930,7 +10930,7 @@
         errorLine1="    public static HorizontalAlignment forNumber(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="144"
             column="19"/>
     </issue>
@@ -10941,7 +10941,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumLiteMap&lt;HorizontalAlignment>"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="156"
             column="19"/>
     </issue>
@@ -10952,7 +10952,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumVerifier "
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="169"
             column="19"/>
     </issue>
@@ -10963,7 +10963,7 @@
         errorLine1="    public static VerticalAlignment valueOf(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="285"
             column="19"/>
     </issue>
@@ -10974,7 +10974,7 @@
         errorLine1="    public static VerticalAlignment forNumber(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="289"
             column="19"/>
     </issue>
@@ -10985,7 +10985,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumLiteMap&lt;VerticalAlignment>"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="299"
             column="19"/>
     </issue>
@@ -10996,7 +10996,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumVerifier "
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="312"
             column="19"/>
     </issue>
@@ -11007,7 +11007,7 @@
         errorLine1="    public static FontWeight valueOf(int value) {"
         errorLine2="                  ~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="412"
             column="19"/>
     </issue>
@@ -11018,7 +11018,7 @@
         errorLine1="    public static FontWeight forNumber(int value) {"
         errorLine2="                  ~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="416"
             column="19"/>
     </issue>
@@ -11029,7 +11029,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumLiteMap&lt;FontWeight>"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="425"
             column="19"/>
     </issue>
@@ -11040,7 +11040,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumVerifier "
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="438"
             column="19"/>
     </issue>
@@ -11051,7 +11051,7 @@
         errorLine1="    public static TextAlignment valueOf(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="558"
             column="19"/>
     </issue>
@@ -11062,7 +11062,7 @@
         errorLine1="    public static TextAlignment forNumber(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="562"
             column="19"/>
     </issue>
@@ -11073,7 +11073,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumLiteMap&lt;TextAlignment>"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="572"
             column="19"/>
     </issue>
@@ -11084,7 +11084,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumVerifier "
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="585"
             column="19"/>
     </issue>
@@ -11095,7 +11095,7 @@
         errorLine1="    public static TextOverflow valueOf(int value) {"
         errorLine2="                  ~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="691"
             column="19"/>
     </issue>
@@ -11106,7 +11106,7 @@
         errorLine1="    public static TextOverflow forNumber(int value) {"
         errorLine2="                  ~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="695"
             column="19"/>
     </issue>
@@ -11117,7 +11117,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumLiteMap&lt;TextOverflow>"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="704"
             column="19"/>
     </issue>
@@ -11128,7 +11128,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumVerifier "
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="717"
             column="19"/>
     </issue>
@@ -11139,7 +11139,7 @@
         errorLine1="    public static ArcAnchorType valueOf(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="858"
             column="19"/>
     </issue>
@@ -11150,7 +11150,7 @@
         errorLine1="    public static ArcAnchorType forNumber(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="862"
             column="19"/>
     </issue>
@@ -11161,7 +11161,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumLiteMap&lt;ArcAnchorType>"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="872"
             column="19"/>
     </issue>
@@ -11172,7 +11172,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumVerifier "
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="885"
             column="19"/>
     </issue>
@@ -11183,7 +11183,7 @@
         errorLine1="    public static ContentScaleMode valueOf(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1020"
             column="19"/>
     </issue>
@@ -11194,7 +11194,7 @@
         errorLine1="    public static ContentScaleMode forNumber(int value) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1024"
             column="19"/>
     </issue>
@@ -11205,7 +11205,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumLiteMap&lt;ContentScaleMode>"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1034"
             column="19"/>
     </issue>
@@ -11216,7 +11216,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumVerifier "
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1047"
             column="19"/>
     </issue>
@@ -11227,7 +11227,7 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignment getValue();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1091"
             column="5"/>
     </issue>
@@ -11238,7 +11238,7 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignment getValue() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1130"
             column="12"/>
     </issue>
@@ -11249,7 +11249,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1172"
             column="19"/>
     </issue>
@@ -11260,7 +11260,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1173"
             column="9"/>
     </issue>
@@ -11271,7 +11271,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1178"
             column="19"/>
     </issue>
@@ -11282,7 +11282,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1179"
             column="9"/>
     </issue>
@@ -11293,7 +11293,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1180"
             column="9"/>
     </issue>
@@ -11304,7 +11304,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1185"
             column="19"/>
     </issue>
@@ -11315,7 +11315,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1186"
             column="9"/>
     </issue>
@@ -11326,7 +11326,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1191"
             column="19"/>
     </issue>
@@ -11337,7 +11337,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1192"
             column="9"/>
     </issue>
@@ -11348,7 +11348,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1193"
             column="9"/>
     </issue>
@@ -11359,7 +11359,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1198"
             column="19"/>
     </issue>
@@ -11370,7 +11370,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom(byte[] data)"
         errorLine2="                                                                                                 ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1198"
             column="98"/>
     </issue>
@@ -11381,7 +11381,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1203"
             column="19"/>
     </issue>
@@ -11392,7 +11392,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1204"
             column="9"/>
     </issue>
@@ -11403,7 +11403,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1205"
             column="9"/>
     </issue>
@@ -11414,7 +11414,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1210"
             column="19"/>
     </issue>
@@ -11425,7 +11425,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1210"
             column="98"/>
     </issue>
@@ -11436,7 +11436,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1215"
             column="19"/>
     </issue>
@@ -11447,7 +11447,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1216"
             column="9"/>
     </issue>
@@ -11458,7 +11458,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1217"
             column="9"/>
     </issue>
@@ -11469,7 +11469,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1222"
             column="19"/>
     </issue>
@@ -11480,7 +11480,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1222"
             column="107"/>
     </issue>
@@ -11491,7 +11491,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1226"
             column="19"/>
     </issue>
@@ -11502,7 +11502,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1227"
             column="9"/>
     </issue>
@@ -11513,7 +11513,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1228"
             column="9"/>
     </issue>
@@ -11524,7 +11524,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1232"
             column="19"/>
     </issue>
@@ -11535,7 +11535,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1233"
             column="9"/>
     </issue>
@@ -11546,7 +11546,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1238"
             column="19"/>
     </issue>
@@ -11557,7 +11557,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1239"
             column="9"/>
     </issue>
@@ -11568,7 +11568,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1240"
             column="9"/>
     </issue>
@@ -11579,7 +11579,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1246"
             column="19"/>
     </issue>
@@ -11590,7 +11590,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1249"
             column="19"/>
     </issue>
@@ -11601,7 +11601,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1249"
             column="38"/>
     </issue>
@@ -11612,7 +11612,7 @@
         errorLine1="      public Builder setValueValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1292"
             column="14"/>
     </issue>
@@ -11623,7 +11623,7 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignment getValue() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1306"
             column="14"/>
     </issue>
@@ -11634,7 +11634,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignment value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1318"
             column="14"/>
     </issue>
@@ -11645,7 +11645,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignment value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1318"
             column="31"/>
     </issue>
@@ -11656,7 +11656,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1331"
             column="14"/>
     </issue>
@@ -11667,7 +11667,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1341"
             column="21"/>
     </issue>
@@ -11678,7 +11678,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1342"
             column="9"/>
     </issue>
@@ -11689,7 +11689,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1343"
             column="9"/>
     </issue>
@@ -11700,7 +11700,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1343"
             column="32"/>
     </issue>
@@ -11711,7 +11711,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1400"
             column="19"/>
     </issue>
@@ -11722,7 +11722,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;HorizontalAlignmentProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1406"
             column="19"/>
     </issue>
@@ -11733,7 +11733,7 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignment getValue();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1432"
             column="5"/>
     </issue>
@@ -11744,7 +11744,7 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignment getValue() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1471"
             column="12"/>
     </issue>
@@ -11755,7 +11755,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1513"
             column="19"/>
     </issue>
@@ -11766,7 +11766,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1514"
             column="9"/>
     </issue>
@@ -11777,7 +11777,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1519"
             column="19"/>
     </issue>
@@ -11788,7 +11788,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1520"
             column="9"/>
     </issue>
@@ -11799,7 +11799,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1521"
             column="9"/>
     </issue>
@@ -11810,7 +11810,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1526"
             column="19"/>
     </issue>
@@ -11821,7 +11821,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1527"
             column="9"/>
     </issue>
@@ -11832,7 +11832,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1532"
             column="19"/>
     </issue>
@@ -11843,7 +11843,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1533"
             column="9"/>
     </issue>
@@ -11854,7 +11854,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1534"
             column="9"/>
     </issue>
@@ -11865,7 +11865,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1539"
             column="19"/>
     </issue>
@@ -11876,7 +11876,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom(byte[] data)"
         errorLine2="                                                                                               ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1539"
             column="96"/>
     </issue>
@@ -11887,7 +11887,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1544"
             column="19"/>
     </issue>
@@ -11898,7 +11898,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1545"
             column="9"/>
     </issue>
@@ -11909,7 +11909,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1546"
             column="9"/>
     </issue>
@@ -11920,7 +11920,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1551"
             column="19"/>
     </issue>
@@ -11931,7 +11931,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1551"
             column="96"/>
     </issue>
@@ -11942,7 +11942,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1556"
             column="19"/>
     </issue>
@@ -11953,7 +11953,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1557"
             column="9"/>
     </issue>
@@ -11964,7 +11964,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1558"
             column="9"/>
     </issue>
@@ -11975,7 +11975,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1563"
             column="19"/>
     </issue>
@@ -11986,7 +11986,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1563"
             column="105"/>
     </issue>
@@ -11997,7 +11997,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1567"
             column="19"/>
     </issue>
@@ -12008,7 +12008,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1568"
             column="9"/>
     </issue>
@@ -12019,7 +12019,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1569"
             column="9"/>
     </issue>
@@ -12030,7 +12030,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1573"
             column="19"/>
     </issue>
@@ -12041,7 +12041,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1574"
             column="9"/>
     </issue>
@@ -12052,7 +12052,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1579"
             column="19"/>
     </issue>
@@ -12063,7 +12063,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1580"
             column="9"/>
     </issue>
@@ -12074,7 +12074,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1581"
             column="9"/>
     </issue>
@@ -12085,7 +12085,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1587"
             column="19"/>
     </issue>
@@ -12096,7 +12096,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1590"
             column="19"/>
     </issue>
@@ -12107,7 +12107,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1590"
             column="38"/>
     </issue>
@@ -12118,7 +12118,7 @@
         errorLine1="      public Builder setValueValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1633"
             column="14"/>
     </issue>
@@ -12129,7 +12129,7 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignment getValue() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1647"
             column="14"/>
     </issue>
@@ -12140,7 +12140,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignment value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1659"
             column="14"/>
     </issue>
@@ -12151,7 +12151,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignment value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1659"
             column="31"/>
     </issue>
@@ -12162,7 +12162,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1672"
             column="14"/>
     </issue>
@@ -12173,7 +12173,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1682"
             column="21"/>
     </issue>
@@ -12184,7 +12184,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1683"
             column="9"/>
     </issue>
@@ -12195,7 +12195,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1684"
             column="9"/>
     </issue>
@@ -12206,7 +12206,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1684"
             column="32"/>
     </issue>
@@ -12217,7 +12217,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1741"
             column="19"/>
     </issue>
@@ -12228,7 +12228,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;VerticalAlignmentProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1747"
             column="19"/>
     </issue>
@@ -12239,7 +12239,7 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.FontWeight getValue();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1773"
             column="5"/>
     </issue>
@@ -12250,7 +12250,7 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.FontWeight getValue() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1812"
             column="12"/>
     </issue>
@@ -12261,7 +12261,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1854"
             column="19"/>
     </issue>
@@ -12272,7 +12272,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1855"
             column="9"/>
     </issue>
@@ -12283,7 +12283,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1860"
             column="19"/>
     </issue>
@@ -12294,7 +12294,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1861"
             column="9"/>
     </issue>
@@ -12305,7 +12305,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1862"
             column="9"/>
     </issue>
@@ -12316,7 +12316,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1867"
             column="19"/>
     </issue>
@@ -12327,7 +12327,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1868"
             column="9"/>
     </issue>
@@ -12338,7 +12338,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1873"
             column="19"/>
     </issue>
@@ -12349,7 +12349,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1874"
             column="9"/>
     </issue>
@@ -12360,7 +12360,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1875"
             column="9"/>
     </issue>
@@ -12371,7 +12371,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1880"
             column="19"/>
     </issue>
@@ -12382,7 +12382,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom(byte[] data)"
         errorLine2="                                                                                        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1880"
             column="89"/>
     </issue>
@@ -12393,7 +12393,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1885"
             column="19"/>
     </issue>
@@ -12404,7 +12404,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1886"
             column="9"/>
     </issue>
@@ -12415,7 +12415,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1887"
             column="9"/>
     </issue>
@@ -12426,7 +12426,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1892"
             column="19"/>
     </issue>
@@ -12437,7 +12437,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1892"
             column="89"/>
     </issue>
@@ -12448,7 +12448,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1897"
             column="19"/>
     </issue>
@@ -12459,7 +12459,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1898"
             column="9"/>
     </issue>
@@ -12470,7 +12470,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1899"
             column="9"/>
     </issue>
@@ -12481,7 +12481,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1904"
             column="19"/>
     </issue>
@@ -12492,7 +12492,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1904"
             column="98"/>
     </issue>
@@ -12503,7 +12503,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1908"
             column="19"/>
     </issue>
@@ -12514,7 +12514,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1909"
             column="9"/>
     </issue>
@@ -12525,7 +12525,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1910"
             column="9"/>
     </issue>
@@ -12536,7 +12536,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1914"
             column="19"/>
     </issue>
@@ -12547,7 +12547,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1915"
             column="9"/>
     </issue>
@@ -12558,7 +12558,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1920"
             column="19"/>
     </issue>
@@ -12569,7 +12569,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1921"
             column="9"/>
     </issue>
@@ -12580,7 +12580,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1922"
             column="9"/>
     </issue>
@@ -12591,7 +12591,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1928"
             column="19"/>
     </issue>
@@ -12602,7 +12602,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1931"
             column="19"/>
     </issue>
@@ -12613,7 +12613,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1931"
             column="38"/>
     </issue>
@@ -12624,7 +12624,7 @@
         errorLine1="      public Builder setValueValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1974"
             column="14"/>
     </issue>
@@ -12635,7 +12635,7 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.FontWeight getValue() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="1988"
             column="14"/>
     </issue>
@@ -12646,7 +12646,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.FontWeight value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2000"
             column="14"/>
     </issue>
@@ -12657,7 +12657,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.FontWeight value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2000"
             column="31"/>
     </issue>
@@ -12668,7 +12668,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2013"
             column="14"/>
     </issue>
@@ -12679,7 +12679,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2023"
             column="21"/>
     </issue>
@@ -12690,7 +12690,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2024"
             column="9"/>
     </issue>
@@ -12701,7 +12701,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2025"
             column="9"/>
     </issue>
@@ -12712,7 +12712,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2025"
             column="32"/>
     </issue>
@@ -12723,7 +12723,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2082"
             column="19"/>
     </issue>
@@ -12734,7 +12734,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;FontWeightProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2088"
             column="19"/>
     </issue>
@@ -12745,7 +12745,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.SpProp getSize();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2116"
             column="5"/>
     </issue>
@@ -12756,7 +12756,7 @@
         errorLine1="    androidx.wear.tiles.proto.TypesProto.BoolProp getItalic();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2137"
             column="5"/>
     </issue>
@@ -12767,7 +12767,7 @@
         errorLine1="    androidx.wear.tiles.proto.TypesProto.BoolProp getUnderline();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2158"
             column="5"/>
     </issue>
@@ -12778,7 +12778,7 @@
         errorLine1="    androidx.wear.tiles.proto.ColorProto.ColorProp getColor();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2177"
             column="5"/>
     </issue>
@@ -12789,7 +12789,7 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp getWeight();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2200"
             column="5"/>
     </issue>
@@ -12800,7 +12800,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.EmProp getLetterSpacing();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2223"
             column="5"/>
     </issue>
@@ -12811,7 +12811,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.SpProp getSize() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2262"
             column="12"/>
     </issue>
@@ -12822,7 +12822,7 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.BoolProp getItalic() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2350"
             column="12"/>
     </issue>
@@ -12833,7 +12833,7 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.BoolProp getUnderline() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2438"
             column="12"/>
     </issue>
@@ -12844,7 +12844,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ColorProto.ColorProp getColor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2524"
             column="12"/>
     </issue>
@@ -12855,7 +12855,7 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp getWeight() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2610"
             column="12"/>
     </issue>
@@ -12866,7 +12866,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.EmProp getLetterSpacing() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2704"
             column="12"/>
     </issue>
@@ -12877,7 +12877,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2773"
             column="19"/>
     </issue>
@@ -12888,7 +12888,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2774"
             column="9"/>
     </issue>
@@ -12899,7 +12899,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2779"
             column="19"/>
     </issue>
@@ -12910,7 +12910,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2780"
             column="9"/>
     </issue>
@@ -12921,7 +12921,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2781"
             column="9"/>
     </issue>
@@ -12932,7 +12932,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2786"
             column="19"/>
     </issue>
@@ -12943,7 +12943,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2787"
             column="9"/>
     </issue>
@@ -12954,7 +12954,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2792"
             column="19"/>
     </issue>
@@ -12965,7 +12965,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2793"
             column="9"/>
     </issue>
@@ -12976,7 +12976,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2794"
             column="9"/>
     </issue>
@@ -12987,7 +12987,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2799"
             column="19"/>
     </issue>
@@ -12998,7 +12998,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom(byte[] data)"
         errorLine2="                                                                                   ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2799"
             column="84"/>
     </issue>
@@ -13009,7 +13009,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2804"
             column="19"/>
     </issue>
@@ -13020,7 +13020,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2805"
             column="9"/>
     </issue>
@@ -13031,7 +13031,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2806"
             column="9"/>
     </issue>
@@ -13042,7 +13042,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2811"
             column="19"/>
     </issue>
@@ -13053,7 +13053,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2811"
             column="84"/>
     </issue>
@@ -13064,7 +13064,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2816"
             column="19"/>
     </issue>
@@ -13075,7 +13075,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2817"
             column="9"/>
     </issue>
@@ -13086,7 +13086,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2818"
             column="9"/>
     </issue>
@@ -13097,7 +13097,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2823"
             column="19"/>
     </issue>
@@ -13108,7 +13108,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2823"
             column="93"/>
     </issue>
@@ -13119,7 +13119,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2827"
             column="19"/>
     </issue>
@@ -13130,7 +13130,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2828"
             column="9"/>
     </issue>
@@ -13141,7 +13141,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2829"
             column="9"/>
     </issue>
@@ -13152,7 +13152,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2833"
             column="19"/>
     </issue>
@@ -13163,7 +13163,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2834"
             column="9"/>
     </issue>
@@ -13174,7 +13174,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2839"
             column="19"/>
     </issue>
@@ -13185,7 +13185,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2840"
             column="9"/>
     </issue>
@@ -13196,7 +13196,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2841"
             column="9"/>
     </issue>
@@ -13207,7 +13207,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2847"
             column="19"/>
     </issue>
@@ -13218,7 +13218,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.FontStyle prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2850"
             column="19"/>
     </issue>
@@ -13229,7 +13229,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.FontStyle prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2850"
             column="38"/>
     </issue>
@@ -13240,7 +13240,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.SpProp getSize() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2893"
             column="14"/>
     </issue>
@@ -13251,7 +13251,7 @@
         errorLine1="      public Builder setSize(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2904"
             column="14"/>
     </issue>
@@ -13262,7 +13262,7 @@
         errorLine1="      public Builder setSize(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2904"
             column="30"/>
     </issue>
@@ -13273,7 +13273,7 @@
         errorLine1="      public Builder setSize("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2917"
             column="14"/>
     </issue>
@@ -13284,7 +13284,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.SpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2918"
             column="11"/>
     </issue>
@@ -13295,7 +13295,7 @@
         errorLine1="      public Builder mergeSize(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2931"
             column="14"/>
     </issue>
@@ -13306,7 +13306,7 @@
         errorLine1="      public Builder mergeSize(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2931"
             column="32"/>
     </issue>
@@ -13317,7 +13317,7 @@
         errorLine1="      public Builder clearSize() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2944"
             column="14"/>
     </issue>
@@ -13328,7 +13328,7 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.BoolProp getItalic() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2970"
             column="14"/>
     </issue>
@@ -13339,7 +13339,7 @@
         errorLine1="      public Builder setItalic(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2981"
             column="14"/>
     </issue>
@@ -13350,7 +13350,7 @@
         errorLine1="      public Builder setItalic(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2981"
             column="32"/>
     </issue>
@@ -13361,7 +13361,7 @@
         errorLine1="      public Builder setItalic("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2994"
             column="14"/>
     </issue>
@@ -13372,7 +13372,7 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.BoolProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="2995"
             column="11"/>
     </issue>
@@ -13383,7 +13383,7 @@
         errorLine1="      public Builder mergeItalic(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3008"
             column="14"/>
     </issue>
@@ -13394,7 +13394,7 @@
         errorLine1="      public Builder mergeItalic(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3008"
             column="34"/>
     </issue>
@@ -13405,7 +13405,7 @@
         errorLine1="      public Builder clearItalic() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3021"
             column="14"/>
     </issue>
@@ -13416,7 +13416,7 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.BoolProp getUnderline() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3047"
             column="14"/>
     </issue>
@@ -13427,7 +13427,7 @@
         errorLine1="      public Builder setUnderline(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3058"
             column="14"/>
     </issue>
@@ -13438,7 +13438,7 @@
         errorLine1="      public Builder setUnderline(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3058"
             column="35"/>
     </issue>
@@ -13449,7 +13449,7 @@
         errorLine1="      public Builder setUnderline("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3071"
             column="14"/>
     </issue>
@@ -13460,7 +13460,7 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.BoolProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3072"
             column="11"/>
     </issue>
@@ -13471,7 +13471,7 @@
         errorLine1="      public Builder mergeUnderline(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3085"
             column="14"/>
     </issue>
@@ -13482,7 +13482,7 @@
         errorLine1="      public Builder mergeUnderline(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3085"
             column="37"/>
     </issue>
@@ -13493,7 +13493,7 @@
         errorLine1="      public Builder clearUnderline() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3098"
             column="14"/>
     </issue>
@@ -13504,7 +13504,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ColorProto.ColorProp getColor() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3122"
             column="14"/>
     </issue>
@@ -13515,7 +13515,7 @@
         errorLine1="      public Builder setColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3132"
             column="14"/>
     </issue>
@@ -13526,7 +13526,7 @@
         errorLine1="      public Builder setColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3132"
             column="31"/>
     </issue>
@@ -13537,7 +13537,7 @@
         errorLine1="      public Builder setColor("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3144"
             column="14"/>
     </issue>
@@ -13548,7 +13548,7 @@
         errorLine1="          androidx.wear.tiles.proto.ColorProto.ColorProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3145"
             column="11"/>
     </issue>
@@ -13559,7 +13559,7 @@
         errorLine1="      public Builder mergeColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3157"
             column="14"/>
     </issue>
@@ -13570,7 +13570,7 @@
         errorLine1="      public Builder mergeColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3157"
             column="33"/>
     </issue>
@@ -13581,7 +13581,7 @@
         errorLine1="      public Builder clearColor() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3169"
             column="14"/>
     </issue>
@@ -13592,7 +13592,7 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp getWeight() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3197"
             column="14"/>
     </issue>
@@ -13603,7 +13603,7 @@
         errorLine1="      public Builder setWeight(androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3209"
             column="14"/>
     </issue>
@@ -13614,7 +13614,7 @@
         errorLine1="      public Builder setWeight(androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3209"
             column="32"/>
     </issue>
@@ -13625,7 +13625,7 @@
         errorLine1="      public Builder setWeight("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3223"
             column="14"/>
     </issue>
@@ -13636,7 +13636,7 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3224"
             column="11"/>
     </issue>
@@ -13647,7 +13647,7 @@
         errorLine1="      public Builder mergeWeight(androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3238"
             column="14"/>
     </issue>
@@ -13658,7 +13658,7 @@
         errorLine1="      public Builder mergeWeight(androidx.wear.tiles.proto.LayoutElementProto.FontWeightProp value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3238"
             column="34"/>
     </issue>
@@ -13669,7 +13669,7 @@
         errorLine1="      public Builder clearWeight() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3252"
             column="14"/>
     </issue>
@@ -13680,7 +13680,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.EmProp getLetterSpacing() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3280"
             column="14"/>
     </issue>
@@ -13691,7 +13691,7 @@
         errorLine1="      public Builder setLetterSpacing(androidx.wear.tiles.proto.DimensionProto.EmProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3292"
             column="14"/>
     </issue>
@@ -13702,7 +13702,7 @@
         errorLine1="      public Builder setLetterSpacing(androidx.wear.tiles.proto.DimensionProto.EmProp value) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3292"
             column="39"/>
     </issue>
@@ -13713,7 +13713,7 @@
         errorLine1="      public Builder setLetterSpacing("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3306"
             column="14"/>
     </issue>
@@ -13724,7 +13724,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.EmProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3307"
             column="11"/>
     </issue>
@@ -13735,7 +13735,7 @@
         errorLine1="      public Builder mergeLetterSpacing(androidx.wear.tiles.proto.DimensionProto.EmProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3321"
             column="14"/>
     </issue>
@@ -13746,7 +13746,7 @@
         errorLine1="      public Builder mergeLetterSpacing(androidx.wear.tiles.proto.DimensionProto.EmProp value) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3321"
             column="41"/>
     </issue>
@@ -13757,7 +13757,7 @@
         errorLine1="      public Builder clearLetterSpacing() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3335"
             column="14"/>
     </issue>
@@ -13768,7 +13768,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3344"
             column="21"/>
     </issue>
@@ -13779,7 +13779,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3345"
             column="9"/>
     </issue>
@@ -13790,7 +13790,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3346"
             column="9"/>
     </issue>
@@ -13801,7 +13801,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3346"
             column="32"/>
     </issue>
@@ -13812,7 +13812,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.FontStyle getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3409"
             column="19"/>
     </issue>
@@ -13823,7 +13823,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;FontStyle> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3415"
             column="19"/>
     </issue>
@@ -13834,7 +13834,7 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.TextAlignment getValue();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3441"
             column="5"/>
     </issue>
@@ -13845,7 +13845,7 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.TextAlignment getValue() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3480"
             column="12"/>
     </issue>
@@ -13856,7 +13856,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3522"
             column="19"/>
     </issue>
@@ -13867,7 +13867,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3523"
             column="9"/>
     </issue>
@@ -13878,7 +13878,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3528"
             column="19"/>
     </issue>
@@ -13889,7 +13889,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3529"
             column="9"/>
     </issue>
@@ -13900,7 +13900,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3530"
             column="9"/>
     </issue>
@@ -13911,7 +13911,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3535"
             column="19"/>
     </issue>
@@ -13922,7 +13922,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3536"
             column="9"/>
     </issue>
@@ -13933,7 +13933,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3541"
             column="19"/>
     </issue>
@@ -13944,7 +13944,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3542"
             column="9"/>
     </issue>
@@ -13955,7 +13955,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3543"
             column="9"/>
     </issue>
@@ -13966,7 +13966,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3548"
             column="19"/>
     </issue>
@@ -13977,7 +13977,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom(byte[] data)"
         errorLine2="                                                                                           ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3548"
             column="92"/>
     </issue>
@@ -13988,7 +13988,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3553"
             column="19"/>
     </issue>
@@ -13999,7 +13999,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3554"
             column="9"/>
     </issue>
@@ -14010,7 +14010,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3555"
             column="9"/>
     </issue>
@@ -14021,7 +14021,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3560"
             column="19"/>
     </issue>
@@ -14032,7 +14032,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3560"
             column="92"/>
     </issue>
@@ -14043,7 +14043,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3565"
             column="19"/>
     </issue>
@@ -14054,7 +14054,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3566"
             column="9"/>
     </issue>
@@ -14065,7 +14065,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3567"
             column="9"/>
     </issue>
@@ -14076,7 +14076,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3572"
             column="19"/>
     </issue>
@@ -14087,7 +14087,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3572"
             column="101"/>
     </issue>
@@ -14098,7 +14098,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3576"
             column="19"/>
     </issue>
@@ -14109,7 +14109,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3577"
             column="9"/>
     </issue>
@@ -14120,7 +14120,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3578"
             column="9"/>
     </issue>
@@ -14131,7 +14131,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3582"
             column="19"/>
     </issue>
@@ -14142,7 +14142,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3583"
             column="9"/>
     </issue>
@@ -14153,7 +14153,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3588"
             column="19"/>
     </issue>
@@ -14164,7 +14164,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3589"
             column="9"/>
     </issue>
@@ -14175,7 +14175,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3590"
             column="9"/>
     </issue>
@@ -14186,7 +14186,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3596"
             column="19"/>
     </issue>
@@ -14197,7 +14197,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3599"
             column="19"/>
     </issue>
@@ -14208,7 +14208,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3599"
             column="38"/>
     </issue>
@@ -14219,7 +14219,7 @@
         errorLine1="      public Builder setValueValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3642"
             column="14"/>
     </issue>
@@ -14230,7 +14230,7 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.TextAlignment getValue() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3656"
             column="14"/>
     </issue>
@@ -14241,7 +14241,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.TextAlignment value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3668"
             column="14"/>
     </issue>
@@ -14252,7 +14252,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.TextAlignment value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3668"
             column="31"/>
     </issue>
@@ -14263,7 +14263,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3681"
             column="14"/>
     </issue>
@@ -14274,7 +14274,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3691"
             column="21"/>
     </issue>
@@ -14285,7 +14285,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3692"
             column="9"/>
     </issue>
@@ -14296,7 +14296,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3693"
             column="9"/>
     </issue>
@@ -14307,7 +14307,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3693"
             column="32"/>
     </issue>
@@ -14318,7 +14318,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3750"
             column="19"/>
     </issue>
@@ -14329,7 +14329,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;TextAlignmentProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3756"
             column="19"/>
     </issue>
@@ -14340,7 +14340,7 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.TextOverflow getValue();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3782"
             column="5"/>
     </issue>
@@ -14351,7 +14351,7 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.TextOverflow getValue() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3821"
             column="12"/>
     </issue>
@@ -14362,7 +14362,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3863"
             column="19"/>
     </issue>
@@ -14373,7 +14373,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3864"
             column="9"/>
     </issue>
@@ -14384,7 +14384,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3869"
             column="19"/>
     </issue>
@@ -14395,7 +14395,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3870"
             column="9"/>
     </issue>
@@ -14406,7 +14406,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3871"
             column="9"/>
     </issue>
@@ -14417,7 +14417,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3876"
             column="19"/>
     </issue>
@@ -14428,7 +14428,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3877"
             column="9"/>
     </issue>
@@ -14439,7 +14439,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3882"
             column="19"/>
     </issue>
@@ -14450,7 +14450,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3883"
             column="9"/>
     </issue>
@@ -14461,7 +14461,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3884"
             column="9"/>
     </issue>
@@ -14472,7 +14472,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3889"
             column="19"/>
     </issue>
@@ -14483,7 +14483,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom(byte[] data)"
         errorLine2="                                                                                          ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3889"
             column="91"/>
     </issue>
@@ -14494,7 +14494,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3894"
             column="19"/>
     </issue>
@@ -14505,7 +14505,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3895"
             column="9"/>
     </issue>
@@ -14516,7 +14516,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3896"
             column="9"/>
     </issue>
@@ -14527,7 +14527,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3901"
             column="19"/>
     </issue>
@@ -14538,7 +14538,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3901"
             column="91"/>
     </issue>
@@ -14549,7 +14549,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3906"
             column="19"/>
     </issue>
@@ -14560,7 +14560,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3907"
             column="9"/>
     </issue>
@@ -14571,7 +14571,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3908"
             column="9"/>
     </issue>
@@ -14582,7 +14582,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3913"
             column="19"/>
     </issue>
@@ -14593,7 +14593,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3913"
             column="100"/>
     </issue>
@@ -14604,7 +14604,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3917"
             column="19"/>
     </issue>
@@ -14615,7 +14615,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3918"
             column="9"/>
     </issue>
@@ -14626,7 +14626,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3919"
             column="9"/>
     </issue>
@@ -14637,7 +14637,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3923"
             column="19"/>
     </issue>
@@ -14648,7 +14648,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3924"
             column="9"/>
     </issue>
@@ -14659,7 +14659,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3929"
             column="19"/>
     </issue>
@@ -14670,7 +14670,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3930"
             column="9"/>
     </issue>
@@ -14681,7 +14681,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3931"
             column="9"/>
     </issue>
@@ -14692,7 +14692,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3937"
             column="19"/>
     </issue>
@@ -14703,7 +14703,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3940"
             column="19"/>
     </issue>
@@ -14714,7 +14714,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3940"
             column="38"/>
     </issue>
@@ -14725,7 +14725,7 @@
         errorLine1="      public Builder setValueValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3983"
             column="14"/>
     </issue>
@@ -14736,7 +14736,7 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.TextOverflow getValue() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="3997"
             column="14"/>
     </issue>
@@ -14747,7 +14747,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.TextOverflow value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4009"
             column="14"/>
     </issue>
@@ -14758,7 +14758,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.TextOverflow value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4009"
             column="31"/>
     </issue>
@@ -14769,7 +14769,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4022"
             column="14"/>
     </issue>
@@ -14780,7 +14780,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4032"
             column="21"/>
     </issue>
@@ -14791,7 +14791,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4033"
             column="9"/>
     </issue>
@@ -14802,7 +14802,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4034"
             column="9"/>
     </issue>
@@ -14813,7 +14813,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4034"
             column="32"/>
     </issue>
@@ -14824,7 +14824,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4091"
             column="19"/>
     </issue>
@@ -14835,7 +14835,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;TextOverflowProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4097"
             column="19"/>
     </issue>
@@ -14846,7 +14846,7 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorType getValue();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4123"
             column="5"/>
     </issue>
@@ -14857,7 +14857,7 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorType getValue() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4162"
             column="12"/>
     </issue>
@@ -14868,7 +14868,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4204"
             column="19"/>
     </issue>
@@ -14879,7 +14879,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4205"
             column="9"/>
     </issue>
@@ -14890,7 +14890,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4210"
             column="19"/>
     </issue>
@@ -14901,7 +14901,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4211"
             column="9"/>
     </issue>
@@ -14912,7 +14912,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4212"
             column="9"/>
     </issue>
@@ -14923,7 +14923,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4217"
             column="19"/>
     </issue>
@@ -14934,7 +14934,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4218"
             column="9"/>
     </issue>
@@ -14945,7 +14945,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4223"
             column="19"/>
     </issue>
@@ -14956,7 +14956,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4224"
             column="9"/>
     </issue>
@@ -14967,7 +14967,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4225"
             column="9"/>
     </issue>
@@ -14978,7 +14978,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4230"
             column="19"/>
     </issue>
@@ -14989,7 +14989,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom(byte[] data)"
         errorLine2="                                                                                           ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4230"
             column="92"/>
     </issue>
@@ -15000,7 +15000,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4235"
             column="19"/>
     </issue>
@@ -15011,7 +15011,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4236"
             column="9"/>
     </issue>
@@ -15022,7 +15022,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4237"
             column="9"/>
     </issue>
@@ -15033,7 +15033,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4242"
             column="19"/>
     </issue>
@@ -15044,7 +15044,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4242"
             column="92"/>
     </issue>
@@ -15055,7 +15055,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4247"
             column="19"/>
     </issue>
@@ -15066,7 +15066,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4248"
             column="9"/>
     </issue>
@@ -15077,7 +15077,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4249"
             column="9"/>
     </issue>
@@ -15088,7 +15088,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4254"
             column="19"/>
     </issue>
@@ -15099,7 +15099,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4254"
             column="101"/>
     </issue>
@@ -15110,7 +15110,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4258"
             column="19"/>
     </issue>
@@ -15121,7 +15121,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4259"
             column="9"/>
     </issue>
@@ -15132,7 +15132,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4260"
             column="9"/>
     </issue>
@@ -15143,7 +15143,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4264"
             column="19"/>
     </issue>
@@ -15154,7 +15154,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4265"
             column="9"/>
     </issue>
@@ -15165,7 +15165,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4270"
             column="19"/>
     </issue>
@@ -15176,7 +15176,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4271"
             column="9"/>
     </issue>
@@ -15187,7 +15187,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4272"
             column="9"/>
     </issue>
@@ -15198,7 +15198,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4278"
             column="19"/>
     </issue>
@@ -15209,7 +15209,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4281"
             column="19"/>
     </issue>
@@ -15220,7 +15220,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4281"
             column="38"/>
     </issue>
@@ -15231,7 +15231,7 @@
         errorLine1="      public Builder setValueValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4324"
             column="14"/>
     </issue>
@@ -15242,7 +15242,7 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorType getValue() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4338"
             column="14"/>
     </issue>
@@ -15253,7 +15253,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorType value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4350"
             column="14"/>
     </issue>
@@ -15264,7 +15264,7 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorType value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4350"
             column="31"/>
     </issue>
@@ -15275,7 +15275,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4363"
             column="14"/>
     </issue>
@@ -15286,7 +15286,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4373"
             column="21"/>
     </issue>
@@ -15297,7 +15297,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4374"
             column="9"/>
     </issue>
@@ -15308,7 +15308,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4375"
             column="9"/>
     </issue>
@@ -15319,7 +15319,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4375"
             column="32"/>
     </issue>
@@ -15330,7 +15330,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4432"
             column="19"/>
     </issue>
@@ -15341,7 +15341,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ArcAnchorTypeProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
             line="4438"
             column="19"/>
     </issue>
@@ -15349,550 +15349,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    androidx.wear.tiles.proto.ColorProto.ColorProp getColor();"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4464"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public androidx.wear.tiles.proto.ColorProto.ColorProp getColor() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4501"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4562"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        java.nio.ByteBuffer data)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4563"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4568"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        java.nio.ByteBuffer data,"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4569"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4570"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4575"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ByteString data)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4576"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4581"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ByteString data,"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4582"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4583"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom(byte[] data)"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4588"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom(byte[] data)"
-        errorLine2="                                                                                   ~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4588"
-            column="84"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4593"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        byte[] data,"
-        errorLine2="        ~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4594"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4595"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom(java.io.InputStream input)"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4600"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom(java.io.InputStream input)"
-        errorLine2="                                                                                   ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4600"
-            column="84"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4605"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        java.io.InputStream input,"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4606"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4607"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseDelimitedFrom(java.io.InputStream input)"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4612"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseDelimitedFrom(java.io.InputStream input)"
-        errorLine2="                                                                                            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4612"
-            column="93"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseDelimitedFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4616"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        java.io.InputStream input,"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4617"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4618"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4622"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.CodedInputStream input)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4623"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4628"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.CodedInputStream input,"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4629"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4630"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Builder newBuilder() {"
-        errorLine2="                  ~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4636"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.LineStyle prototype) {"
-        errorLine2="                  ~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4639"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.LineStyle prototype) {"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4639"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      public androidx.wear.tiles.proto.ColorProto.ColorProp getColor() {"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4680"
-            column="14"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      public Builder setColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
-        errorLine2="             ~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4690"
-            column="14"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      public Builder setColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4690"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      public Builder setColor("
-        errorLine2="             ~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4702"
-            column="14"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="          androidx.wear.tiles.proto.ColorProto.ColorProp.Builder builderForValue) {"
-        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4703"
-            column="11"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      public Builder mergeColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
-        errorLine2="             ~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4715"
-            column="14"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      public Builder mergeColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4715"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      public Builder clearColor() {  copyOnWrite();"
-        errorLine2="             ~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4727"
-            column="14"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected final java.lang.Object dynamicMethod("
-        errorLine2="                    ~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4736"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4737"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
-        errorLine2="        ~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4738"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
-        errorLine2="                               ~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4738"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LineStyle getDefaultInstance() {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4795"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static com.google.protobuf.Parser&lt;LineStyle> parser() {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4801"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    androidx.wear.tiles.proto.TypesProto.StringProp getText();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4827"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4464"
             column="5"/>
     </issue>
 
@@ -15902,8 +15363,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.FontStyle getFontStyle();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4848"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4485"
             column="5"/>
     </issue>
 
@@ -15913,8 +15374,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4867"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4504"
             column="5"/>
     </issue>
 
@@ -15924,8 +15385,8 @@
         errorLine1="    androidx.wear.tiles.proto.TypesProto.Int32Prop getMaxLines();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4888"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4525"
             column="5"/>
     </issue>
 
@@ -15935,8 +15396,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp getMultilineAlignment();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4915"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4552"
             column="5"/>
     </issue>
 
@@ -15946,8 +15407,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp getOverflow();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4942"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4579"
             column="5"/>
     </issue>
 
@@ -15957,8 +15418,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.SpProp getLineHeight();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="4965"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4602"
             column="5"/>
     </issue>
 
@@ -15968,8 +15429,8 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.StringProp getText() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5002"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4639"
             column="12"/>
     </issue>
 
@@ -15979,8 +15440,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.FontStyle getFontStyle() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5086"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4723"
             column="12"/>
     </issue>
 
@@ -15990,8 +15451,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5172"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4809"
             column="12"/>
     </issue>
 
@@ -16001,8 +15462,8 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.Int32Prop getMaxLines() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5256"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4893"
             column="12"/>
     </issue>
 
@@ -16012,8 +15473,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp getMultilineAlignment() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5350"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="4987"
             column="12"/>
     </issue>
 
@@ -16023,8 +15484,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp getOverflow() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5456"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5093"
             column="12"/>
     </issue>
 
@@ -16034,8 +15495,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.SpProp getLineHeight() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5558"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5195"
             column="12"/>
     </issue>
 
@@ -16045,8 +15506,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5627"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5264"
             column="19"/>
     </issue>
 
@@ -16056,8 +15517,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5628"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5265"
             column="9"/>
     </issue>
 
@@ -16067,8 +15528,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5633"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5270"
             column="19"/>
     </issue>
 
@@ -16078,8 +15539,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5634"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5271"
             column="9"/>
     </issue>
 
@@ -16089,8 +15550,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5635"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5272"
             column="9"/>
     </issue>
 
@@ -16100,8 +15561,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5640"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5277"
             column="19"/>
     </issue>
 
@@ -16111,8 +15572,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5641"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5278"
             column="9"/>
     </issue>
 
@@ -16122,8 +15583,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5646"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5283"
             column="19"/>
     </issue>
 
@@ -16133,8 +15594,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5647"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5284"
             column="9"/>
     </issue>
 
@@ -16144,8 +15605,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5648"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5285"
             column="9"/>
     </issue>
 
@@ -16155,8 +15616,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5653"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5290"
             column="19"/>
     </issue>
 
@@ -16166,8 +15627,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom(byte[] data)"
         errorLine2="                                                                              ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5653"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5290"
             column="79"/>
     </issue>
 
@@ -16177,8 +15638,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5658"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5295"
             column="19"/>
     </issue>
 
@@ -16188,8 +15649,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5659"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5296"
             column="9"/>
     </issue>
 
@@ -16199,8 +15660,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5660"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5297"
             column="9"/>
     </issue>
 
@@ -16210,8 +15671,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5665"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5302"
             column="19"/>
     </issue>
 
@@ -16221,8 +15682,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom(java.io.InputStream input)"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5665"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5302"
             column="79"/>
     </issue>
 
@@ -16232,8 +15693,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5670"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5307"
             column="19"/>
     </issue>
 
@@ -16243,8 +15704,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5671"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5308"
             column="9"/>
     </issue>
 
@@ -16254,8 +15715,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5672"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5309"
             column="9"/>
     </issue>
 
@@ -16265,8 +15726,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5677"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5314"
             column="19"/>
     </issue>
 
@@ -16276,8 +15737,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5677"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5314"
             column="88"/>
     </issue>
 
@@ -16287,8 +15748,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5681"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5318"
             column="19"/>
     </issue>
 
@@ -16298,8 +15759,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5682"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5319"
             column="9"/>
     </issue>
 
@@ -16309,8 +15770,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5683"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5320"
             column="9"/>
     </issue>
 
@@ -16320,8 +15781,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5687"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5324"
             column="19"/>
     </issue>
 
@@ -16331,8 +15792,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5688"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5325"
             column="9"/>
     </issue>
 
@@ -16342,8 +15803,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5693"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5330"
             column="19"/>
     </issue>
 
@@ -16353,8 +15814,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5694"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5331"
             column="9"/>
     </issue>
 
@@ -16364,8 +15825,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5695"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5332"
             column="9"/>
     </issue>
 
@@ -16375,8 +15836,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5701"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5338"
             column="19"/>
     </issue>
 
@@ -16386,8 +15847,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Text prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5704"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5341"
             column="19"/>
     </issue>
 
@@ -16397,8 +15858,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Text prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5704"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5341"
             column="38"/>
     </issue>
 
@@ -16408,8 +15869,8 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.StringProp getText() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5745"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5382"
             column="14"/>
     </issue>
 
@@ -16419,8 +15880,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5755"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5392"
             column="14"/>
     </issue>
 
@@ -16430,8 +15891,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5755"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5392"
             column="30"/>
     </issue>
 
@@ -16441,8 +15902,8 @@
         errorLine1="      public Builder setText("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5767"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5404"
             column="14"/>
     </issue>
 
@@ -16452,8 +15913,8 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.StringProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5768"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5405"
             column="11"/>
     </issue>
 
@@ -16463,8 +15924,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5780"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5417"
             column="14"/>
     </issue>
 
@@ -16474,8 +15935,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5780"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5417"
             column="32"/>
     </issue>
 
@@ -16485,8 +15946,8 @@
         errorLine1="      public Builder clearText() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5792"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5429"
             column="14"/>
     </issue>
 
@@ -16496,8 +15957,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.FontStyle getFontStyle() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5818"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5455"
             column="14"/>
     </issue>
 
@@ -16507,8 +15968,8 @@
         errorLine1="      public Builder setFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5829"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5466"
             column="14"/>
     </issue>
 
@@ -16518,8 +15979,8 @@
         errorLine1="      public Builder setFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5829"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5466"
             column="35"/>
     </issue>
 
@@ -16529,8 +15990,8 @@
         errorLine1="      public Builder setFontStyle("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5842"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5479"
             column="14"/>
     </issue>
 
@@ -16540,8 +16001,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.FontStyle.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5843"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5480"
             column="11"/>
     </issue>
 
@@ -16551,8 +16012,8 @@
         errorLine1="      public Builder mergeFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5856"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5493"
             column="14"/>
     </issue>
 
@@ -16562,8 +16023,8 @@
         errorLine1="      public Builder mergeFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5856"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5493"
             column="37"/>
     </issue>
 
@@ -16573,8 +16034,8 @@
         errorLine1="      public Builder clearFontStyle() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5869"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5506"
             column="14"/>
     </issue>
 
@@ -16584,8 +16045,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5893"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5530"
             column="14"/>
     </issue>
 
@@ -16595,8 +16056,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5903"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5540"
             column="14"/>
     </issue>
 
@@ -16606,8 +16067,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5903"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5540"
             column="35"/>
     </issue>
 
@@ -16617,8 +16078,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5915"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5552"
             column="14"/>
     </issue>
 
@@ -16628,8 +16089,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Modifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5916"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5553"
             column="11"/>
     </issue>
 
@@ -16639,8 +16100,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5928"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5565"
             column="14"/>
     </issue>
 
@@ -16650,8 +16111,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5928"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5565"
             column="37"/>
     </issue>
 
@@ -16661,8 +16122,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5940"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5577"
             column="14"/>
     </issue>
 
@@ -16672,8 +16133,8 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.Int32Prop getMaxLines() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5966"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5603"
             column="14"/>
     </issue>
 
@@ -16683,8 +16144,8 @@
         errorLine1="      public Builder setMaxLines(androidx.wear.tiles.proto.TypesProto.Int32Prop value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5977"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5614"
             column="14"/>
     </issue>
 
@@ -16694,8 +16155,8 @@
         errorLine1="      public Builder setMaxLines(androidx.wear.tiles.proto.TypesProto.Int32Prop value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5977"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5614"
             column="34"/>
     </issue>
 
@@ -16705,8 +16166,8 @@
         errorLine1="      public Builder setMaxLines("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5990"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5627"
             column="14"/>
     </issue>
 
@@ -16716,8 +16177,8 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.Int32Prop.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="5991"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5628"
             column="11"/>
     </issue>
 
@@ -16727,8 +16188,8 @@
         errorLine1="      public Builder mergeMaxLines(androidx.wear.tiles.proto.TypesProto.Int32Prop value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6004"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5641"
             column="14"/>
     </issue>
 
@@ -16738,8 +16199,8 @@
         errorLine1="      public Builder mergeMaxLines(androidx.wear.tiles.proto.TypesProto.Int32Prop value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6004"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5641"
             column="36"/>
     </issue>
 
@@ -16749,8 +16210,8 @@
         errorLine1="      public Builder clearMaxLines() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6017"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5654"
             column="14"/>
     </issue>
 
@@ -16760,8 +16221,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp getMultilineAlignment() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6049"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5686"
             column="14"/>
     </issue>
 
@@ -16771,8 +16232,8 @@
         errorLine1="      public Builder setMultilineAlignment(androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6063"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5700"
             column="14"/>
     </issue>
 
@@ -16782,8 +16243,8 @@
         errorLine1="      public Builder setMultilineAlignment(androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp value) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6063"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5700"
             column="44"/>
     </issue>
 
@@ -16793,8 +16254,8 @@
         errorLine1="      public Builder setMultilineAlignment("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6079"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5716"
             column="14"/>
     </issue>
 
@@ -16804,8 +16265,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6080"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5717"
             column="11"/>
     </issue>
 
@@ -16815,8 +16276,8 @@
         errorLine1="      public Builder mergeMultilineAlignment(androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6096"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5733"
             column="14"/>
     </issue>
 
@@ -16826,8 +16287,8 @@
         errorLine1="      public Builder mergeMultilineAlignment(androidx.wear.tiles.proto.LayoutElementProto.TextAlignmentProp value) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6096"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5733"
             column="46"/>
     </issue>
 
@@ -16837,8 +16298,8 @@
         errorLine1="      public Builder clearMultilineAlignment() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6112"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5749"
             column="14"/>
     </issue>
 
@@ -16848,8 +16309,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp getOverflow() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6144"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5781"
             column="14"/>
     </issue>
 
@@ -16859,8 +16320,8 @@
         errorLine1="      public Builder setOverflow(androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6158"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5795"
             column="14"/>
     </issue>
 
@@ -16870,8 +16331,8 @@
         errorLine1="      public Builder setOverflow(androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6158"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5795"
             column="34"/>
     </issue>
 
@@ -16881,8 +16342,8 @@
         errorLine1="      public Builder setOverflow("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6174"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5811"
             column="14"/>
     </issue>
 
@@ -16892,8 +16353,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6175"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5812"
             column="11"/>
     </issue>
 
@@ -16903,8 +16364,8 @@
         errorLine1="      public Builder mergeOverflow(androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6191"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5828"
             column="14"/>
     </issue>
 
@@ -16914,8 +16375,8 @@
         errorLine1="      public Builder mergeOverflow(androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6191"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5828"
             column="36"/>
     </issue>
 
@@ -16925,8 +16386,8 @@
         errorLine1="      public Builder clearOverflow() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6207"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5844"
             column="14"/>
     </issue>
 
@@ -16936,8 +16397,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.SpProp getLineHeight() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6235"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5872"
             column="14"/>
     </issue>
 
@@ -16947,8 +16408,8 @@
         errorLine1="      public Builder setLineHeight(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6247"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5884"
             column="14"/>
     </issue>
 
@@ -16958,8 +16419,8 @@
         errorLine1="      public Builder setLineHeight(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6247"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5884"
             column="36"/>
     </issue>
 
@@ -16969,8 +16430,8 @@
         errorLine1="      public Builder setLineHeight("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6261"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5898"
             column="14"/>
     </issue>
 
@@ -16980,8 +16441,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.SpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6262"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5899"
             column="11"/>
     </issue>
 
@@ -16991,8 +16452,8 @@
         errorLine1="      public Builder mergeLineHeight(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6276"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5913"
             column="14"/>
     </issue>
 
@@ -17002,8 +16463,8 @@
         errorLine1="      public Builder mergeLineHeight(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6276"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5913"
             column="38"/>
     </issue>
 
@@ -17013,8 +16474,8 @@
         errorLine1="      public Builder clearLineHeight() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6290"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5927"
             column="14"/>
     </issue>
 
@@ -17024,8 +16485,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6299"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5936"
             column="21"/>
     </issue>
 
@@ -17035,8 +16496,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6300"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5937"
             column="9"/>
     </issue>
 
@@ -17046,8 +16507,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6301"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5938"
             column="9"/>
     </issue>
 
@@ -17057,8 +16518,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6301"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="5938"
             column="32"/>
     </issue>
 
@@ -17068,8 +16529,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Text getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6365"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6002"
             column="19"/>
     </issue>
 
@@ -17079,8 +16540,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Text> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6371"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6008"
             column="19"/>
     </issue>
 
@@ -17090,8 +16551,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.ContentScaleMode getValue();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6389"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6026"
             column="5"/>
     </issue>
 
@@ -17101,8 +16562,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ContentScaleMode getValue() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6420"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6057"
             column="12"/>
     </issue>
 
@@ -17112,8 +16573,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6450"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6087"
             column="19"/>
     </issue>
 
@@ -17123,8 +16584,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6451"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6088"
             column="9"/>
     </issue>
 
@@ -17134,8 +16595,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6456"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6093"
             column="19"/>
     </issue>
 
@@ -17145,8 +16606,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6457"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6094"
             column="9"/>
     </issue>
 
@@ -17156,8 +16617,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6458"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6095"
             column="9"/>
     </issue>
 
@@ -17167,8 +16628,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6463"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6100"
             column="19"/>
     </issue>
 
@@ -17178,8 +16639,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6464"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6101"
             column="9"/>
     </issue>
 
@@ -17189,8 +16650,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6469"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6106"
             column="19"/>
     </issue>
 
@@ -17200,8 +16661,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6470"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6107"
             column="9"/>
     </issue>
 
@@ -17211,8 +16672,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6471"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6108"
             column="9"/>
     </issue>
 
@@ -17222,8 +16683,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6476"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6113"
             column="19"/>
     </issue>
 
@@ -17233,8 +16694,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom(byte[] data)"
         errorLine2="                                                                                              ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6476"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6113"
             column="95"/>
     </issue>
 
@@ -17244,8 +16705,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6481"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6118"
             column="19"/>
     </issue>
 
@@ -17255,8 +16716,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6482"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6119"
             column="9"/>
     </issue>
 
@@ -17266,8 +16727,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6483"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6120"
             column="9"/>
     </issue>
 
@@ -17277,8 +16738,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6488"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6125"
             column="19"/>
     </issue>
 
@@ -17288,8 +16749,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6488"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6125"
             column="95"/>
     </issue>
 
@@ -17299,8 +16760,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6493"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6130"
             column="19"/>
     </issue>
 
@@ -17310,8 +16771,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6494"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6131"
             column="9"/>
     </issue>
 
@@ -17321,8 +16782,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6495"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6132"
             column="9"/>
     </issue>
 
@@ -17332,8 +16793,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6500"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6137"
             column="19"/>
     </issue>
 
@@ -17343,8 +16804,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6500"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6137"
             column="104"/>
     </issue>
 
@@ -17354,8 +16815,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6504"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6141"
             column="19"/>
     </issue>
 
@@ -17365,8 +16826,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6505"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6142"
             column="9"/>
     </issue>
 
@@ -17376,8 +16837,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6506"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6143"
             column="9"/>
     </issue>
 
@@ -17387,8 +16848,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6510"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6147"
             column="19"/>
     </issue>
 
@@ -17398,8 +16859,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6511"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6148"
             column="9"/>
     </issue>
 
@@ -17409,8 +16870,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6516"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6153"
             column="19"/>
     </issue>
 
@@ -17420,8 +16881,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6517"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6154"
             column="9"/>
     </issue>
 
@@ -17431,8 +16892,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6518"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6155"
             column="9"/>
     </issue>
 
@@ -17442,8 +16903,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6524"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6161"
             column="19"/>
     </issue>
 
@@ -17453,8 +16914,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6527"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6164"
             column="19"/>
     </issue>
 
@@ -17464,8 +16925,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6527"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6164"
             column="38"/>
     </issue>
 
@@ -17475,8 +16936,8 @@
         errorLine1="      public Builder setValueValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6562"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6199"
             column="14"/>
     </issue>
 
@@ -17486,8 +16947,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.ContentScaleMode getValue() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6572"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6209"
             column="14"/>
     </issue>
 
@@ -17497,8 +16958,8 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.ContentScaleMode value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6580"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6217"
             column="14"/>
     </issue>
 
@@ -17508,8 +16969,8 @@
         errorLine1="      public Builder setValue(androidx.wear.tiles.proto.LayoutElementProto.ContentScaleMode value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6580"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6217"
             column="31"/>
     </issue>
 
@@ -17519,8 +16980,8 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6589"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6226"
             column="14"/>
     </issue>
 
@@ -17530,8 +16991,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6599"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6236"
             column="21"/>
     </issue>
 
@@ -17541,8 +17002,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6600"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6237"
             column="9"/>
     </issue>
 
@@ -17552,8 +17013,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6601"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6238"
             column="9"/>
     </issue>
 
@@ -17563,8 +17024,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6601"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6238"
             column="32"/>
     </issue>
 
@@ -17574,8 +17035,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6658"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6295"
             column="19"/>
     </issue>
 
@@ -17585,8 +17046,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ContentScaleModeProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6664"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6301"
             column="19"/>
     </issue>
 
@@ -17596,8 +17057,8 @@
         errorLine1="    androidx.wear.tiles.proto.TypesProto.StringProp getResourceId();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6692"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6329"
             column="5"/>
     </issue>
 
@@ -17607,8 +17068,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ImageDimension getWidth();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6711"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6348"
             column="5"/>
     </issue>
 
@@ -17618,8 +17079,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ImageDimension getHeight();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6730"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6367"
             column="5"/>
     </issue>
 
@@ -17629,8 +17090,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp getContentScaleMode();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6753"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6390"
             column="5"/>
     </issue>
 
@@ -17640,8 +17101,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6772"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6409"
             column="5"/>
     </issue>
 
@@ -17651,8 +17112,8 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.StringProp getResourceId() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6815"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6452"
             column="12"/>
     </issue>
 
@@ -17662,8 +17123,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ImageDimension getWidth() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6901"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6538"
             column="12"/>
     </issue>
 
@@ -17673,8 +17134,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ImageDimension getHeight() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="6983"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6620"
             column="12"/>
     </issue>
 
@@ -17684,8 +17145,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp getContentScaleMode() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7069"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6706"
             column="12"/>
     </issue>
 
@@ -17695,8 +17156,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7159"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6796"
             column="12"/>
     </issue>
 
@@ -17706,8 +17167,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7220"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6857"
             column="19"/>
     </issue>
 
@@ -17717,8 +17178,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7221"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6858"
             column="9"/>
     </issue>
 
@@ -17728,8 +17189,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7226"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6863"
             column="19"/>
     </issue>
 
@@ -17739,8 +17200,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7227"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6864"
             column="9"/>
     </issue>
 
@@ -17750,8 +17211,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7228"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6865"
             column="9"/>
     </issue>
 
@@ -17761,8 +17222,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7233"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6870"
             column="19"/>
     </issue>
 
@@ -17772,8 +17233,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7234"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6871"
             column="9"/>
     </issue>
 
@@ -17783,8 +17244,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7239"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6876"
             column="19"/>
     </issue>
 
@@ -17794,8 +17255,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7240"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6877"
             column="9"/>
     </issue>
 
@@ -17805,8 +17266,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7241"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6878"
             column="9"/>
     </issue>
 
@@ -17816,8 +17277,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7246"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6883"
             column="19"/>
     </issue>
 
@@ -17827,8 +17288,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom(byte[] data)"
         errorLine2="                                                                               ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7246"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6883"
             column="80"/>
     </issue>
 
@@ -17838,8 +17299,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7251"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6888"
             column="19"/>
     </issue>
 
@@ -17849,8 +17310,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7252"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6889"
             column="9"/>
     </issue>
 
@@ -17860,8 +17321,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7253"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6890"
             column="9"/>
     </issue>
 
@@ -17871,8 +17332,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7258"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6895"
             column="19"/>
     </issue>
 
@@ -17882,8 +17343,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom(java.io.InputStream input)"
         errorLine2="                                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7258"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6895"
             column="80"/>
     </issue>
 
@@ -17893,8 +17354,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7263"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6900"
             column="19"/>
     </issue>
 
@@ -17904,8 +17365,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7264"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6901"
             column="9"/>
     </issue>
 
@@ -17915,8 +17376,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7265"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6902"
             column="9"/>
     </issue>
 
@@ -17926,8 +17387,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7270"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6907"
             column="19"/>
     </issue>
 
@@ -17937,8 +17398,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7270"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6907"
             column="89"/>
     </issue>
 
@@ -17948,8 +17409,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7274"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6911"
             column="19"/>
     </issue>
 
@@ -17959,8 +17420,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7275"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6912"
             column="9"/>
     </issue>
 
@@ -17970,8 +17431,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7276"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6913"
             column="9"/>
     </issue>
 
@@ -17981,8 +17442,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7280"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6917"
             column="19"/>
     </issue>
 
@@ -17992,8 +17453,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7281"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6918"
             column="9"/>
     </issue>
 
@@ -18003,8 +17464,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7286"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6923"
             column="19"/>
     </issue>
 
@@ -18014,8 +17475,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7287"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6924"
             column="9"/>
     </issue>
 
@@ -18025,8 +17486,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7288"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6925"
             column="9"/>
     </issue>
 
@@ -18036,8 +17497,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7294"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6931"
             column="19"/>
     </issue>
 
@@ -18047,8 +17508,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Image prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7297"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6934"
             column="19"/>
     </issue>
 
@@ -18058,8 +17519,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Image prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7297"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6934"
             column="38"/>
     </issue>
 
@@ -18069,8 +17530,8 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.StringProp getResourceId() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7344"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6981"
             column="14"/>
     </issue>
 
@@ -18080,8 +17541,8 @@
         errorLine1="      public Builder setResourceId(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7355"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6992"
             column="14"/>
     </issue>
 
@@ -18091,8 +17552,8 @@
         errorLine1="      public Builder setResourceId(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7355"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="6992"
             column="36"/>
     </issue>
 
@@ -18102,8 +17563,8 @@
         errorLine1="      public Builder setResourceId("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7368"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7005"
             column="14"/>
     </issue>
 
@@ -18113,8 +17574,8 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.StringProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7369"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7006"
             column="11"/>
     </issue>
 
@@ -18124,8 +17585,8 @@
         errorLine1="      public Builder mergeResourceId(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7382"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7019"
             column="14"/>
     </issue>
 
@@ -18135,8 +17596,8 @@
         errorLine1="      public Builder mergeResourceId(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7382"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7019"
             column="38"/>
     </issue>
 
@@ -18146,8 +17607,8 @@
         errorLine1="      public Builder clearResourceId() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7395"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7032"
             column="14"/>
     </issue>
 
@@ -18157,8 +17618,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ImageDimension getWidth() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7419"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7056"
             column="14"/>
     </issue>
 
@@ -18168,8 +17629,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.ImageDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7429"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7066"
             column="14"/>
     </issue>
 
@@ -18179,8 +17640,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.ImageDimension value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7429"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7066"
             column="31"/>
     </issue>
 
@@ -18190,8 +17651,8 @@
         errorLine1="      public Builder setWidth("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7441"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7078"
             column="14"/>
     </issue>
 
@@ -18201,8 +17662,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ImageDimension.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7442"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7079"
             column="11"/>
     </issue>
 
@@ -18212,8 +17673,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.ImageDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7454"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7091"
             column="14"/>
     </issue>
 
@@ -18223,8 +17684,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.ImageDimension value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7454"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7091"
             column="33"/>
     </issue>
 
@@ -18234,8 +17695,8 @@
         errorLine1="      public Builder clearWidth() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7466"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7103"
             column="14"/>
     </issue>
 
@@ -18245,8 +17706,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ImageDimension getHeight() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7490"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7127"
             column="14"/>
     </issue>
 
@@ -18256,8 +17717,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.ImageDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7500"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7137"
             column="14"/>
     </issue>
 
@@ -18267,8 +17728,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.ImageDimension value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7500"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7137"
             column="32"/>
     </issue>
 
@@ -18278,8 +17739,8 @@
         errorLine1="      public Builder setHeight("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7512"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7149"
             column="14"/>
     </issue>
 
@@ -18289,8 +17750,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ImageDimension.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7513"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7150"
             column="11"/>
     </issue>
 
@@ -18300,8 +17761,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.ImageDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7525"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7162"
             column="14"/>
     </issue>
 
@@ -18311,8 +17772,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.ImageDimension value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7525"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7162"
             column="34"/>
     </issue>
 
@@ -18322,8 +17783,8 @@
         errorLine1="      public Builder clearHeight() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7537"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7174"
             column="14"/>
     </issue>
 
@@ -18333,8 +17794,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp getContentScaleMode() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7565"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7202"
             column="14"/>
     </issue>
 
@@ -18344,8 +17805,8 @@
         errorLine1="      public Builder setContentScaleMode(androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7577"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7214"
             column="14"/>
     </issue>
 
@@ -18355,8 +17816,8 @@
         errorLine1="      public Builder setContentScaleMode(androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp value) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7577"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7214"
             column="42"/>
     </issue>
 
@@ -18366,8 +17827,8 @@
         errorLine1="      public Builder setContentScaleMode("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7591"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7228"
             column="14"/>
     </issue>
 
@@ -18377,8 +17838,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7592"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7229"
             column="11"/>
     </issue>
 
@@ -18388,8 +17849,8 @@
         errorLine1="      public Builder mergeContentScaleMode(androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7606"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7243"
             column="14"/>
     </issue>
 
@@ -18399,8 +17860,8 @@
         errorLine1="      public Builder mergeContentScaleMode(androidx.wear.tiles.proto.LayoutElementProto.ContentScaleModeProp value) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7606"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7243"
             column="44"/>
     </issue>
 
@@ -18410,8 +17871,8 @@
         errorLine1="      public Builder clearContentScaleMode() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7620"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7257"
             column="14"/>
     </issue>
 
@@ -18421,8 +17882,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7644"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7281"
             column="14"/>
     </issue>
 
@@ -18432,8 +17893,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7654"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7291"
             column="14"/>
     </issue>
 
@@ -18443,8 +17904,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7654"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7291"
             column="35"/>
     </issue>
 
@@ -18454,8 +17915,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7666"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7303"
             column="14"/>
     </issue>
 
@@ -18465,8 +17926,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Modifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7667"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7304"
             column="11"/>
     </issue>
 
@@ -18476,8 +17937,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7679"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7316"
             column="14"/>
     </issue>
 
@@ -18487,8 +17948,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7679"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7316"
             column="37"/>
     </issue>
 
@@ -18498,8 +17959,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7691"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7328"
             column="14"/>
     </issue>
 
@@ -18509,8 +17970,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7700"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7337"
             column="21"/>
     </issue>
 
@@ -18520,8 +17981,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7701"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7338"
             column="9"/>
     </issue>
 
@@ -18531,8 +17992,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7702"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7339"
             column="9"/>
     </issue>
 
@@ -18542,8 +18003,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7702"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7339"
             column="32"/>
     </issue>
 
@@ -18553,8 +18014,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Image getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7764"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7401"
             column="19"/>
     </issue>
 
@@ -18564,8 +18025,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Image> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7770"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7407"
             column="19"/>
     </issue>
 
@@ -18575,8 +18036,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.SpacerDimension getWidth();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7800"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7437"
             column="5"/>
     </issue>
 
@@ -18586,8 +18047,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.SpacerDimension getHeight();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7819"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7456"
             column="5"/>
     </issue>
 
@@ -18597,8 +18058,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7838"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7475"
             column="5"/>
     </issue>
 
@@ -18608,8 +18069,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.SpacerDimension getWidth() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7879"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7516"
             column="12"/>
     </issue>
 
@@ -18619,8 +18080,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.SpacerDimension getHeight() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="7969"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7606"
             column="12"/>
     </issue>
 
@@ -18630,8 +18091,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8051"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7688"
             column="12"/>
     </issue>
 
@@ -18641,8 +18102,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8112"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7749"
             column="19"/>
     </issue>
 
@@ -18652,8 +18113,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8113"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7750"
             column="9"/>
     </issue>
 
@@ -18663,8 +18124,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8118"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7755"
             column="19"/>
     </issue>
 
@@ -18674,8 +18135,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8119"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7756"
             column="9"/>
     </issue>
 
@@ -18685,8 +18146,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8120"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7757"
             column="9"/>
     </issue>
 
@@ -18696,8 +18157,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8125"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7762"
             column="19"/>
     </issue>
 
@@ -18707,8 +18168,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8126"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7763"
             column="9"/>
     </issue>
 
@@ -18718,8 +18179,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8131"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7768"
             column="19"/>
     </issue>
 
@@ -18729,8 +18190,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8132"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7769"
             column="9"/>
     </issue>
 
@@ -18740,8 +18201,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8133"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7770"
             column="9"/>
     </issue>
 
@@ -18751,8 +18212,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8138"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7775"
             column="19"/>
     </issue>
 
@@ -18762,8 +18223,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom(byte[] data)"
         errorLine2="                                                                                ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8138"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7775"
             column="81"/>
     </issue>
 
@@ -18773,8 +18234,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8143"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7780"
             column="19"/>
     </issue>
 
@@ -18784,8 +18245,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8144"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7781"
             column="9"/>
     </issue>
 
@@ -18795,8 +18256,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8145"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7782"
             column="9"/>
     </issue>
 
@@ -18806,8 +18267,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8150"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7787"
             column="19"/>
     </issue>
 
@@ -18817,8 +18278,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8150"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7787"
             column="81"/>
     </issue>
 
@@ -18828,8 +18289,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8155"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7792"
             column="19"/>
     </issue>
 
@@ -18839,8 +18300,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8156"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7793"
             column="9"/>
     </issue>
 
@@ -18850,8 +18311,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8157"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7794"
             column="9"/>
     </issue>
 
@@ -18861,8 +18322,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8162"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7799"
             column="19"/>
     </issue>
 
@@ -18872,8 +18333,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8162"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7799"
             column="90"/>
     </issue>
 
@@ -18883,8 +18344,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8166"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7803"
             column="19"/>
     </issue>
 
@@ -18894,8 +18355,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8167"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7804"
             column="9"/>
     </issue>
 
@@ -18905,8 +18366,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8168"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7805"
             column="9"/>
     </issue>
 
@@ -18916,8 +18377,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8172"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7809"
             column="19"/>
     </issue>
 
@@ -18927,8 +18388,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8173"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7810"
             column="9"/>
     </issue>
 
@@ -18938,8 +18399,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8178"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7815"
             column="19"/>
     </issue>
 
@@ -18949,8 +18410,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8179"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7816"
             column="9"/>
     </issue>
 
@@ -18960,8 +18421,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8180"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7817"
             column="9"/>
     </issue>
 
@@ -18971,8 +18432,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8186"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7823"
             column="19"/>
     </issue>
 
@@ -18982,8 +18443,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Spacer prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8189"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7826"
             column="19"/>
     </issue>
 
@@ -18993,8 +18454,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Spacer prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8189"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7826"
             column="38"/>
     </issue>
 
@@ -19004,8 +18465,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.SpacerDimension getWidth() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8234"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7871"
             column="14"/>
     </issue>
 
@@ -19015,8 +18476,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.SpacerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8246"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7883"
             column="14"/>
     </issue>
 
@@ -19026,8 +18487,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.SpacerDimension value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8246"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7883"
             column="31"/>
     </issue>
 
@@ -19037,8 +18498,8 @@
         errorLine1="      public Builder setWidth("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8260"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7897"
             column="14"/>
     </issue>
 
@@ -19048,8 +18509,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.SpacerDimension.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8261"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7898"
             column="11"/>
     </issue>
 
@@ -19059,8 +18520,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.SpacerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8275"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7912"
             column="14"/>
     </issue>
 
@@ -19070,8 +18531,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.SpacerDimension value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8275"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7912"
             column="33"/>
     </issue>
 
@@ -19081,8 +18542,8 @@
         errorLine1="      public Builder clearWidth() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8289"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7926"
             column="14"/>
     </issue>
 
@@ -19092,8 +18553,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.SpacerDimension getHeight() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8313"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7950"
             column="14"/>
     </issue>
 
@@ -19103,8 +18564,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.SpacerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8323"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7960"
             column="14"/>
     </issue>
 
@@ -19114,8 +18575,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.SpacerDimension value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8323"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7960"
             column="32"/>
     </issue>
 
@@ -19125,8 +18586,8 @@
         errorLine1="      public Builder setHeight("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8335"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7972"
             column="14"/>
     </issue>
 
@@ -19136,8 +18597,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.SpacerDimension.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8336"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7973"
             column="11"/>
     </issue>
 
@@ -19147,8 +18608,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.SpacerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8348"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7985"
             column="14"/>
     </issue>
 
@@ -19158,8 +18619,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.SpacerDimension value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8348"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7985"
             column="34"/>
     </issue>
 
@@ -19169,8 +18630,8 @@
         errorLine1="      public Builder clearHeight() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8360"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="7997"
             column="14"/>
     </issue>
 
@@ -19180,8 +18641,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8384"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8021"
             column="14"/>
     </issue>
 
@@ -19191,8 +18652,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8394"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8031"
             column="14"/>
     </issue>
 
@@ -19202,8 +18663,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8394"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8031"
             column="35"/>
     </issue>
 
@@ -19213,8 +18674,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8406"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8043"
             column="14"/>
     </issue>
 
@@ -19224,8 +18685,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Modifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8407"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8044"
             column="11"/>
     </issue>
 
@@ -19235,8 +18696,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8419"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8056"
             column="14"/>
     </issue>
 
@@ -19246,8 +18707,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8419"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8056"
             column="37"/>
     </issue>
 
@@ -19257,8 +18718,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8431"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8068"
             column="14"/>
     </issue>
 
@@ -19268,8 +18729,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8440"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8077"
             column="21"/>
     </issue>
 
@@ -19279,8 +18740,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8441"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8078"
             column="9"/>
     </issue>
 
@@ -19290,8 +18751,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8442"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8079"
             column="9"/>
     </issue>
 
@@ -19301,8 +18762,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8442"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8079"
             column="32"/>
     </issue>
 
@@ -19312,8 +18773,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spacer getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8502"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8139"
             column="19"/>
     </issue>
 
@@ -19323,8 +18784,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Spacer> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8508"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8145"
             column="19"/>
     </issue>
 
@@ -19334,8 +18795,8 @@
         errorLine1="    java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> "
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8524"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8161"
             column="5"/>
     </issue>
 
@@ -19345,8 +18806,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContents(int index);"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8533"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8170"
             column="5"/>
     </issue>
 
@@ -19356,8 +18817,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ContainerDimension getHeight();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8562"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8199"
             column="5"/>
     </issue>
 
@@ -19367,8 +18828,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ContainerDimension getWidth();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8583"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8220"
             column="5"/>
     </issue>
 
@@ -19378,8 +18839,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp getHorizontalAlignment();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8604"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8241"
             column="5"/>
     </issue>
 
@@ -19389,8 +18850,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp getVerticalAlignment();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8625"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8262"
             column="5"/>
     </issue>
 
@@ -19400,8 +18861,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8644"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8281"
             column="5"/>
     </issue>
 
@@ -19411,8 +18872,8 @@
         errorLine1="    public java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> getContentsList() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8673"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8310"
             column="12"/>
     </issue>
 
@@ -19422,8 +18883,8 @@
         errorLine1="    public java.util.List&lt;? extends androidx.wear.tiles.proto.LayoutElementProto.LayoutElementOrBuilder> "
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8683"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8320"
             column="12"/>
     </issue>
 
@@ -19433,8 +18894,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContents(int index) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8706"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8343"
             column="12"/>
     </issue>
 
@@ -19444,8 +18905,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.LayoutElementOrBuilder getContentsOrBuilder("
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8716"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8353"
             column="12"/>
     </issue>
 
@@ -19455,8 +18916,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getHeight() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8865"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8502"
             column="12"/>
     </issue>
 
@@ -19466,8 +18927,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getWidth() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="8953"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8590"
             column="12"/>
     </issue>
 
@@ -19477,8 +18938,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp getHorizontalAlignment() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9041"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8678"
             column="12"/>
     </issue>
 
@@ -19488,8 +18949,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp getVerticalAlignment() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9129"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8766"
             column="12"/>
     </issue>
 
@@ -19499,8 +18960,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9215"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8852"
             column="12"/>
     </issue>
 
@@ -19510,8 +18971,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9276"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8913"
             column="19"/>
     </issue>
 
@@ -19521,8 +18982,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9277"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8914"
             column="9"/>
     </issue>
 
@@ -19532,8 +18993,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9282"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8919"
             column="19"/>
     </issue>
 
@@ -19543,8 +19004,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9283"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8920"
             column="9"/>
     </issue>
 
@@ -19554,8 +19015,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9284"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8921"
             column="9"/>
     </issue>
 
@@ -19565,8 +19026,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9289"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8926"
             column="19"/>
     </issue>
 
@@ -19576,8 +19037,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9290"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8927"
             column="9"/>
     </issue>
 
@@ -19587,8 +19048,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9295"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8932"
             column="19"/>
     </issue>
 
@@ -19598,8 +19059,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9296"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8933"
             column="9"/>
     </issue>
 
@@ -19609,8 +19070,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9297"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8934"
             column="9"/>
     </issue>
 
@@ -19620,8 +19081,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9302"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8939"
             column="19"/>
     </issue>
 
@@ -19631,8 +19092,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom(byte[] data)"
         errorLine2="                                                                             ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9302"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8939"
             column="78"/>
     </issue>
 
@@ -19642,8 +19103,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9307"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8944"
             column="19"/>
     </issue>
 
@@ -19653,8 +19114,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9308"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8945"
             column="9"/>
     </issue>
 
@@ -19664,8 +19125,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9309"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8946"
             column="9"/>
     </issue>
 
@@ -19675,8 +19136,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9314"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8951"
             column="19"/>
     </issue>
 
@@ -19686,8 +19147,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom(java.io.InputStream input)"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9314"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8951"
             column="78"/>
     </issue>
 
@@ -19697,8 +19158,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9319"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8956"
             column="19"/>
     </issue>
 
@@ -19708,8 +19169,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9320"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8957"
             column="9"/>
     </issue>
 
@@ -19719,8 +19180,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9321"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8958"
             column="9"/>
     </issue>
 
@@ -19730,8 +19191,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9326"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8963"
             column="19"/>
     </issue>
 
@@ -19741,8 +19202,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9326"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8963"
             column="87"/>
     </issue>
 
@@ -19752,8 +19213,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9330"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8967"
             column="19"/>
     </issue>
 
@@ -19763,8 +19224,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9331"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8968"
             column="9"/>
     </issue>
 
@@ -19774,8 +19235,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9332"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8969"
             column="9"/>
     </issue>
 
@@ -19785,8 +19246,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9336"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8973"
             column="19"/>
     </issue>
 
@@ -19796,8 +19257,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9337"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8974"
             column="9"/>
     </issue>
 
@@ -19807,8 +19268,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9342"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8979"
             column="19"/>
     </issue>
 
@@ -19818,8 +19279,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9343"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8980"
             column="9"/>
     </issue>
 
@@ -19829,8 +19290,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9344"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8981"
             column="9"/>
     </issue>
 
@@ -19840,8 +19301,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9350"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8987"
             column="19"/>
     </issue>
 
@@ -19851,8 +19312,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Box prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9353"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8990"
             column="19"/>
     </issue>
 
@@ -19862,8 +19323,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Box prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9353"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="8990"
             column="38"/>
     </issue>
 
@@ -19873,8 +19334,8 @@
         errorLine1="      public java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> getContentsList() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9385"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9022"
             column="14"/>
     </issue>
 
@@ -19884,8 +19345,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContents(int index) {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9407"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9044"
             column="14"/>
     </issue>
 
@@ -19895,8 +19356,8 @@
         errorLine1="      public Builder setContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9417"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9054"
             column="14"/>
     </issue>
 
@@ -19906,8 +19367,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9418"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9055"
             column="22"/>
     </issue>
 
@@ -19917,8 +19378,8 @@
         errorLine1="      public Builder setContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9430"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9067"
             column="14"/>
     </issue>
 
@@ -19928,8 +19389,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9431"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9068"
             column="22"/>
     </issue>
 
@@ -19939,8 +19400,8 @@
         errorLine1="      public Builder addContents(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9443"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9080"
             column="14"/>
     </issue>
 
@@ -19950,8 +19411,8 @@
         errorLine1="      public Builder addContents(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9443"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9080"
             column="34"/>
     </issue>
 
@@ -19961,8 +19422,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9455"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9092"
             column="14"/>
     </issue>
 
@@ -19972,8 +19433,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9456"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9093"
             column="22"/>
     </issue>
 
@@ -19983,8 +19444,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9468"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9105"
             column="14"/>
     </issue>
 
@@ -19994,8 +19455,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9469"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9106"
             column="11"/>
     </issue>
 
@@ -20005,8 +19466,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9481"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9118"
             column="14"/>
     </issue>
 
@@ -20016,8 +19477,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9482"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9119"
             column="22"/>
     </issue>
 
@@ -20027,8 +19488,8 @@
         errorLine1="      public Builder addAllContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9494"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9131"
             column="14"/>
     </issue>
 
@@ -20038,8 +19499,8 @@
         errorLine1="          java.lang.Iterable&lt;? extends androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> values) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9495"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9132"
             column="11"/>
     </issue>
 
@@ -20049,8 +19510,8 @@
         errorLine1="      public Builder clearContents() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9507"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9144"
             column="14"/>
     </issue>
 
@@ -20060,8 +19521,8 @@
         errorLine1="      public Builder removeContents(int index) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9519"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9156"
             column="14"/>
     </issue>
 
@@ -20071,8 +19532,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getHeight() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9546"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9183"
             column="14"/>
     </issue>
 
@@ -20082,8 +19543,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9557"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9194"
             column="14"/>
     </issue>
 
@@ -20093,8 +19554,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9557"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9194"
             column="32"/>
     </issue>
 
@@ -20104,8 +19565,8 @@
         errorLine1="      public Builder setHeight("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9570"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9207"
             column="14"/>
     </issue>
 
@@ -20115,8 +19576,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ContainerDimension.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9571"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9208"
             column="11"/>
     </issue>
 
@@ -20126,8 +19587,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9584"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9221"
             column="14"/>
     </issue>
 
@@ -20137,8 +19598,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9584"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9221"
             column="34"/>
     </issue>
 
@@ -20148,8 +19609,8 @@
         errorLine1="      public Builder clearHeight() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9597"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9234"
             column="14"/>
     </issue>
 
@@ -20159,8 +19620,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getWidth() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9623"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9260"
             column="14"/>
     </issue>
 
@@ -20170,8 +19631,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9634"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9271"
             column="14"/>
     </issue>
 
@@ -20181,8 +19642,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9634"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9271"
             column="31"/>
     </issue>
 
@@ -20192,8 +19653,8 @@
         errorLine1="      public Builder setWidth("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9647"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9284"
             column="14"/>
     </issue>
 
@@ -20203,8 +19664,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ContainerDimension.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9648"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9285"
             column="11"/>
     </issue>
 
@@ -20214,8 +19675,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9661"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9298"
             column="14"/>
     </issue>
 
@@ -20225,8 +19686,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9661"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9298"
             column="33"/>
     </issue>
 
@@ -20236,8 +19697,8 @@
         errorLine1="      public Builder clearWidth() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9674"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9311"
             column="14"/>
     </issue>
 
@@ -20247,8 +19708,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp getHorizontalAlignment() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9700"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9337"
             column="14"/>
     </issue>
 
@@ -20258,8 +19719,8 @@
         errorLine1="      public Builder setHorizontalAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9711"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9348"
             column="14"/>
     </issue>
 
@@ -20269,8 +19730,8 @@
         errorLine1="      public Builder setHorizontalAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9711"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9348"
             column="45"/>
     </issue>
 
@@ -20280,8 +19741,8 @@
         errorLine1="      public Builder setHorizontalAlignment("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9724"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9361"
             column="14"/>
     </issue>
 
@@ -20291,8 +19752,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9725"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9362"
             column="11"/>
     </issue>
 
@@ -20302,8 +19763,8 @@
         errorLine1="      public Builder mergeHorizontalAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9738"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9375"
             column="14"/>
     </issue>
 
@@ -20313,8 +19774,8 @@
         errorLine1="      public Builder mergeHorizontalAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9738"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9375"
             column="47"/>
     </issue>
 
@@ -20324,8 +19785,8 @@
         errorLine1="      public Builder clearHorizontalAlignment() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9751"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9388"
             column="14"/>
     </issue>
 
@@ -20335,8 +19796,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp getVerticalAlignment() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9777"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9414"
             column="14"/>
     </issue>
 
@@ -20346,8 +19807,8 @@
         errorLine1="      public Builder setVerticalAlignment(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9788"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9425"
             column="14"/>
     </issue>
 
@@ -20357,8 +19818,8 @@
         errorLine1="      public Builder setVerticalAlignment(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9788"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9425"
             column="43"/>
     </issue>
 
@@ -20368,8 +19829,8 @@
         errorLine1="      public Builder setVerticalAlignment("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9801"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9438"
             column="14"/>
     </issue>
 
@@ -20379,8 +19840,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9802"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9439"
             column="11"/>
     </issue>
 
@@ -20390,8 +19851,8 @@
         errorLine1="      public Builder mergeVerticalAlignment(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9815"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9452"
             column="14"/>
     </issue>
 
@@ -20401,8 +19862,8 @@
         errorLine1="      public Builder mergeVerticalAlignment(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9815"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9452"
             column="45"/>
     </issue>
 
@@ -20412,8 +19873,8 @@
         errorLine1="      public Builder clearVerticalAlignment() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9828"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9465"
             column="14"/>
     </issue>
 
@@ -20423,8 +19884,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9852"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9489"
             column="14"/>
     </issue>
 
@@ -20434,8 +19895,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9862"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9499"
             column="14"/>
     </issue>
 
@@ -20445,8 +19906,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9862"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9499"
             column="35"/>
     </issue>
 
@@ -20456,8 +19917,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9874"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9511"
             column="14"/>
     </issue>
 
@@ -20467,8 +19928,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Modifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9875"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9512"
             column="11"/>
     </issue>
 
@@ -20478,8 +19939,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9887"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9524"
             column="14"/>
     </issue>
 
@@ -20489,8 +19950,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9887"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9524"
             column="37"/>
     </issue>
 
@@ -20500,8 +19961,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9899"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9536"
             column="14"/>
     </issue>
 
@@ -20511,8 +19972,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9908"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9545"
             column="21"/>
     </issue>
 
@@ -20522,8 +19983,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9909"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9546"
             column="9"/>
     </issue>
 
@@ -20533,8 +19994,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9910"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9547"
             column="9"/>
     </issue>
 
@@ -20544,8 +20005,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9910"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9547"
             column="32"/>
     </issue>
 
@@ -20555,8 +20016,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Box getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9974"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9611"
             column="19"/>
     </issue>
 
@@ -20566,8 +20027,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Box> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="9980"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9617"
             column="19"/>
     </issue>
 
@@ -20577,8 +20038,8 @@
         errorLine1="    androidx.wear.tiles.proto.TypesProto.StringProp getText();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10006"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9643"
             column="5"/>
     </issue>
 
@@ -20588,8 +20049,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.FontStyle getFontStyle();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10027"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9664"
             column="5"/>
     </issue>
 
@@ -20599,8 +20060,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.SpanModifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10046"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9683"
             column="5"/>
     </issue>
 
@@ -20610,8 +20071,8 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.StringProp getText() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10083"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9722"
             column="12"/>
     </issue>
 
@@ -20621,8 +20082,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.FontStyle getFontStyle() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10167"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9806"
             column="12"/>
     </issue>
 
@@ -20632,8 +20093,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.SpanModifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10253"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9892"
             column="12"/>
     </issue>
 
@@ -20643,8 +20104,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10314"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9953"
             column="19"/>
     </issue>
 
@@ -20654,8 +20115,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10315"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9954"
             column="9"/>
     </issue>
 
@@ -20665,8 +20126,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10320"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9959"
             column="19"/>
     </issue>
 
@@ -20676,8 +20137,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10321"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9960"
             column="9"/>
     </issue>
 
@@ -20687,8 +20148,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10322"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9961"
             column="9"/>
     </issue>
 
@@ -20698,8 +20159,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10327"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9966"
             column="19"/>
     </issue>
 
@@ -20709,8 +20170,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10328"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9967"
             column="9"/>
     </issue>
 
@@ -20720,8 +20181,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10333"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9972"
             column="19"/>
     </issue>
 
@@ -20731,8 +20192,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10334"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9973"
             column="9"/>
     </issue>
 
@@ -20742,8 +20203,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10335"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9974"
             column="9"/>
     </issue>
 
@@ -20753,8 +20214,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10340"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9979"
             column="19"/>
     </issue>
 
@@ -20764,8 +20225,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom(byte[] data)"
         errorLine2="                                                                                  ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10340"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9979"
             column="83"/>
     </issue>
 
@@ -20775,8 +20236,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10345"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9984"
             column="19"/>
     </issue>
 
@@ -20786,8 +20247,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10346"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9985"
             column="9"/>
     </issue>
 
@@ -20797,8 +20258,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10347"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9986"
             column="9"/>
     </issue>
 
@@ -20808,8 +20269,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10352"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9991"
             column="19"/>
     </issue>
 
@@ -20819,8 +20280,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10352"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9991"
             column="83"/>
     </issue>
 
@@ -20830,8 +20291,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10357"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9996"
             column="19"/>
     </issue>
 
@@ -20841,8 +20302,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10358"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9997"
             column="9"/>
     </issue>
 
@@ -20852,8 +20313,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10359"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="9998"
             column="9"/>
     </issue>
 
@@ -20863,8 +20324,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10364"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10003"
             column="19"/>
     </issue>
 
@@ -20874,8 +20335,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10364"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10003"
             column="92"/>
     </issue>
 
@@ -20885,8 +20346,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10368"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10007"
             column="19"/>
     </issue>
 
@@ -20896,8 +20357,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10369"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10008"
             column="9"/>
     </issue>
 
@@ -20907,8 +20368,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10370"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10009"
             column="9"/>
     </issue>
 
@@ -20918,8 +20379,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10374"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10013"
             column="19"/>
     </issue>
 
@@ -20929,8 +20390,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10375"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10014"
             column="9"/>
     </issue>
 
@@ -20940,8 +20401,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10380"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10019"
             column="19"/>
     </issue>
 
@@ -20951,8 +20412,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10381"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10020"
             column="9"/>
     </issue>
 
@@ -20962,8 +20423,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10382"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10021"
             column="9"/>
     </issue>
 
@@ -20973,8 +20434,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10388"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10027"
             column="19"/>
     </issue>
 
@@ -20984,8 +20445,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.SpanText prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10391"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10030"
             column="19"/>
     </issue>
 
@@ -20995,8 +20456,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.SpanText prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10391"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10030"
             column="38"/>
     </issue>
 
@@ -21006,8 +20467,8 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.StringProp getText() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10432"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10073"
             column="14"/>
     </issue>
 
@@ -21017,8 +20478,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10442"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10083"
             column="14"/>
     </issue>
 
@@ -21028,8 +20489,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10442"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10083"
             column="30"/>
     </issue>
 
@@ -21039,8 +20500,8 @@
         errorLine1="      public Builder setText("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10454"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10095"
             column="14"/>
     </issue>
 
@@ -21050,8 +20511,8 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.StringProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10455"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10096"
             column="11"/>
     </issue>
 
@@ -21061,8 +20522,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10467"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10108"
             column="14"/>
     </issue>
 
@@ -21072,8 +20533,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10467"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10108"
             column="32"/>
     </issue>
 
@@ -21083,8 +20544,8 @@
         errorLine1="      public Builder clearText() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10479"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10120"
             column="14"/>
     </issue>
 
@@ -21094,8 +20555,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.FontStyle getFontStyle() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10505"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10146"
             column="14"/>
     </issue>
 
@@ -21105,8 +20566,8 @@
         errorLine1="      public Builder setFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10516"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10157"
             column="14"/>
     </issue>
 
@@ -21116,8 +20577,8 @@
         errorLine1="      public Builder setFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10516"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10157"
             column="35"/>
     </issue>
 
@@ -21127,8 +20588,8 @@
         errorLine1="      public Builder setFontStyle("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10529"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10170"
             column="14"/>
     </issue>
 
@@ -21138,8 +20599,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.FontStyle.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10530"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10171"
             column="11"/>
     </issue>
 
@@ -21149,8 +20610,8 @@
         errorLine1="      public Builder mergeFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10543"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10184"
             column="14"/>
     </issue>
 
@@ -21160,8 +20621,8 @@
         errorLine1="      public Builder mergeFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10543"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10184"
             column="37"/>
     </issue>
 
@@ -21171,8 +20632,8 @@
         errorLine1="      public Builder clearFontStyle() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10556"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10197"
             column="14"/>
     </issue>
 
@@ -21182,8 +20643,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.SpanModifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10580"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10221"
             column="14"/>
     </issue>
 
@@ -21193,8 +20654,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10590"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10231"
             column="14"/>
     </issue>
 
@@ -21204,8 +20665,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10590"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10231"
             column="35"/>
     </issue>
 
@@ -21215,8 +20676,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10602"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10243"
             column="14"/>
     </issue>
 
@@ -21226,8 +20687,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.SpanModifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10603"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10244"
             column="11"/>
     </issue>
 
@@ -21237,8 +20698,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10615"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10256"
             column="14"/>
     </issue>
 
@@ -21248,8 +20709,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10615"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10256"
             column="37"/>
     </issue>
 
@@ -21259,8 +20720,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10627"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10268"
             column="14"/>
     </issue>
 
@@ -21270,8 +20731,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10636"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10277"
             column="21"/>
     </issue>
 
@@ -21281,8 +20742,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10637"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10278"
             column="9"/>
     </issue>
 
@@ -21292,8 +20753,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10638"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10279"
             column="9"/>
     </issue>
 
@@ -21303,8 +20764,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10638"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10279"
             column="32"/>
     </issue>
 
@@ -21314,8 +20775,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanText getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10698"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10339"
             column="19"/>
     </issue>
 
@@ -21325,8 +20786,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;SpanText> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10704"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10345"
             column="19"/>
     </issue>
 
@@ -21336,8 +20797,8 @@
         errorLine1="    androidx.wear.tiles.proto.TypesProto.StringProp getResourceId();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10732"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10373"
             column="5"/>
     </issue>
 
@@ -21347,8 +20808,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getWidth();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10751"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10392"
             column="5"/>
     </issue>
 
@@ -21358,8 +20819,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getHeight();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10770"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10411"
             column="5"/>
     </issue>
 
@@ -21369,8 +20830,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.SpanModifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10789"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10430"
             column="5"/>
     </issue>
 
@@ -21380,8 +20841,8 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.StringProp getResourceId() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10828"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10469"
             column="12"/>
     </issue>
 
@@ -21391,8 +20852,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getWidth() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10914"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10555"
             column="12"/>
     </issue>
 
@@ -21402,8 +20863,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getHeight() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="10996"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10637"
             column="12"/>
     </issue>
 
@@ -21413,8 +20874,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.SpanModifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11078"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10719"
             column="12"/>
     </issue>
 
@@ -21424,8 +20885,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11139"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10780"
             column="19"/>
     </issue>
 
@@ -21435,8 +20896,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11140"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10781"
             column="9"/>
     </issue>
 
@@ -21446,8 +20907,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11145"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10786"
             column="19"/>
     </issue>
 
@@ -21457,8 +20918,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11146"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10787"
             column="9"/>
     </issue>
 
@@ -21468,8 +20929,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11147"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10788"
             column="9"/>
     </issue>
 
@@ -21479,8 +20940,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11152"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10793"
             column="19"/>
     </issue>
 
@@ -21490,8 +20951,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11153"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10794"
             column="9"/>
     </issue>
 
@@ -21501,8 +20962,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11158"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10799"
             column="19"/>
     </issue>
 
@@ -21512,8 +20973,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11159"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10800"
             column="9"/>
     </issue>
 
@@ -21523,8 +20984,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11160"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10801"
             column="9"/>
     </issue>
 
@@ -21534,8 +20995,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11165"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10806"
             column="19"/>
     </issue>
 
@@ -21545,8 +21006,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom(byte[] data)"
         errorLine2="                                                                                   ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11165"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10806"
             column="84"/>
     </issue>
 
@@ -21556,8 +21017,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11170"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10811"
             column="19"/>
     </issue>
 
@@ -21567,8 +21028,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11171"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10812"
             column="9"/>
     </issue>
 
@@ -21578,8 +21039,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11172"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10813"
             column="9"/>
     </issue>
 
@@ -21589,8 +21050,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11177"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10818"
             column="19"/>
     </issue>
 
@@ -21600,8 +21061,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11177"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10818"
             column="84"/>
     </issue>
 
@@ -21611,8 +21072,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11182"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10823"
             column="19"/>
     </issue>
 
@@ -21622,8 +21083,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11183"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10824"
             column="9"/>
     </issue>
 
@@ -21633,8 +21094,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11184"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10825"
             column="9"/>
     </issue>
 
@@ -21644,8 +21105,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11189"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10830"
             column="19"/>
     </issue>
 
@@ -21655,8 +21116,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11189"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10830"
             column="93"/>
     </issue>
 
@@ -21666,8 +21127,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11193"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10834"
             column="19"/>
     </issue>
 
@@ -21677,8 +21138,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11194"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10835"
             column="9"/>
     </issue>
 
@@ -21688,8 +21149,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11195"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10836"
             column="9"/>
     </issue>
 
@@ -21699,8 +21160,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11199"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10840"
             column="19"/>
     </issue>
 
@@ -21710,8 +21171,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11200"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10841"
             column="9"/>
     </issue>
 
@@ -21721,8 +21182,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11205"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10846"
             column="19"/>
     </issue>
 
@@ -21732,8 +21193,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11206"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10847"
             column="9"/>
     </issue>
 
@@ -21743,8 +21204,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11207"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10848"
             column="9"/>
     </issue>
 
@@ -21754,8 +21215,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11213"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10854"
             column="19"/>
     </issue>
 
@@ -21765,8 +21226,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.SpanImage prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11216"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10857"
             column="19"/>
     </issue>
 
@@ -21776,8 +21237,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.SpanImage prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11216"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10857"
             column="38"/>
     </issue>
 
@@ -21787,8 +21248,8 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.StringProp getResourceId() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11259"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10900"
             column="14"/>
     </issue>
 
@@ -21798,8 +21259,8 @@
         errorLine1="      public Builder setResourceId(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11270"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10911"
             column="14"/>
     </issue>
 
@@ -21809,8 +21270,8 @@
         errorLine1="      public Builder setResourceId(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11270"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10911"
             column="36"/>
     </issue>
 
@@ -21820,8 +21281,8 @@
         errorLine1="      public Builder setResourceId("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11283"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10924"
             column="14"/>
     </issue>
 
@@ -21831,8 +21292,8 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.StringProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11284"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10925"
             column="11"/>
     </issue>
 
@@ -21842,8 +21303,8 @@
         errorLine1="      public Builder mergeResourceId(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11297"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10938"
             column="14"/>
     </issue>
 
@@ -21853,8 +21314,8 @@
         errorLine1="      public Builder mergeResourceId(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11297"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10938"
             column="38"/>
     </issue>
 
@@ -21864,8 +21325,8 @@
         errorLine1="      public Builder clearResourceId() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11310"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10951"
             column="14"/>
     </issue>
 
@@ -21875,8 +21336,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getWidth() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11334"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10975"
             column="14"/>
     </issue>
 
@@ -21886,8 +21347,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11344"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10985"
             column="14"/>
     </issue>
 
@@ -21897,8 +21358,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11344"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10985"
             column="31"/>
     </issue>
 
@@ -21908,8 +21369,8 @@
         errorLine1="      public Builder setWidth("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11356"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10997"
             column="14"/>
     </issue>
 
@@ -21919,8 +21380,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11357"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="10998"
             column="11"/>
     </issue>
 
@@ -21930,8 +21391,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11369"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11010"
             column="14"/>
     </issue>
 
@@ -21941,8 +21402,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11369"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11010"
             column="33"/>
     </issue>
 
@@ -21952,8 +21413,8 @@
         errorLine1="      public Builder clearWidth() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11381"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11022"
             column="14"/>
     </issue>
 
@@ -21963,8 +21424,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getHeight() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11405"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11046"
             column="14"/>
     </issue>
 
@@ -21974,8 +21435,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11415"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11056"
             column="14"/>
     </issue>
 
@@ -21985,8 +21446,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11415"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11056"
             column="32"/>
     </issue>
 
@@ -21996,8 +21457,8 @@
         errorLine1="      public Builder setHeight("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11427"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11068"
             column="14"/>
     </issue>
 
@@ -22007,8 +21468,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11428"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11069"
             column="11"/>
     </issue>
 
@@ -22018,8 +21479,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11440"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11081"
             column="14"/>
     </issue>
 
@@ -22029,8 +21490,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11440"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11081"
             column="34"/>
     </issue>
 
@@ -22040,8 +21501,8 @@
         errorLine1="      public Builder clearHeight() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11452"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11093"
             column="14"/>
     </issue>
 
@@ -22051,8 +21512,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.SpanModifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11476"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11117"
             column="14"/>
     </issue>
 
@@ -22062,8 +21523,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11486"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11127"
             column="14"/>
     </issue>
 
@@ -22073,8 +21534,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11486"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11127"
             column="35"/>
     </issue>
 
@@ -22084,8 +21545,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11498"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11139"
             column="14"/>
     </issue>
 
@@ -22095,8 +21556,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.SpanModifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11499"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11140"
             column="11"/>
     </issue>
 
@@ -22106,8 +21567,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11511"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11152"
             column="14"/>
     </issue>
 
@@ -22117,8 +21578,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11511"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11152"
             column="37"/>
     </issue>
 
@@ -22128,8 +21589,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11523"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11164"
             column="14"/>
     </issue>
 
@@ -22139,8 +21600,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11532"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11173"
             column="21"/>
     </issue>
 
@@ -22150,8 +21611,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11533"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11174"
             column="9"/>
     </issue>
 
@@ -22161,8 +21622,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11534"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11175"
             column="9"/>
     </issue>
 
@@ -22172,8 +21633,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11534"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11175"
             column="32"/>
     </issue>
 
@@ -22183,8 +21644,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.SpanImage getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11595"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11236"
             column="19"/>
     </issue>
 
@@ -22194,8 +21655,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;SpanImage> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11601"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11242"
             column="19"/>
     </issue>
 
@@ -22205,8 +21666,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.SpanText getText();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11619"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11260"
             column="5"/>
     </issue>
 
@@ -22216,8 +21677,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.SpanImage getImage();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11630"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11271"
             column="5"/>
     </issue>
 
@@ -22227,8 +21688,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Span.InnerCase getInnerCase();"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11632"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11273"
             column="12"/>
     </issue>
 
@@ -22238,8 +21699,8 @@
         errorLine1="      public static InnerCase valueOf(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11664"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11305"
             column="21"/>
     </issue>
 
@@ -22249,8 +21710,8 @@
         errorLine1="      public static InnerCase forNumber(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11668"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11309"
             column="21"/>
     </issue>
 
@@ -22260,8 +21721,8 @@
         errorLine1="    public InnerCase"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11682"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11323"
             column="12"/>
     </issue>
 
@@ -22271,8 +21732,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.SpanText getText() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11705"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11346"
             column="12"/>
     </issue>
 
@@ -22282,8 +21743,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.SpanImage getImage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11767"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11408"
             column="12"/>
     </issue>
 
@@ -22293,8 +21754,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11817"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11458"
             column="19"/>
     </issue>
 
@@ -22304,8 +21765,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11818"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11459"
             column="9"/>
     </issue>
 
@@ -22315,8 +21776,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11823"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11464"
             column="19"/>
     </issue>
 
@@ -22326,8 +21787,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11824"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11465"
             column="9"/>
     </issue>
 
@@ -22337,8 +21798,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11825"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11466"
             column="9"/>
     </issue>
 
@@ -22348,8 +21809,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11830"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11471"
             column="19"/>
     </issue>
 
@@ -22359,8 +21820,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11831"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11472"
             column="9"/>
     </issue>
 
@@ -22370,8 +21831,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11836"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11477"
             column="19"/>
     </issue>
 
@@ -22381,8 +21842,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11837"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11478"
             column="9"/>
     </issue>
 
@@ -22392,8 +21853,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11838"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11479"
             column="9"/>
     </issue>
 
@@ -22403,8 +21864,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11843"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11484"
             column="19"/>
     </issue>
 
@@ -22414,8 +21875,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom(byte[] data)"
         errorLine2="                                                                              ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11843"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11484"
             column="79"/>
     </issue>
 
@@ -22425,8 +21886,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11848"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11489"
             column="19"/>
     </issue>
 
@@ -22436,8 +21897,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11849"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11490"
             column="9"/>
     </issue>
 
@@ -22447,8 +21908,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11850"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11491"
             column="9"/>
     </issue>
 
@@ -22458,8 +21919,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11855"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11496"
             column="19"/>
     </issue>
 
@@ -22469,8 +21930,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom(java.io.InputStream input)"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11855"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11496"
             column="79"/>
     </issue>
 
@@ -22480,8 +21941,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11860"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11501"
             column="19"/>
     </issue>
 
@@ -22491,8 +21952,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11861"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11502"
             column="9"/>
     </issue>
 
@@ -22502,8 +21963,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11862"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11503"
             column="9"/>
     </issue>
 
@@ -22513,8 +21974,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11867"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11508"
             column="19"/>
     </issue>
 
@@ -22524,8 +21985,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11867"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11508"
             column="88"/>
     </issue>
 
@@ -22535,8 +21996,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11871"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11512"
             column="19"/>
     </issue>
 
@@ -22546,8 +22007,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11872"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11513"
             column="9"/>
     </issue>
 
@@ -22557,8 +22018,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11873"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11514"
             column="9"/>
     </issue>
 
@@ -22568,8 +22029,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11877"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11518"
             column="19"/>
     </issue>
 
@@ -22579,8 +22040,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11878"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11519"
             column="9"/>
     </issue>
 
@@ -22590,8 +22051,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11883"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11524"
             column="19"/>
     </issue>
 
@@ -22601,8 +22062,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11884"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11525"
             column="9"/>
     </issue>
 
@@ -22612,8 +22073,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11885"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11526"
             column="9"/>
     </issue>
 
@@ -22623,8 +22084,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11891"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11532"
             column="19"/>
     </issue>
 
@@ -22634,8 +22095,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Span prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11894"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11535"
             column="19"/>
     </issue>
 
@@ -22645,8 +22106,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Span prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11894"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11535"
             column="38"/>
     </issue>
 
@@ -22656,8 +22117,8 @@
         errorLine1="      public InnerCase"
         errorLine2="             ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11918"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11559"
             column="14"/>
     </issue>
 
@@ -22667,8 +22128,8 @@
         errorLine1="      public Builder clearInner() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11923"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11564"
             column="14"/>
     </issue>
 
@@ -22678,8 +22139,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.SpanText getText() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11941"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11582"
             column="14"/>
     </issue>
 
@@ -22689,8 +22150,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.LayoutElementProto.SpanText value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11947"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11588"
             column="14"/>
     </issue>
 
@@ -22700,8 +22161,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.LayoutElementProto.SpanText value) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11947"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11588"
             column="30"/>
     </issue>
 
@@ -22711,8 +22172,8 @@
         errorLine1="      public Builder setText("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11955"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11596"
             column="14"/>
     </issue>
 
@@ -22722,8 +22183,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.SpanText.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11956"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11597"
             column="11"/>
     </issue>
 
@@ -22733,8 +22194,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.LayoutElementProto.SpanText value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11964"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11605"
             column="14"/>
     </issue>
 
@@ -22744,8 +22205,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.LayoutElementProto.SpanText value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11964"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11605"
             column="32"/>
     </issue>
 
@@ -22755,8 +22216,8 @@
         errorLine1="      public Builder clearText() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11972"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11613"
             column="14"/>
     </issue>
 
@@ -22766,8 +22227,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.SpanImage getImage() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11989"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11630"
             column="14"/>
     </issue>
 
@@ -22777,8 +22238,8 @@
         errorLine1="      public Builder setImage(androidx.wear.tiles.proto.LayoutElementProto.SpanImage value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11995"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11636"
             column="14"/>
     </issue>
 
@@ -22788,8 +22249,8 @@
         errorLine1="      public Builder setImage(androidx.wear.tiles.proto.LayoutElementProto.SpanImage value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="11995"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11636"
             column="31"/>
     </issue>
 
@@ -22799,8 +22260,8 @@
         errorLine1="      public Builder setImage("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12003"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11644"
             column="14"/>
     </issue>
 
@@ -22810,8 +22271,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.SpanImage.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12004"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11645"
             column="11"/>
     </issue>
 
@@ -22821,8 +22282,8 @@
         errorLine1="      public Builder mergeImage(androidx.wear.tiles.proto.LayoutElementProto.SpanImage value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12012"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11653"
             column="14"/>
     </issue>
 
@@ -22832,8 +22293,8 @@
         errorLine1="      public Builder mergeImage(androidx.wear.tiles.proto.LayoutElementProto.SpanImage value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12012"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11653"
             column="33"/>
     </issue>
 
@@ -22843,8 +22304,8 @@
         errorLine1="      public Builder clearImage() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12020"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11661"
             column="14"/>
     </issue>
 
@@ -22854,8 +22315,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12030"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11671"
             column="21"/>
     </issue>
 
@@ -22865,8 +22326,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12031"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11672"
             column="9"/>
     </issue>
 
@@ -22876,8 +22337,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12032"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11673"
             column="9"/>
     </issue>
 
@@ -22887,8 +22348,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12032"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11673"
             column="32"/>
     </issue>
 
@@ -22898,8 +22359,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Span getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12093"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11734"
             column="19"/>
     </issue>
 
@@ -22909,8 +22370,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Span> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12099"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11740"
             column="19"/>
     </issue>
 
@@ -22920,8 +22381,8 @@
         errorLine1="    java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.Span> "
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12115"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11756"
             column="5"/>
     </issue>
 
@@ -22931,8 +22392,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.Span getSpans(int index);"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12124"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11765"
             column="5"/>
     </issue>
 
@@ -22942,8 +22403,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12151"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11792"
             column="5"/>
     </issue>
 
@@ -22953,8 +22414,8 @@
         errorLine1="    androidx.wear.tiles.proto.TypesProto.Int32Prop getMaxLines();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12174"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11815"
             column="5"/>
     </issue>
 
@@ -22964,8 +22425,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp getMultilineAlignment();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12203"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11844"
             column="5"/>
     </issue>
 
@@ -22975,8 +22436,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp getOverflow();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12232"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11873"
             column="5"/>
     </issue>
 
@@ -22986,8 +22447,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.SpProp getLineSpacing();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12259"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11900"
             column="5"/>
     </issue>
 
@@ -22997,8 +22458,8 @@
         errorLine1="    public java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.Span> getSpansList() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12290"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11931"
             column="12"/>
     </issue>
 
@@ -23008,8 +22469,8 @@
         errorLine1="    public java.util.List&lt;? extends androidx.wear.tiles.proto.LayoutElementProto.SpanOrBuilder> "
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12300"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11941"
             column="12"/>
     </issue>
 
@@ -23019,8 +22480,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Span getSpans(int index) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12323"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11964"
             column="12"/>
     </issue>
 
@@ -23030,8 +22491,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.SpanOrBuilder getSpansOrBuilder("
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12333"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="11974"
             column="12"/>
     </issue>
 
@@ -23041,8 +22502,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12480"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12121"
             column="12"/>
     </issue>
 
@@ -23052,8 +22513,8 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.Int32Prop getMaxLines() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12566"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12207"
             column="12"/>
     </issue>
 
@@ -23063,8 +22524,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp getMultilineAlignment() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12666"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12307"
             column="12"/>
     </issue>
 
@@ -23074,8 +22535,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp getOverflow() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12778"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12419"
             column="12"/>
     </issue>
 
@@ -23085,8 +22546,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.SpProp getLineSpacing() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12888"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12529"
             column="12"/>
     </issue>
 
@@ -23096,8 +22557,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12965"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12606"
             column="19"/>
     </issue>
 
@@ -23107,8 +22568,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12966"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12607"
             column="9"/>
     </issue>
 
@@ -23118,8 +22579,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12971"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12612"
             column="19"/>
     </issue>
 
@@ -23129,8 +22590,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12972"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12613"
             column="9"/>
     </issue>
 
@@ -23140,8 +22601,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12973"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12614"
             column="9"/>
     </issue>
 
@@ -23151,8 +22612,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12978"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12619"
             column="19"/>
     </issue>
 
@@ -23162,8 +22623,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12979"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12620"
             column="9"/>
     </issue>
 
@@ -23173,8 +22634,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12984"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12625"
             column="19"/>
     </issue>
 
@@ -23184,8 +22645,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12985"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12626"
             column="9"/>
     </issue>
 
@@ -23195,8 +22656,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12986"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12627"
             column="9"/>
     </issue>
 
@@ -23206,8 +22667,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12991"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12632"
             column="19"/>
     </issue>
 
@@ -23217,8 +22678,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom(byte[] data)"
         errorLine2="                                                                                   ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12991"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12632"
             column="84"/>
     </issue>
 
@@ -23228,8 +22689,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12996"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12637"
             column="19"/>
     </issue>
 
@@ -23239,8 +22700,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12997"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12638"
             column="9"/>
     </issue>
 
@@ -23250,8 +22711,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="12998"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12639"
             column="9"/>
     </issue>
 
@@ -23261,8 +22722,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13003"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12644"
             column="19"/>
     </issue>
 
@@ -23272,8 +22733,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13003"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12644"
             column="84"/>
     </issue>
 
@@ -23283,8 +22744,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13008"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12649"
             column="19"/>
     </issue>
 
@@ -23294,8 +22755,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13009"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12650"
             column="9"/>
     </issue>
 
@@ -23305,8 +22766,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13010"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12651"
             column="9"/>
     </issue>
 
@@ -23316,8 +22777,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13015"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12656"
             column="19"/>
     </issue>
 
@@ -23327,8 +22788,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13015"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12656"
             column="93"/>
     </issue>
 
@@ -23338,8 +22799,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13019"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12660"
             column="19"/>
     </issue>
 
@@ -23349,8 +22810,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13020"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12661"
             column="9"/>
     </issue>
 
@@ -23360,8 +22821,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13021"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12662"
             column="9"/>
     </issue>
 
@@ -23371,8 +22832,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13025"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12666"
             column="19"/>
     </issue>
 
@@ -23382,8 +22843,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13026"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12667"
             column="9"/>
     </issue>
 
@@ -23393,8 +22854,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13031"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12672"
             column="19"/>
     </issue>
 
@@ -23404,8 +22865,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13032"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12673"
             column="9"/>
     </issue>
 
@@ -23415,8 +22876,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13033"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12674"
             column="9"/>
     </issue>
 
@@ -23426,8 +22887,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13039"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12680"
             column="19"/>
     </issue>
 
@@ -23437,8 +22898,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Spannable prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13042"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12683"
             column="19"/>
     </issue>
 
@@ -23448,8 +22909,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Spannable prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13042"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12683"
             column="38"/>
     </issue>
 
@@ -23459,8 +22920,8 @@
         errorLine1="      public java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.Span> getSpansList() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13076"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12717"
             column="14"/>
     </issue>
 
@@ -23470,8 +22931,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.Span getSpans(int index) {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13098"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12739"
             column="14"/>
     </issue>
 
@@ -23481,8 +22942,8 @@
         errorLine1="      public Builder setSpans("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13108"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12749"
             column="14"/>
     </issue>
 
@@ -23492,8 +22953,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.Span value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13109"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12750"
             column="22"/>
     </issue>
 
@@ -23503,8 +22964,8 @@
         errorLine1="      public Builder setSpans("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13121"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12762"
             column="14"/>
     </issue>
 
@@ -23514,8 +22975,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.Span.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13122"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12763"
             column="22"/>
     </issue>
 
@@ -23525,8 +22986,8 @@
         errorLine1="      public Builder addSpans(androidx.wear.tiles.proto.LayoutElementProto.Span value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13134"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12775"
             column="14"/>
     </issue>
 
@@ -23536,8 +22997,8 @@
         errorLine1="      public Builder addSpans(androidx.wear.tiles.proto.LayoutElementProto.Span value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13134"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12775"
             column="31"/>
     </issue>
 
@@ -23547,8 +23008,8 @@
         errorLine1="      public Builder addSpans("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13146"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12787"
             column="14"/>
     </issue>
 
@@ -23558,8 +23019,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.Span value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13147"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12788"
             column="22"/>
     </issue>
 
@@ -23569,8 +23030,8 @@
         errorLine1="      public Builder addSpans("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13159"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12800"
             column="14"/>
     </issue>
 
@@ -23580,8 +23041,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.Span.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13160"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12801"
             column="11"/>
     </issue>
 
@@ -23591,8 +23052,8 @@
         errorLine1="      public Builder addSpans("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13172"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12813"
             column="14"/>
     </issue>
 
@@ -23602,8 +23063,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.Span.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13173"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12814"
             column="22"/>
     </issue>
 
@@ -23613,8 +23074,8 @@
         errorLine1="      public Builder addAllSpans("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13185"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12826"
             column="14"/>
     </issue>
 
@@ -23624,8 +23085,8 @@
         errorLine1="          java.lang.Iterable&lt;? extends androidx.wear.tiles.proto.LayoutElementProto.Span> values) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13186"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12827"
             column="11"/>
     </issue>
 
@@ -23635,8 +23096,8 @@
         errorLine1="      public Builder clearSpans() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13198"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12839"
             column="14"/>
     </issue>
 
@@ -23646,8 +23107,8 @@
         errorLine1="      public Builder removeSpans(int index) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13210"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12851"
             column="14"/>
     </issue>
 
@@ -23657,8 +23118,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13235"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12876"
             column="14"/>
     </issue>
 
@@ -23668,8 +23129,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13245"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12886"
             column="14"/>
     </issue>
 
@@ -23679,8 +23140,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13245"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12886"
             column="35"/>
     </issue>
 
@@ -23690,8 +23151,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13257"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12898"
             column="14"/>
     </issue>
 
@@ -23701,8 +23162,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Modifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13258"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12899"
             column="11"/>
     </issue>
 
@@ -23712,8 +23173,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13270"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12911"
             column="14"/>
     </issue>
 
@@ -23723,8 +23184,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13270"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12911"
             column="37"/>
     </issue>
 
@@ -23734,8 +23195,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13282"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12923"
             column="14"/>
     </issue>
 
@@ -23745,8 +23206,8 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.Int32Prop getMaxLines() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13310"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12951"
             column="14"/>
     </issue>
 
@@ -23756,8 +23217,8 @@
         errorLine1="      public Builder setMaxLines(androidx.wear.tiles.proto.TypesProto.Int32Prop value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13322"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12963"
             column="14"/>
     </issue>
 
@@ -23767,8 +23228,8 @@
         errorLine1="      public Builder setMaxLines(androidx.wear.tiles.proto.TypesProto.Int32Prop value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13322"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12963"
             column="34"/>
     </issue>
 
@@ -23778,8 +23239,8 @@
         errorLine1="      public Builder setMaxLines("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13336"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12977"
             column="14"/>
     </issue>
 
@@ -23789,8 +23250,8 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.Int32Prop.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13337"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12978"
             column="11"/>
     </issue>
 
@@ -23800,8 +23261,8 @@
         errorLine1="      public Builder mergeMaxLines(androidx.wear.tiles.proto.TypesProto.Int32Prop value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13351"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12992"
             column="14"/>
     </issue>
 
@@ -23811,8 +23272,8 @@
         errorLine1="      public Builder mergeMaxLines(androidx.wear.tiles.proto.TypesProto.Int32Prop value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13351"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="12992"
             column="36"/>
     </issue>
 
@@ -23822,8 +23283,8 @@
         errorLine1="      public Builder clearMaxLines() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13365"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13006"
             column="14"/>
     </issue>
 
@@ -23833,8 +23294,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp getMultilineAlignment() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13399"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13040"
             column="14"/>
     </issue>
 
@@ -23844,8 +23305,8 @@
         errorLine1="      public Builder setMultilineAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13414"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13055"
             column="14"/>
     </issue>
 
@@ -23855,8 +23316,8 @@
         errorLine1="      public Builder setMultilineAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13414"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13055"
             column="44"/>
     </issue>
 
@@ -23866,8 +23327,8 @@
         errorLine1="      public Builder setMultilineAlignment("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13431"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13072"
             column="14"/>
     </issue>
 
@@ -23877,8 +23338,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13432"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13073"
             column="11"/>
     </issue>
 
@@ -23888,8 +23349,8 @@
         errorLine1="      public Builder mergeMultilineAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13449"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13090"
             column="14"/>
     </issue>
 
@@ -23899,8 +23360,8 @@
         errorLine1="      public Builder mergeMultilineAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13449"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13090"
             column="46"/>
     </issue>
 
@@ -23910,8 +23371,8 @@
         errorLine1="      public Builder clearMultilineAlignment() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13466"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13107"
             column="14"/>
     </issue>
 
@@ -23921,8 +23382,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp getOverflow() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13500"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13141"
             column="14"/>
     </issue>
 
@@ -23932,8 +23393,8 @@
         errorLine1="      public Builder setOverflow(androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13515"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13156"
             column="14"/>
     </issue>
 
@@ -23943,8 +23404,8 @@
         errorLine1="      public Builder setOverflow(androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13515"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13156"
             column="34"/>
     </issue>
 
@@ -23954,8 +23415,8 @@
         errorLine1="      public Builder setOverflow("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13532"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13173"
             column="14"/>
     </issue>
 
@@ -23965,8 +23426,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13533"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13174"
             column="11"/>
     </issue>
 
@@ -23976,8 +23437,8 @@
         errorLine1="      public Builder mergeOverflow(androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13550"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13191"
             column="14"/>
     </issue>
 
@@ -23987,8 +23448,8 @@
         errorLine1="      public Builder mergeOverflow(androidx.wear.tiles.proto.LayoutElementProto.TextOverflowProp value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13550"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13191"
             column="36"/>
     </issue>
 
@@ -23998,8 +23459,8 @@
         errorLine1="      public Builder clearOverflow() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13567"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13208"
             column="14"/>
     </issue>
 
@@ -24009,8 +23470,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.SpProp getLineSpacing() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13599"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13240"
             column="14"/>
     </issue>
 
@@ -24020,8 +23481,8 @@
         errorLine1="      public Builder setLineSpacing(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13613"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13254"
             column="14"/>
     </issue>
 
@@ -24031,8 +23492,8 @@
         errorLine1="      public Builder setLineSpacing(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13613"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13254"
             column="37"/>
     </issue>
 
@@ -24042,8 +23503,8 @@
         errorLine1="      public Builder setLineSpacing("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13629"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13270"
             column="14"/>
     </issue>
 
@@ -24053,8 +23514,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.SpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13630"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13271"
             column="11"/>
     </issue>
 
@@ -24064,8 +23525,8 @@
         errorLine1="      public Builder mergeLineSpacing(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13646"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13287"
             column="14"/>
     </issue>
 
@@ -24075,8 +23536,8 @@
         errorLine1="      public Builder mergeLineSpacing(androidx.wear.tiles.proto.DimensionProto.SpProp value) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13646"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13287"
             column="39"/>
     </issue>
 
@@ -24086,8 +23547,8 @@
         errorLine1="      public Builder clearLineSpacing() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13662"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13303"
             column="14"/>
     </issue>
 
@@ -24097,8 +23558,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13671"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13312"
             column="21"/>
     </issue>
 
@@ -24108,8 +23569,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13672"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13313"
             column="9"/>
     </issue>
 
@@ -24119,8 +23580,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13673"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13314"
             column="9"/>
     </issue>
 
@@ -24130,8 +23591,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13673"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13314"
             column="32"/>
     </issue>
 
@@ -24141,8 +23602,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Spannable getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13737"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13378"
             column="19"/>
     </issue>
 
@@ -24152,8 +23613,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Spannable> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13743"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13384"
             column="19"/>
     </issue>
 
@@ -24163,8 +23624,8 @@
         errorLine1="    java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> "
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13759"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13400"
             column="5"/>
     </issue>
 
@@ -24174,8 +23635,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContents(int index);"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13768"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13409"
             column="5"/>
     </issue>
 
@@ -24185,8 +23646,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp getHorizontalAlignment();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13799"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13440"
             column="5"/>
     </issue>
 
@@ -24196,8 +23657,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ContainerDimension getWidth();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13820"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13461"
             column="5"/>
     </issue>
 
@@ -24207,8 +23668,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ContainerDimension getHeight();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13841"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13482"
             column="5"/>
     </issue>
 
@@ -24218,8 +23679,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13860"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13501"
             column="5"/>
     </issue>
 
@@ -24229,8 +23690,8 @@
         errorLine1="    public java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> getContentsList() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13893"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13534"
             column="12"/>
     </issue>
 
@@ -24240,8 +23701,8 @@
         errorLine1="    public java.util.List&lt;? extends androidx.wear.tiles.proto.LayoutElementProto.LayoutElementOrBuilder> "
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13903"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13544"
             column="12"/>
     </issue>
 
@@ -24251,8 +23712,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContents(int index) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13926"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13567"
             column="12"/>
     </issue>
 
@@ -24262,8 +23723,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.LayoutElementOrBuilder getContentsOrBuilder("
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="13936"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13577"
             column="12"/>
     </issue>
 
@@ -24273,8 +23734,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp getHorizontalAlignment() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14087"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13728"
             column="12"/>
     </issue>
 
@@ -24284,8 +23745,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getWidth() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14179"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13820"
             column="12"/>
     </issue>
 
@@ -24295,8 +23756,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getHeight() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14267"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13908"
             column="12"/>
     </issue>
 
@@ -24306,8 +23767,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14353"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="13994"
             column="12"/>
     </issue>
 
@@ -24317,8 +23778,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14414"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14055"
             column="19"/>
     </issue>
 
@@ -24328,8 +23789,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14415"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14056"
             column="9"/>
     </issue>
 
@@ -24339,8 +23800,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14420"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14061"
             column="19"/>
     </issue>
 
@@ -24350,8 +23811,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14421"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14062"
             column="9"/>
     </issue>
 
@@ -24361,8 +23822,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14422"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14063"
             column="9"/>
     </issue>
 
@@ -24372,8 +23833,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14427"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14068"
             column="19"/>
     </issue>
 
@@ -24383,8 +23844,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14428"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14069"
             column="9"/>
     </issue>
 
@@ -24394,8 +23855,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14433"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14074"
             column="19"/>
     </issue>
 
@@ -24405,8 +23866,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14434"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14075"
             column="9"/>
     </issue>
 
@@ -24416,8 +23877,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14435"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14076"
             column="9"/>
     </issue>
 
@@ -24427,8 +23888,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14440"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14081"
             column="19"/>
     </issue>
 
@@ -24438,8 +23899,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom(byte[] data)"
         errorLine2="                                                                                ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14440"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14081"
             column="81"/>
     </issue>
 
@@ -24449,8 +23910,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14445"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14086"
             column="19"/>
     </issue>
 
@@ -24460,8 +23921,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14446"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14087"
             column="9"/>
     </issue>
 
@@ -24471,8 +23932,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14447"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14088"
             column="9"/>
     </issue>
 
@@ -24482,8 +23943,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14452"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14093"
             column="19"/>
     </issue>
 
@@ -24493,8 +23954,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14452"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14093"
             column="81"/>
     </issue>
 
@@ -24504,8 +23965,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14457"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14098"
             column="19"/>
     </issue>
 
@@ -24515,8 +23976,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14458"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14099"
             column="9"/>
     </issue>
 
@@ -24526,8 +23987,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14459"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14100"
             column="9"/>
     </issue>
 
@@ -24537,8 +23998,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14464"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14105"
             column="19"/>
     </issue>
 
@@ -24548,8 +24009,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14464"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14105"
             column="90"/>
     </issue>
 
@@ -24559,8 +24020,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14468"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14109"
             column="19"/>
     </issue>
 
@@ -24570,8 +24031,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14469"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14110"
             column="9"/>
     </issue>
 
@@ -24581,8 +24042,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14470"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14111"
             column="9"/>
     </issue>
 
@@ -24592,8 +24053,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14474"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14115"
             column="19"/>
     </issue>
 
@@ -24603,8 +24064,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14475"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14116"
             column="9"/>
     </issue>
 
@@ -24614,8 +24075,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14480"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14121"
             column="19"/>
     </issue>
 
@@ -24625,8 +24086,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14481"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14122"
             column="9"/>
     </issue>
 
@@ -24636,8 +24097,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14482"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14123"
             column="9"/>
     </issue>
 
@@ -24647,8 +24108,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14488"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14129"
             column="19"/>
     </issue>
 
@@ -24658,8 +24119,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Column prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14491"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14132"
             column="19"/>
     </issue>
 
@@ -24669,8 +24130,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Column prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14491"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14132"
             column="38"/>
     </issue>
 
@@ -24680,8 +24141,8 @@
         errorLine1="      public java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> getContentsList() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14527"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14168"
             column="14"/>
     </issue>
 
@@ -24691,8 +24152,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContents(int index) {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14549"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14190"
             column="14"/>
     </issue>
 
@@ -24702,8 +24163,8 @@
         errorLine1="      public Builder setContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14559"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14200"
             column="14"/>
     </issue>
 
@@ -24713,8 +24174,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14560"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14201"
             column="22"/>
     </issue>
 
@@ -24724,8 +24185,8 @@
         errorLine1="      public Builder setContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14572"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14213"
             column="14"/>
     </issue>
 
@@ -24735,8 +24196,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14573"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14214"
             column="22"/>
     </issue>
 
@@ -24746,8 +24207,8 @@
         errorLine1="      public Builder addContents(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14585"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14226"
             column="14"/>
     </issue>
 
@@ -24757,8 +24218,8 @@
         errorLine1="      public Builder addContents(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14585"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14226"
             column="34"/>
     </issue>
 
@@ -24768,8 +24229,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14597"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14238"
             column="14"/>
     </issue>
 
@@ -24779,8 +24240,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14598"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14239"
             column="22"/>
     </issue>
 
@@ -24790,8 +24251,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14610"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14251"
             column="14"/>
     </issue>
 
@@ -24801,8 +24262,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14611"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14252"
             column="11"/>
     </issue>
 
@@ -24812,8 +24273,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14623"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14264"
             column="14"/>
     </issue>
 
@@ -24823,8 +24284,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14624"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14265"
             column="22"/>
     </issue>
 
@@ -24834,8 +24295,8 @@
         errorLine1="      public Builder addAllContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14636"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14277"
             column="14"/>
     </issue>
 
@@ -24845,8 +24306,8 @@
         errorLine1="          java.lang.Iterable&lt;? extends androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> values) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14637"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14278"
             column="11"/>
     </issue>
 
@@ -24856,8 +24317,8 @@
         errorLine1="      public Builder clearContents() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14649"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14290"
             column="14"/>
     </issue>
 
@@ -24867,8 +24328,8 @@
         errorLine1="      public Builder removeContents(int index) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14661"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14302"
             column="14"/>
     </issue>
 
@@ -24878,8 +24339,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp getHorizontalAlignment() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14690"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14331"
             column="14"/>
     </issue>
 
@@ -24889,8 +24350,8 @@
         errorLine1="      public Builder setHorizontalAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14702"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14343"
             column="14"/>
     </issue>
 
@@ -24900,8 +24361,8 @@
         errorLine1="      public Builder setHorizontalAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14702"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14343"
             column="45"/>
     </issue>
 
@@ -24911,8 +24372,8 @@
         errorLine1="      public Builder setHorizontalAlignment("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14716"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14357"
             column="14"/>
     </issue>
 
@@ -24922,8 +24383,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14717"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14358"
             column="11"/>
     </issue>
 
@@ -24933,8 +24394,8 @@
         errorLine1="      public Builder mergeHorizontalAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14731"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14372"
             column="14"/>
     </issue>
 
@@ -24944,8 +24405,8 @@
         errorLine1="      public Builder mergeHorizontalAlignment(androidx.wear.tiles.proto.LayoutElementProto.HorizontalAlignmentProp value) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14731"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14372"
             column="47"/>
     </issue>
 
@@ -24955,8 +24416,8 @@
         errorLine1="      public Builder clearHorizontalAlignment() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14745"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14386"
             column="14"/>
     </issue>
 
@@ -24966,8 +24427,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getWidth() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14771"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14412"
             column="14"/>
     </issue>
 
@@ -24977,8 +24438,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14782"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14423"
             column="14"/>
     </issue>
 
@@ -24988,8 +24449,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14782"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14423"
             column="31"/>
     </issue>
 
@@ -24999,8 +24460,8 @@
         errorLine1="      public Builder setWidth("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14795"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14436"
             column="14"/>
     </issue>
 
@@ -25010,8 +24471,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ContainerDimension.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14796"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14437"
             column="11"/>
     </issue>
 
@@ -25021,8 +24482,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14809"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14450"
             column="14"/>
     </issue>
 
@@ -25032,8 +24493,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14809"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14450"
             column="33"/>
     </issue>
 
@@ -25043,8 +24504,8 @@
         errorLine1="      public Builder clearWidth() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14822"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14463"
             column="14"/>
     </issue>
 
@@ -25054,8 +24515,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getHeight() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14848"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14489"
             column="14"/>
     </issue>
 
@@ -25065,8 +24526,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14859"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14500"
             column="14"/>
     </issue>
 
@@ -25076,8 +24537,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14859"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14500"
             column="32"/>
     </issue>
 
@@ -25087,8 +24548,8 @@
         errorLine1="      public Builder setHeight("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14872"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14513"
             column="14"/>
     </issue>
 
@@ -25098,8 +24559,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ContainerDimension.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14873"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14514"
             column="11"/>
     </issue>
 
@@ -25109,8 +24570,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14886"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14527"
             column="14"/>
     </issue>
 
@@ -25120,8 +24581,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14886"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14527"
             column="34"/>
     </issue>
 
@@ -25131,8 +24592,8 @@
         errorLine1="      public Builder clearHeight() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14899"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14540"
             column="14"/>
     </issue>
 
@@ -25142,8 +24603,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14923"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14564"
             column="14"/>
     </issue>
 
@@ -25153,8 +24614,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14933"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14574"
             column="14"/>
     </issue>
 
@@ -25164,8 +24625,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14933"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14574"
             column="35"/>
     </issue>
 
@@ -25175,8 +24636,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14945"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14586"
             column="14"/>
     </issue>
 
@@ -25186,8 +24647,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Modifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14946"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14587"
             column="11"/>
     </issue>
 
@@ -25197,8 +24658,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14958"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14599"
             column="14"/>
     </issue>
 
@@ -25208,8 +24669,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14958"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14599"
             column="37"/>
     </issue>
 
@@ -25219,8 +24680,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14970"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14611"
             column="14"/>
     </issue>
 
@@ -25230,8 +24691,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14979"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14620"
             column="21"/>
     </issue>
 
@@ -25241,8 +24702,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14980"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14621"
             column="9"/>
     </issue>
 
@@ -25252,8 +24713,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14981"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14622"
             column="9"/>
     </issue>
 
@@ -25263,8 +24724,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="14981"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14622"
             column="32"/>
     </issue>
 
@@ -25274,8 +24735,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Column getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15044"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14685"
             column="19"/>
     </issue>
 
@@ -25285,8 +24746,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Column> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15050"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14691"
             column="19"/>
     </issue>
 
@@ -25296,8 +24757,8 @@
         errorLine1="    java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> "
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15066"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14707"
             column="5"/>
     </issue>
 
@@ -25307,8 +24768,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContents(int index);"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15075"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14716"
             column="5"/>
     </issue>
 
@@ -25318,8 +24779,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp getVerticalAlignment();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15106"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14747"
             column="5"/>
     </issue>
 
@@ -25329,8 +24790,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ContainerDimension getWidth();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15127"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14768"
             column="5"/>
     </issue>
 
@@ -25340,8 +24801,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.ContainerDimension getHeight();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15148"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14789"
             column="5"/>
     </issue>
 
@@ -25351,8 +24812,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15167"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14808"
             column="5"/>
     </issue>
 
@@ -25362,8 +24823,8 @@
         errorLine1="    public java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> getContentsList() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15200"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14841"
             column="12"/>
     </issue>
 
@@ -25373,8 +24834,8 @@
         errorLine1="    public java.util.List&lt;? extends androidx.wear.tiles.proto.LayoutElementProto.LayoutElementOrBuilder> "
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15210"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14851"
             column="12"/>
     </issue>
 
@@ -25384,8 +24845,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContents(int index) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15233"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14874"
             column="12"/>
     </issue>
 
@@ -25395,8 +24856,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.LayoutElementOrBuilder getContentsOrBuilder("
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15243"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="14884"
             column="12"/>
     </issue>
 
@@ -25406,8 +24867,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp getVerticalAlignment() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15394"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15035"
             column="12"/>
     </issue>
 
@@ -25417,8 +24878,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getWidth() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15486"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15127"
             column="12"/>
     </issue>
 
@@ -25428,8 +24889,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getHeight() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15574"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15215"
             column="12"/>
     </issue>
 
@@ -25439,8 +24900,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15660"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15301"
             column="12"/>
     </issue>
 
@@ -25450,8 +24911,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15721"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15362"
             column="19"/>
     </issue>
 
@@ -25461,8 +24922,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15722"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15363"
             column="9"/>
     </issue>
 
@@ -25472,8 +24933,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15727"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15368"
             column="19"/>
     </issue>
 
@@ -25483,8 +24944,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15728"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15369"
             column="9"/>
     </issue>
 
@@ -25494,8 +24955,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15729"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15370"
             column="9"/>
     </issue>
 
@@ -25505,8 +24966,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15734"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15375"
             column="19"/>
     </issue>
 
@@ -25516,8 +24977,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15735"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15376"
             column="9"/>
     </issue>
 
@@ -25527,8 +24988,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15740"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15381"
             column="19"/>
     </issue>
 
@@ -25538,8 +24999,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15741"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15382"
             column="9"/>
     </issue>
 
@@ -25549,8 +25010,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15742"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15383"
             column="9"/>
     </issue>
 
@@ -25560,8 +25021,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15747"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15388"
             column="19"/>
     </issue>
 
@@ -25571,8 +25032,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom(byte[] data)"
         errorLine2="                                                                             ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15747"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15388"
             column="78"/>
     </issue>
 
@@ -25582,8 +25043,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15752"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15393"
             column="19"/>
     </issue>
 
@@ -25593,8 +25054,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15753"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15394"
             column="9"/>
     </issue>
 
@@ -25604,8 +25065,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15754"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15395"
             column="9"/>
     </issue>
 
@@ -25615,8 +25076,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15759"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15400"
             column="19"/>
     </issue>
 
@@ -25626,8 +25087,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom(java.io.InputStream input)"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15759"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15400"
             column="78"/>
     </issue>
 
@@ -25637,8 +25098,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15764"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15405"
             column="19"/>
     </issue>
 
@@ -25648,8 +25109,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15765"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15406"
             column="9"/>
     </issue>
 
@@ -25659,8 +25120,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15766"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15407"
             column="9"/>
     </issue>
 
@@ -25670,8 +25131,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15771"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15412"
             column="19"/>
     </issue>
 
@@ -25681,8 +25142,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15771"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15412"
             column="87"/>
     </issue>
 
@@ -25692,8 +25153,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15775"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15416"
             column="19"/>
     </issue>
 
@@ -25703,8 +25164,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15776"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15417"
             column="9"/>
     </issue>
 
@@ -25714,8 +25175,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15777"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15418"
             column="9"/>
     </issue>
 
@@ -25725,8 +25186,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15781"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15422"
             column="19"/>
     </issue>
 
@@ -25736,8 +25197,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15782"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15423"
             column="9"/>
     </issue>
 
@@ -25747,8 +25208,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15787"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15428"
             column="19"/>
     </issue>
 
@@ -25758,8 +25219,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15788"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15429"
             column="9"/>
     </issue>
 
@@ -25769,8 +25230,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15789"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15430"
             column="9"/>
     </issue>
 
@@ -25780,8 +25241,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15795"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15436"
             column="19"/>
     </issue>
 
@@ -25791,8 +25252,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Row prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15798"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15439"
             column="19"/>
     </issue>
 
@@ -25802,8 +25263,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Row prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15798"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15439"
             column="38"/>
     </issue>
 
@@ -25813,8 +25274,8 @@
         errorLine1="      public java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> getContentsList() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15834"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15475"
             column="14"/>
     </issue>
 
@@ -25824,8 +25285,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContents(int index) {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15856"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15497"
             column="14"/>
     </issue>
 
@@ -25835,8 +25296,8 @@
         errorLine1="      public Builder setContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15866"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15507"
             column="14"/>
     </issue>
 
@@ -25846,8 +25307,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15867"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15508"
             column="22"/>
     </issue>
 
@@ -25857,8 +25318,8 @@
         errorLine1="      public Builder setContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15879"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15520"
             column="14"/>
     </issue>
 
@@ -25868,8 +25329,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15880"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15521"
             column="22"/>
     </issue>
 
@@ -25879,8 +25340,8 @@
         errorLine1="      public Builder addContents(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15892"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15533"
             column="14"/>
     </issue>
 
@@ -25890,8 +25351,8 @@
         errorLine1="      public Builder addContents(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15892"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15533"
             column="34"/>
     </issue>
 
@@ -25901,8 +25362,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15904"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15545"
             column="14"/>
     </issue>
 
@@ -25912,8 +25373,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15905"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15546"
             column="22"/>
     </issue>
 
@@ -25923,8 +25384,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15917"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15558"
             column="14"/>
     </issue>
 
@@ -25934,8 +25395,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15918"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15559"
             column="11"/>
     </issue>
 
@@ -25945,8 +25406,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15930"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15571"
             column="14"/>
     </issue>
 
@@ -25956,8 +25417,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15931"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15572"
             column="22"/>
     </issue>
 
@@ -25967,8 +25428,8 @@
         errorLine1="      public Builder addAllContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15943"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15584"
             column="14"/>
     </issue>
 
@@ -25978,8 +25439,8 @@
         errorLine1="          java.lang.Iterable&lt;? extends androidx.wear.tiles.proto.LayoutElementProto.LayoutElement> values) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15944"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15585"
             column="11"/>
     </issue>
 
@@ -25989,8 +25450,8 @@
         errorLine1="      public Builder clearContents() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15956"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15597"
             column="14"/>
     </issue>
 
@@ -26000,8 +25461,8 @@
         errorLine1="      public Builder removeContents(int index) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15968"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15609"
             column="14"/>
     </issue>
 
@@ -26011,8 +25472,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp getVerticalAlignment() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="15997"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15638"
             column="14"/>
     </issue>
 
@@ -26022,8 +25483,8 @@
         errorLine1="      public Builder setVerticalAlignment(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16009"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15650"
             column="14"/>
     </issue>
 
@@ -26033,8 +25494,8 @@
         errorLine1="      public Builder setVerticalAlignment(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16009"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15650"
             column="43"/>
     </issue>
 
@@ -26044,8 +25505,8 @@
         errorLine1="      public Builder setVerticalAlignment("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16023"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15664"
             column="14"/>
     </issue>
 
@@ -26055,8 +25516,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16024"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15665"
             column="11"/>
     </issue>
 
@@ -26066,8 +25527,8 @@
         errorLine1="      public Builder mergeVerticalAlignment(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16038"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15679"
             column="14"/>
     </issue>
 
@@ -26077,8 +25538,8 @@
         errorLine1="      public Builder mergeVerticalAlignment(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16038"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15679"
             column="45"/>
     </issue>
 
@@ -26088,8 +25549,8 @@
         errorLine1="      public Builder clearVerticalAlignment() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16052"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15693"
             column="14"/>
     </issue>
 
@@ -26099,8 +25560,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getWidth() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16078"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15719"
             column="14"/>
     </issue>
 
@@ -26110,8 +25571,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16089"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15730"
             column="14"/>
     </issue>
 
@@ -26121,8 +25582,8 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16089"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15730"
             column="31"/>
     </issue>
 
@@ -26132,8 +25593,8 @@
         errorLine1="      public Builder setWidth("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16102"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15743"
             column="14"/>
     </issue>
 
@@ -26143,8 +25604,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ContainerDimension.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16103"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15744"
             column="11"/>
     </issue>
 
@@ -26154,8 +25615,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16116"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15757"
             column="14"/>
     </issue>
 
@@ -26165,8 +25626,8 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16116"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15757"
             column="33"/>
     </issue>
 
@@ -26176,8 +25637,8 @@
         errorLine1="      public Builder clearWidth() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16129"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15770"
             column="14"/>
     </issue>
 
@@ -26187,8 +25648,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.ContainerDimension getHeight() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16155"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15796"
             column="14"/>
     </issue>
 
@@ -26198,8 +25659,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16166"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15807"
             column="14"/>
     </issue>
 
@@ -26209,8 +25670,8 @@
         errorLine1="      public Builder setHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16166"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15807"
             column="32"/>
     </issue>
 
@@ -26220,8 +25681,8 @@
         errorLine1="      public Builder setHeight("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16179"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15820"
             column="14"/>
     </issue>
 
@@ -26231,8 +25692,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.ContainerDimension.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16180"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15821"
             column="11"/>
     </issue>
 
@@ -26242,8 +25703,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16193"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15834"
             column="14"/>
     </issue>
 
@@ -26253,8 +25714,8 @@
         errorLine1="      public Builder mergeHeight(androidx.wear.tiles.proto.DimensionProto.ContainerDimension value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16193"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15834"
             column="34"/>
     </issue>
 
@@ -26264,8 +25725,8 @@
         errorLine1="      public Builder clearHeight() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16206"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15847"
             column="14"/>
     </issue>
 
@@ -26275,8 +25736,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16230"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15871"
             column="14"/>
     </issue>
 
@@ -26286,8 +25747,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16240"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15881"
             column="14"/>
     </issue>
 
@@ -26297,8 +25758,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16240"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15881"
             column="35"/>
     </issue>
 
@@ -26308,8 +25769,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16252"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15893"
             column="14"/>
     </issue>
 
@@ -26319,8 +25780,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Modifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16253"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15894"
             column="11"/>
     </issue>
 
@@ -26330,8 +25791,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16265"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15906"
             column="14"/>
     </issue>
 
@@ -26341,8 +25802,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16265"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15906"
             column="37"/>
     </issue>
 
@@ -26352,8 +25813,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16277"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15918"
             column="14"/>
     </issue>
 
@@ -26363,8 +25824,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16286"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15927"
             column="21"/>
     </issue>
 
@@ -26374,8 +25835,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16287"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15928"
             column="9"/>
     </issue>
 
@@ -26385,8 +25846,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16288"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15929"
             column="9"/>
     </issue>
 
@@ -26396,8 +25857,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16288"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15929"
             column="32"/>
     </issue>
 
@@ -26407,8 +25868,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Row getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16351"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15992"
             column="19"/>
     </issue>
 
@@ -26418,8 +25879,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Row> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16357"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="15998"
             column="19"/>
     </issue>
 
@@ -26429,8 +25890,8 @@
         errorLine1="    java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement> "
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16373"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16014"
             column="5"/>
     </issue>
 
@@ -26440,8 +25901,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement getContents(int index);"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16382"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16023"
             column="5"/>
     </issue>
 
@@ -26451,8 +25912,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DegreesProp getAnchorAngle();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16419"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16060"
             column="5"/>
     </issue>
 
@@ -26462,8 +25923,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp getAnchorType();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16442"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16083"
             column="5"/>
     </issue>
 
@@ -26473,8 +25934,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp getVerticalAlign();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16469"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16110"
             column="5"/>
     </issue>
 
@@ -26484,8 +25945,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16488"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16129"
             column="5"/>
     </issue>
 
@@ -26495,8 +25956,8 @@
         errorLine1="    public java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement> getContentsList() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16518"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16159"
             column="12"/>
     </issue>
 
@@ -26506,8 +25967,8 @@
         errorLine1="    public java.util.List&lt;? extends androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElementOrBuilder> "
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16528"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16169"
             column="12"/>
     </issue>
 
@@ -26517,8 +25978,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement getContents(int index) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16551"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16192"
             column="12"/>
     </issue>
 
@@ -26528,8 +25989,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElementOrBuilder getContentsOrBuilder("
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16561"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16202"
             column="12"/>
     </issue>
 
@@ -26539,8 +26000,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DegreesProp getAnchorAngle() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16718"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16359"
             column="12"/>
     </issue>
 
@@ -26550,8 +26011,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp getAnchorType() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16824"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16465"
             column="12"/>
     </issue>
 
@@ -26561,8 +26022,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp getVerticalAlign() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="16922"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16563"
             column="12"/>
     </issue>
 
@@ -26572,8 +26033,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17020"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16661"
             column="12"/>
     </issue>
 
@@ -26583,8 +26044,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17081"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16722"
             column="19"/>
     </issue>
 
@@ -26594,8 +26055,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17082"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16723"
             column="9"/>
     </issue>
 
@@ -26605,8 +26066,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17087"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16728"
             column="19"/>
     </issue>
 
@@ -26616,8 +26077,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17088"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16729"
             column="9"/>
     </issue>
 
@@ -26627,8 +26088,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17089"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16730"
             column="9"/>
     </issue>
 
@@ -26638,8 +26099,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17094"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16735"
             column="19"/>
     </issue>
 
@@ -26649,8 +26110,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17095"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16736"
             column="9"/>
     </issue>
 
@@ -26660,8 +26121,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17100"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16741"
             column="19"/>
     </issue>
 
@@ -26671,8 +26132,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17101"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16742"
             column="9"/>
     </issue>
 
@@ -26682,8 +26143,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17102"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16743"
             column="9"/>
     </issue>
 
@@ -26693,8 +26154,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17107"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16748"
             column="19"/>
     </issue>
 
@@ -26704,8 +26165,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom(byte[] data)"
         errorLine2="                                                                             ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17107"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16748"
             column="78"/>
     </issue>
 
@@ -26715,8 +26176,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17112"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16753"
             column="19"/>
     </issue>
 
@@ -26726,8 +26187,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17113"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16754"
             column="9"/>
     </issue>
 
@@ -26737,8 +26198,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17114"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16755"
             column="9"/>
     </issue>
 
@@ -26748,8 +26209,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17119"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16760"
             column="19"/>
     </issue>
 
@@ -26759,8 +26220,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom(java.io.InputStream input)"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17119"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16760"
             column="78"/>
     </issue>
 
@@ -26770,8 +26231,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17124"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16765"
             column="19"/>
     </issue>
 
@@ -26781,8 +26242,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17125"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16766"
             column="9"/>
     </issue>
 
@@ -26792,8 +26253,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17126"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16767"
             column="9"/>
     </issue>
 
@@ -26803,8 +26264,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17131"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16772"
             column="19"/>
     </issue>
 
@@ -26814,8 +26275,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17131"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16772"
             column="87"/>
     </issue>
 
@@ -26825,8 +26286,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17135"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16776"
             column="19"/>
     </issue>
 
@@ -26836,8 +26297,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17136"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16777"
             column="9"/>
     </issue>
 
@@ -26847,8 +26308,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17137"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16778"
             column="9"/>
     </issue>
 
@@ -26858,8 +26319,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17141"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16782"
             column="19"/>
     </issue>
 
@@ -26869,8 +26330,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17142"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16783"
             column="9"/>
     </issue>
 
@@ -26880,8 +26341,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17147"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16788"
             column="19"/>
     </issue>
 
@@ -26891,8 +26352,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17148"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16789"
             column="9"/>
     </issue>
 
@@ -26902,8 +26363,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17149"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16790"
             column="9"/>
     </issue>
 
@@ -26913,8 +26374,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17155"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16796"
             column="19"/>
     </issue>
 
@@ -26924,8 +26385,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Arc prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17158"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16799"
             column="19"/>
     </issue>
 
@@ -26935,8 +26396,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Arc prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17158"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16799"
             column="38"/>
     </issue>
 
@@ -26946,8 +26407,8 @@
         errorLine1="      public java.util.List&lt;androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement> getContentsList() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17191"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16832"
             column="14"/>
     </issue>
 
@@ -26957,8 +26418,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement getContents(int index) {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17213"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16854"
             column="14"/>
     </issue>
 
@@ -26968,8 +26429,8 @@
         errorLine1="      public Builder setContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17223"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16864"
             column="14"/>
     </issue>
 
@@ -26979,8 +26440,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17224"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16865"
             column="22"/>
     </issue>
 
@@ -26990,8 +26451,8 @@
         errorLine1="      public Builder setContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17236"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16877"
             column="14"/>
     </issue>
 
@@ -27001,8 +26462,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17237"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16878"
             column="22"/>
     </issue>
 
@@ -27012,8 +26473,8 @@
         errorLine1="      public Builder addContents(androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17249"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16890"
             column="14"/>
     </issue>
 
@@ -27023,8 +26484,8 @@
         errorLine1="      public Builder addContents(androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17249"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16890"
             column="34"/>
     </issue>
 
@@ -27034,8 +26495,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17261"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16902"
             column="14"/>
     </issue>
 
@@ -27045,8 +26506,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17262"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16903"
             column="22"/>
     </issue>
 
@@ -27056,8 +26517,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17274"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16915"
             column="14"/>
     </issue>
 
@@ -27067,8 +26528,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17275"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16916"
             column="11"/>
     </issue>
 
@@ -27078,8 +26539,8 @@
         errorLine1="      public Builder addContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17287"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16928"
             column="14"/>
     </issue>
 
@@ -27089,8 +26550,8 @@
         errorLine1="          int index, androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17288"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16929"
             column="22"/>
     </issue>
 
@@ -27100,8 +26561,8 @@
         errorLine1="      public Builder addAllContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17300"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16941"
             column="14"/>
     </issue>
 
@@ -27111,8 +26572,8 @@
         errorLine1="          java.lang.Iterable&lt;? extends androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement> values) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17301"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16942"
             column="11"/>
     </issue>
 
@@ -27122,8 +26583,8 @@
         errorLine1="      public Builder clearContents() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17313"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16954"
             column="14"/>
     </issue>
 
@@ -27133,8 +26594,8 @@
         errorLine1="      public Builder removeContents(int index) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17325"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="16966"
             column="14"/>
     </issue>
 
@@ -27144,8 +26605,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DegreesProp getAnchorAngle() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17360"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17001"
             column="14"/>
     </issue>
 
@@ -27155,8 +26616,8 @@
         errorLine1="      public Builder setAnchorAngle(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17375"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17016"
             column="14"/>
     </issue>
 
@@ -27166,8 +26627,8 @@
         errorLine1="      public Builder setAnchorAngle(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17375"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17016"
             column="37"/>
     </issue>
 
@@ -27177,8 +26638,8 @@
         errorLine1="      public Builder setAnchorAngle("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17392"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17033"
             column="14"/>
     </issue>
 
@@ -27188,8 +26649,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DegreesProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17393"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17034"
             column="11"/>
     </issue>
 
@@ -27199,8 +26660,8 @@
         errorLine1="      public Builder mergeAnchorAngle(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17410"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17051"
             column="14"/>
     </issue>
 
@@ -27210,8 +26671,8 @@
         errorLine1="      public Builder mergeAnchorAngle(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17410"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17051"
             column="39"/>
     </issue>
 
@@ -27221,8 +26682,8 @@
         errorLine1="      public Builder clearAnchorAngle() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17427"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17068"
             column="14"/>
     </issue>
 
@@ -27232,8 +26693,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp getAnchorType() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17455"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17096"
             column="14"/>
     </issue>
 
@@ -27243,8 +26704,8 @@
         errorLine1="      public Builder setAnchorType(androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17467"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17108"
             column="14"/>
     </issue>
 
@@ -27254,8 +26715,8 @@
         errorLine1="      public Builder setAnchorType(androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17467"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17108"
             column="36"/>
     </issue>
 
@@ -27265,8 +26726,8 @@
         errorLine1="      public Builder setAnchorType("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17481"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17122"
             column="14"/>
     </issue>
 
@@ -27276,8 +26737,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17482"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17123"
             column="11"/>
     </issue>
 
@@ -27287,8 +26748,8 @@
         errorLine1="      public Builder mergeAnchorType(androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17496"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17137"
             column="14"/>
     </issue>
 
@@ -27298,8 +26759,8 @@
         errorLine1="      public Builder mergeAnchorType(androidx.wear.tiles.proto.LayoutElementProto.ArcAnchorTypeProp value) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17496"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17137"
             column="38"/>
     </issue>
 
@@ -27309,8 +26770,8 @@
         errorLine1="      public Builder clearAnchorType() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17510"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17151"
             column="14"/>
     </issue>
 
@@ -27320,8 +26781,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp getVerticalAlign() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17542"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17183"
             column="14"/>
     </issue>
 
@@ -27331,8 +26792,8 @@
         errorLine1="      public Builder setVerticalAlign(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17556"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17197"
             column="14"/>
     </issue>
 
@@ -27342,8 +26803,8 @@
         errorLine1="      public Builder setVerticalAlign(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17556"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17197"
             column="39"/>
     </issue>
 
@@ -27353,8 +26814,8 @@
         errorLine1="      public Builder setVerticalAlign("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17572"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17213"
             column="14"/>
     </issue>
 
@@ -27364,8 +26825,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17573"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17214"
             column="11"/>
     </issue>
 
@@ -27375,8 +26836,8 @@
         errorLine1="      public Builder mergeVerticalAlign(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17589"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17230"
             column="14"/>
     </issue>
 
@@ -27386,8 +26847,8 @@
         errorLine1="      public Builder mergeVerticalAlign(androidx.wear.tiles.proto.LayoutElementProto.VerticalAlignmentProp value) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17589"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17230"
             column="41"/>
     </issue>
 
@@ -27397,8 +26858,8 @@
         errorLine1="      public Builder clearVerticalAlign() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17605"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17246"
             column="14"/>
     </issue>
 
@@ -27408,8 +26869,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Modifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17629"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17270"
             column="14"/>
     </issue>
 
@@ -27419,8 +26880,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17639"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17280"
             column="14"/>
     </issue>
 
@@ -27430,8 +26891,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17639"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17280"
             column="35"/>
     </issue>
 
@@ -27441,8 +26902,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17651"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17292"
             column="14"/>
     </issue>
 
@@ -27452,8 +26913,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Modifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17652"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17293"
             column="11"/>
     </issue>
 
@@ -27463,8 +26924,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17664"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17305"
             column="14"/>
     </issue>
 
@@ -27474,8 +26935,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.Modifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17664"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17305"
             column="37"/>
     </issue>
 
@@ -27485,8 +26946,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17676"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17317"
             column="14"/>
     </issue>
 
@@ -27496,8 +26957,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17685"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17326"
             column="21"/>
     </issue>
 
@@ -27507,8 +26968,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17686"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17327"
             column="9"/>
     </issue>
 
@@ -27518,8 +26979,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17687"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17328"
             column="9"/>
     </issue>
 
@@ -27529,8 +26990,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17687"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17328"
             column="32"/>
     </issue>
 
@@ -27540,8 +27001,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Arc getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17750"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17391"
             column="19"/>
     </issue>
 
@@ -27551,8 +27012,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Arc> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17756"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17397"
             column="19"/>
     </issue>
 
@@ -27562,8 +27023,8 @@
         errorLine1="    androidx.wear.tiles.proto.TypesProto.StringProp getText();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17782"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17423"
             column="5"/>
     </issue>
 
@@ -27573,8 +27034,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.FontStyle getFontStyle();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17803"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17444"
             column="5"/>
     </issue>
 
@@ -27584,8 +27045,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.ArcModifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17822"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17463"
             column="5"/>
     </issue>
 
@@ -27595,8 +27056,8 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.StringProp getText() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17859"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17500"
             column="12"/>
     </issue>
 
@@ -27606,8 +27067,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.FontStyle getFontStyle() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="17943"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17584"
             column="12"/>
     </issue>
 
@@ -27617,8 +27078,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.ArcModifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18029"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17670"
             column="12"/>
     </issue>
 
@@ -27628,8 +27089,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18090"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17731"
             column="19"/>
     </issue>
 
@@ -27639,8 +27100,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18091"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17732"
             column="9"/>
     </issue>
 
@@ -27650,8 +27111,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18096"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17737"
             column="19"/>
     </issue>
 
@@ -27661,8 +27122,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18097"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17738"
             column="9"/>
     </issue>
 
@@ -27672,8 +27133,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18098"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17739"
             column="9"/>
     </issue>
 
@@ -27683,8 +27144,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18103"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17744"
             column="19"/>
     </issue>
 
@@ -27694,8 +27155,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18104"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17745"
             column="9"/>
     </issue>
 
@@ -27705,8 +27166,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18109"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17750"
             column="19"/>
     </issue>
 
@@ -27716,8 +27177,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18110"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17751"
             column="9"/>
     </issue>
 
@@ -27727,8 +27188,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18111"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17752"
             column="9"/>
     </issue>
 
@@ -27738,8 +27199,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18116"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17757"
             column="19"/>
     </issue>
 
@@ -27749,8 +27210,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom(byte[] data)"
         errorLine2="                                                                                 ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18116"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17757"
             column="82"/>
     </issue>
 
@@ -27760,8 +27221,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18121"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17762"
             column="19"/>
     </issue>
 
@@ -27771,8 +27232,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18122"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17763"
             column="9"/>
     </issue>
 
@@ -27782,8 +27243,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18123"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17764"
             column="9"/>
     </issue>
 
@@ -27793,8 +27254,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18128"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17769"
             column="19"/>
     </issue>
 
@@ -27804,8 +27265,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18128"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17769"
             column="82"/>
     </issue>
 
@@ -27815,8 +27276,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18133"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17774"
             column="19"/>
     </issue>
 
@@ -27826,8 +27287,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18134"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17775"
             column="9"/>
     </issue>
 
@@ -27837,8 +27298,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18135"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17776"
             column="9"/>
     </issue>
 
@@ -27848,8 +27309,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18140"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17781"
             column="19"/>
     </issue>
 
@@ -27859,8 +27320,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18140"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17781"
             column="91"/>
     </issue>
 
@@ -27870,8 +27331,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18144"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17785"
             column="19"/>
     </issue>
 
@@ -27881,8 +27342,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18145"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17786"
             column="9"/>
     </issue>
 
@@ -27892,8 +27353,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18146"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17787"
             column="9"/>
     </issue>
 
@@ -27903,8 +27364,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18150"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17791"
             column="19"/>
     </issue>
 
@@ -27914,8 +27375,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18151"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17792"
             column="9"/>
     </issue>
 
@@ -27925,8 +27386,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18156"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17797"
             column="19"/>
     </issue>
 
@@ -27936,8 +27397,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18157"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17798"
             column="9"/>
     </issue>
 
@@ -27947,8 +27408,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18158"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17799"
             column="9"/>
     </issue>
 
@@ -27958,8 +27419,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18164"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17805"
             column="19"/>
     </issue>
 
@@ -27969,8 +27430,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcText prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18167"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17808"
             column="19"/>
     </issue>
 
@@ -27980,8 +27441,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcText prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18167"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17808"
             column="38"/>
     </issue>
 
@@ -27991,8 +27452,8 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.StringProp getText() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18208"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17849"
             column="14"/>
     </issue>
 
@@ -28002,8 +27463,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18218"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17859"
             column="14"/>
     </issue>
 
@@ -28013,8 +27474,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18218"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17859"
             column="30"/>
     </issue>
 
@@ -28024,8 +27485,8 @@
         errorLine1="      public Builder setText("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18230"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17871"
             column="14"/>
     </issue>
 
@@ -28035,8 +27496,8 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.StringProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18231"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17872"
             column="11"/>
     </issue>
 
@@ -28046,8 +27507,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18243"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17884"
             column="14"/>
     </issue>
 
@@ -28057,8 +27518,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.TypesProto.StringProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18243"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17884"
             column="32"/>
     </issue>
 
@@ -28068,8 +27529,8 @@
         errorLine1="      public Builder clearText() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18255"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17896"
             column="14"/>
     </issue>
 
@@ -28079,8 +27540,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.FontStyle getFontStyle() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18281"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17922"
             column="14"/>
     </issue>
 
@@ -28090,8 +27551,8 @@
         errorLine1="      public Builder setFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18292"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17933"
             column="14"/>
     </issue>
 
@@ -28101,8 +27562,8 @@
         errorLine1="      public Builder setFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18292"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17933"
             column="35"/>
     </issue>
 
@@ -28112,8 +27573,8 @@
         errorLine1="      public Builder setFontStyle("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18305"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17946"
             column="14"/>
     </issue>
 
@@ -28123,8 +27584,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.FontStyle.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18306"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17947"
             column="11"/>
     </issue>
 
@@ -28134,8 +27595,8 @@
         errorLine1="      public Builder mergeFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18319"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17960"
             column="14"/>
     </issue>
 
@@ -28145,8 +27606,8 @@
         errorLine1="      public Builder mergeFontStyle(androidx.wear.tiles.proto.LayoutElementProto.FontStyle value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18319"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17960"
             column="37"/>
     </issue>
 
@@ -28156,8 +27617,8 @@
         errorLine1="      public Builder clearFontStyle() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18332"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17973"
             column="14"/>
     </issue>
 
@@ -28167,8 +27628,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.ArcModifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18356"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="17997"
             column="14"/>
     </issue>
 
@@ -28178,8 +27639,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18366"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18007"
             column="14"/>
     </issue>
 
@@ -28189,8 +27650,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18366"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18007"
             column="35"/>
     </issue>
 
@@ -28200,8 +27661,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18378"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18019"
             column="14"/>
     </issue>
 
@@ -28211,8 +27672,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.ArcModifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18379"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18020"
             column="11"/>
     </issue>
 
@@ -28222,8 +27683,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18391"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18032"
             column="14"/>
     </issue>
 
@@ -28233,8 +27694,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18391"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18032"
             column="37"/>
     </issue>
 
@@ -28244,8 +27705,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18403"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18044"
             column="14"/>
     </issue>
 
@@ -28255,8 +27716,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18412"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18053"
             column="21"/>
     </issue>
 
@@ -28266,8 +27727,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18413"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18054"
             column="9"/>
     </issue>
 
@@ -28277,8 +27738,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18414"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18055"
             column="9"/>
     </issue>
 
@@ -28288,8 +27749,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18414"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18055"
             column="32"/>
     </issue>
 
@@ -28299,8 +27760,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcText getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18474"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18115"
             column="19"/>
     </issue>
 
@@ -28310,8 +27771,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ArcText> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18480"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18121"
             column="19"/>
     </issue>
 
@@ -28321,8 +27782,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DegreesProp getLength();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18506"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18147"
             column="5"/>
     </issue>
 
@@ -28332,8 +27793,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getThickness();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18525"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18166"
             column="5"/>
     </issue>
 
@@ -28343,8 +27804,8 @@
         errorLine1="    androidx.wear.tiles.proto.ColorProto.ColorProp getColor();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18544"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18185"
             column="5"/>
     </issue>
 
@@ -28354,8 +27815,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.ArcModifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18563"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18204"
             column="5"/>
     </issue>
 
@@ -28365,8 +27826,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DegreesProp getLength() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18600"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18241"
             column="12"/>
     </issue>
 
@@ -28376,8 +27837,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getThickness() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18682"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18323"
             column="12"/>
     </issue>
 
@@ -28387,8 +27848,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ColorProto.ColorProp getColor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18764"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18405"
             column="12"/>
     </issue>
 
@@ -28398,8 +27859,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.ArcModifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18846"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18487"
             column="12"/>
     </issue>
 
@@ -28409,8 +27870,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18907"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18548"
             column="19"/>
     </issue>
 
@@ -28420,8 +27881,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18908"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18549"
             column="9"/>
     </issue>
 
@@ -28431,8 +27892,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18913"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18554"
             column="19"/>
     </issue>
 
@@ -28442,8 +27903,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18914"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18555"
             column="9"/>
     </issue>
 
@@ -28453,8 +27914,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18915"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18556"
             column="9"/>
     </issue>
 
@@ -28464,8 +27925,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18920"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18561"
             column="19"/>
     </issue>
 
@@ -28475,8 +27936,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18921"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18562"
             column="9"/>
     </issue>
 
@@ -28486,8 +27947,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18926"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18567"
             column="19"/>
     </issue>
 
@@ -28497,8 +27958,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18927"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18568"
             column="9"/>
     </issue>
 
@@ -28508,8 +27969,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18928"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18569"
             column="9"/>
     </issue>
 
@@ -28519,8 +27980,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18933"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18574"
             column="19"/>
     </issue>
 
@@ -28530,8 +27991,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom(byte[] data)"
         errorLine2="                                                                                 ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18933"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18574"
             column="82"/>
     </issue>
 
@@ -28541,8 +28002,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18938"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18579"
             column="19"/>
     </issue>
 
@@ -28552,8 +28013,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18939"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18580"
             column="9"/>
     </issue>
 
@@ -28563,8 +28024,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18940"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18581"
             column="9"/>
     </issue>
 
@@ -28574,8 +28035,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18945"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18586"
             column="19"/>
     </issue>
 
@@ -28585,8 +28046,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18945"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18586"
             column="82"/>
     </issue>
 
@@ -28596,8 +28057,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18950"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18591"
             column="19"/>
     </issue>
 
@@ -28607,8 +28068,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18951"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18592"
             column="9"/>
     </issue>
 
@@ -28618,8 +28079,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18952"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18593"
             column="9"/>
     </issue>
 
@@ -28629,8 +28090,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18957"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18598"
             column="19"/>
     </issue>
 
@@ -28640,8 +28101,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18957"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18598"
             column="91"/>
     </issue>
 
@@ -28651,8 +28112,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18961"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18602"
             column="19"/>
     </issue>
 
@@ -28662,8 +28123,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18962"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18603"
             column="9"/>
     </issue>
 
@@ -28673,8 +28134,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18963"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18604"
             column="9"/>
     </issue>
 
@@ -28684,8 +28145,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18967"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18608"
             column="19"/>
     </issue>
 
@@ -28695,8 +28156,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18968"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18609"
             column="9"/>
     </issue>
 
@@ -28706,8 +28167,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18973"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18614"
             column="19"/>
     </issue>
 
@@ -28717,8 +28178,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18974"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18615"
             column="9"/>
     </issue>
 
@@ -28728,8 +28189,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18975"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18616"
             column="9"/>
     </issue>
 
@@ -28739,8 +28200,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18981"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18622"
             column="19"/>
     </issue>
 
@@ -28750,8 +28211,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcLine prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18984"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18625"
             column="19"/>
     </issue>
 
@@ -28761,8 +28222,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcLine prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="18984"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18625"
             column="38"/>
     </issue>
 
@@ -28772,8 +28233,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DegreesProp getLength() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19025"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18666"
             column="14"/>
     </issue>
 
@@ -28783,8 +28244,8 @@
         errorLine1="      public Builder setLength(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19035"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18676"
             column="14"/>
     </issue>
 
@@ -28794,8 +28255,8 @@
         errorLine1="      public Builder setLength(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19035"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18676"
             column="32"/>
     </issue>
 
@@ -28805,8 +28266,8 @@
         errorLine1="      public Builder setLength("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19047"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18688"
             column="14"/>
     </issue>
 
@@ -28816,8 +28277,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DegreesProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19048"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18689"
             column="11"/>
     </issue>
 
@@ -28827,8 +28288,8 @@
         errorLine1="      public Builder mergeLength(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19060"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18701"
             column="14"/>
     </issue>
 
@@ -28838,8 +28299,8 @@
         errorLine1="      public Builder mergeLength(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19060"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18701"
             column="34"/>
     </issue>
 
@@ -28849,8 +28310,8 @@
         errorLine1="      public Builder clearLength() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19072"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18713"
             column="14"/>
     </issue>
 
@@ -28860,8 +28321,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getThickness() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19096"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18737"
             column="14"/>
     </issue>
 
@@ -28871,8 +28332,8 @@
         errorLine1="      public Builder setThickness(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19106"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18747"
             column="14"/>
     </issue>
 
@@ -28882,8 +28343,8 @@
         errorLine1="      public Builder setThickness(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19106"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18747"
             column="35"/>
     </issue>
 
@@ -28893,8 +28354,8 @@
         errorLine1="      public Builder setThickness("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19118"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18759"
             column="14"/>
     </issue>
 
@@ -28904,8 +28365,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19119"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18760"
             column="11"/>
     </issue>
 
@@ -28915,8 +28376,8 @@
         errorLine1="      public Builder mergeThickness(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19131"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18772"
             column="14"/>
     </issue>
 
@@ -28926,8 +28387,8 @@
         errorLine1="      public Builder mergeThickness(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19131"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18772"
             column="37"/>
     </issue>
 
@@ -28937,8 +28398,8 @@
         errorLine1="      public Builder clearThickness() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19143"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18784"
             column="14"/>
     </issue>
 
@@ -28948,8 +28409,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ColorProto.ColorProp getColor() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19167"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18808"
             column="14"/>
     </issue>
 
@@ -28959,8 +28420,8 @@
         errorLine1="      public Builder setColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19177"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18818"
             column="14"/>
     </issue>
 
@@ -28970,8 +28431,8 @@
         errorLine1="      public Builder setColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19177"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18818"
             column="31"/>
     </issue>
 
@@ -28981,8 +28442,8 @@
         errorLine1="      public Builder setColor("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19189"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18830"
             column="14"/>
     </issue>
 
@@ -28992,8 +28453,8 @@
         errorLine1="          androidx.wear.tiles.proto.ColorProto.ColorProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19190"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18831"
             column="11"/>
     </issue>
 
@@ -29003,8 +28464,8 @@
         errorLine1="      public Builder mergeColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19202"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18843"
             column="14"/>
     </issue>
 
@@ -29014,8 +28475,8 @@
         errorLine1="      public Builder mergeColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19202"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18843"
             column="33"/>
     </issue>
 
@@ -29025,8 +28486,8 @@
         errorLine1="      public Builder clearColor() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19214"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18855"
             column="14"/>
     </issue>
 
@@ -29036,8 +28497,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.ArcModifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19238"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18879"
             column="14"/>
     </issue>
 
@@ -29047,8 +28508,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19248"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18889"
             column="14"/>
     </issue>
 
@@ -29058,8 +28519,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19248"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18889"
             column="35"/>
     </issue>
 
@@ -29069,8 +28530,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19260"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18901"
             column="14"/>
     </issue>
 
@@ -29080,8 +28541,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.ArcModifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19261"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18902"
             column="11"/>
     </issue>
 
@@ -29091,8 +28552,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19273"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18914"
             column="14"/>
     </issue>
 
@@ -29102,8 +28563,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19273"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18914"
             column="37"/>
     </issue>
 
@@ -29113,8 +28574,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19285"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18926"
             column="14"/>
     </issue>
 
@@ -29124,8 +28585,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19294"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18935"
             column="21"/>
     </issue>
 
@@ -29135,8 +28596,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19295"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18936"
             column="9"/>
     </issue>
 
@@ -29146,8 +28607,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19296"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18937"
             column="9"/>
     </issue>
 
@@ -29157,8 +28618,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19296"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18937"
             column="32"/>
     </issue>
 
@@ -29168,8 +28629,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLine getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19357"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="18998"
             column="19"/>
     </issue>
 
@@ -29179,8 +28640,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ArcLine> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19363"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19004"
             column="19"/>
     </issue>
 
@@ -29190,8 +28651,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DegreesProp getLength();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19389"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19030"
             column="5"/>
     </issue>
 
@@ -29201,8 +28662,8 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getThickness();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19408"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19049"
             column="5"/>
     </issue>
 
@@ -29212,8 +28673,8 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.ArcModifiers getModifiers();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19427"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19068"
             column="5"/>
     </issue>
 
@@ -29223,8 +28684,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DegreesProp getLength() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19464"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19105"
             column="12"/>
     </issue>
 
@@ -29234,8 +28695,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getThickness() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19546"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19187"
             column="12"/>
     </issue>
 
@@ -29245,8 +28706,8 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.ArcModifiers getModifiers() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19628"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19269"
             column="12"/>
     </issue>
 
@@ -29256,8 +28717,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19689"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19330"
             column="19"/>
     </issue>
 
@@ -29267,8 +28728,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19690"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19331"
             column="9"/>
     </issue>
 
@@ -29278,8 +28739,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19695"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19336"
             column="19"/>
     </issue>
 
@@ -29289,8 +28750,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19696"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19337"
             column="9"/>
     </issue>
 
@@ -29300,8 +28761,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19697"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19338"
             column="9"/>
     </issue>
 
@@ -29311,8 +28772,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19702"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19343"
             column="19"/>
     </issue>
 
@@ -29322,8 +28783,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19703"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19344"
             column="9"/>
     </issue>
 
@@ -29333,8 +28794,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19708"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19349"
             column="19"/>
     </issue>
 
@@ -29344,8 +28805,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19709"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19350"
             column="9"/>
     </issue>
 
@@ -29355,8 +28816,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19710"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19351"
             column="9"/>
     </issue>
 
@@ -29366,8 +28827,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19715"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19356"
             column="19"/>
     </issue>
 
@@ -29377,8 +28838,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom(byte[] data)"
         errorLine2="                                                                                   ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19715"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19356"
             column="84"/>
     </issue>
 
@@ -29388,8 +28849,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19720"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19361"
             column="19"/>
     </issue>
 
@@ -29399,8 +28860,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19721"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19362"
             column="9"/>
     </issue>
 
@@ -29410,8 +28871,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19722"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19363"
             column="9"/>
     </issue>
 
@@ -29421,8 +28882,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19727"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19368"
             column="19"/>
     </issue>
 
@@ -29432,8 +28893,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19727"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19368"
             column="84"/>
     </issue>
 
@@ -29443,8 +28904,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19732"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19373"
             column="19"/>
     </issue>
 
@@ -29454,8 +28915,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19733"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19374"
             column="9"/>
     </issue>
 
@@ -29465,8 +28926,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19734"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19375"
             column="9"/>
     </issue>
 
@@ -29476,8 +28937,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19739"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19380"
             column="19"/>
     </issue>
 
@@ -29487,8 +28948,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19739"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19380"
             column="93"/>
     </issue>
 
@@ -29498,8 +28959,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19743"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19384"
             column="19"/>
     </issue>
 
@@ -29509,8 +28970,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19744"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19385"
             column="9"/>
     </issue>
 
@@ -29520,8 +28981,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19745"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19386"
             column="9"/>
     </issue>
 
@@ -29531,8 +28992,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19749"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19390"
             column="19"/>
     </issue>
 
@@ -29542,8 +29003,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19750"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19391"
             column="9"/>
     </issue>
 
@@ -29553,8 +29014,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19755"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19396"
             column="19"/>
     </issue>
 
@@ -29564,8 +29025,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19756"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19397"
             column="9"/>
     </issue>
 
@@ -29575,8 +29036,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19757"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19398"
             column="9"/>
     </issue>
 
@@ -29586,8 +29047,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19763"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19404"
             column="19"/>
     </issue>
 
@@ -29597,8 +29058,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19766"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19407"
             column="19"/>
     </issue>
 
@@ -29608,8 +29069,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19766"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19407"
             column="38"/>
     </issue>
 
@@ -29619,8 +29080,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DegreesProp getLength() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19807"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19448"
             column="14"/>
     </issue>
 
@@ -29630,8 +29091,8 @@
         errorLine1="      public Builder setLength(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19817"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19458"
             column="14"/>
     </issue>
 
@@ -29641,8 +29102,8 @@
         errorLine1="      public Builder setLength(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19817"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19458"
             column="32"/>
     </issue>
 
@@ -29652,8 +29113,8 @@
         errorLine1="      public Builder setLength("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19829"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19470"
             column="14"/>
     </issue>
 
@@ -29663,8 +29124,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DegreesProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19830"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19471"
             column="11"/>
     </issue>
 
@@ -29674,8 +29135,8 @@
         errorLine1="      public Builder mergeLength(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19842"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19483"
             column="14"/>
     </issue>
 
@@ -29685,8 +29146,8 @@
         errorLine1="      public Builder mergeLength(androidx.wear.tiles.proto.DimensionProto.DegreesProp value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19842"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19483"
             column="34"/>
     </issue>
 
@@ -29696,8 +29157,8 @@
         errorLine1="      public Builder clearLength() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19854"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19495"
             column="14"/>
     </issue>
 
@@ -29707,8 +29168,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getThickness() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19878"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19519"
             column="14"/>
     </issue>
 
@@ -29718,8 +29179,8 @@
         errorLine1="      public Builder setThickness(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19888"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19529"
             column="14"/>
     </issue>
 
@@ -29729,8 +29190,8 @@
         errorLine1="      public Builder setThickness(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19888"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19529"
             column="35"/>
     </issue>
 
@@ -29740,8 +29201,8 @@
         errorLine1="      public Builder setThickness("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19900"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19541"
             column="14"/>
     </issue>
 
@@ -29751,8 +29212,8 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19901"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19542"
             column="11"/>
     </issue>
 
@@ -29762,8 +29223,8 @@
         errorLine1="      public Builder mergeThickness(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19913"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19554"
             column="14"/>
     </issue>
 
@@ -29773,8 +29234,8 @@
         errorLine1="      public Builder mergeThickness(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19913"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19554"
             column="37"/>
     </issue>
 
@@ -29784,8 +29245,8 @@
         errorLine1="      public Builder clearThickness() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19925"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19566"
             column="14"/>
     </issue>
 
@@ -29795,8 +29256,8 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.ArcModifiers getModifiers() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19949"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19590"
             column="14"/>
     </issue>
 
@@ -29806,8 +29267,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19959"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19600"
             column="14"/>
     </issue>
 
@@ -29817,8 +29278,8 @@
         errorLine1="      public Builder setModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19959"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19600"
             column="35"/>
     </issue>
 
@@ -29828,8 +29289,8 @@
         errorLine1="      public Builder setModifiers("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19971"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19612"
             column="14"/>
     </issue>
 
@@ -29839,8 +29300,8 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.ArcModifiers.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19972"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19613"
             column="11"/>
     </issue>
 
@@ -29850,8 +29311,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19984"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19625"
             column="14"/>
     </issue>
 
@@ -29861,8 +29322,8 @@
         errorLine1="      public Builder mergeModifiers(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19984"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19625"
             column="37"/>
     </issue>
 
@@ -29872,8 +29333,8 @@
         errorLine1="      public Builder clearModifiers() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="19996"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19637"
             column="14"/>
     </issue>
 
@@ -29883,8 +29344,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20005"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19646"
             column="21"/>
     </issue>
 
@@ -29894,8 +29355,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20006"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19647"
             column="9"/>
     </issue>
 
@@ -29905,8 +29366,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20007"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19648"
             column="9"/>
     </issue>
 
@@ -29916,8 +29377,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20007"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19648"
             column="32"/>
     </issue>
 
@@ -29927,8 +29388,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20067"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19708"
             column="19"/>
     </issue>
 
@@ -29938,8 +29399,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ArcSpacer> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20073"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19714"
             column="19"/>
     </issue>
 
@@ -29949,8 +29410,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContent();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20099"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19740"
             column="5"/>
     </issue>
 
@@ -29960,8 +29421,8 @@
         errorLine1="    androidx.wear.tiles.proto.TypesProto.BoolProp getRotateContents();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20130"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19771"
             column="5"/>
     </issue>
 
@@ -29971,8 +29432,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContent() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20167"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19808"
             column="12"/>
     </issue>
 
@@ -29982,8 +29443,8 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.BoolProp getRotateContents() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20261"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19902"
             column="12"/>
     </issue>
 
@@ -29993,8 +29454,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20346"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19987"
             column="19"/>
     </issue>
 
@@ -30004,8 +29465,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20347"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19988"
             column="9"/>
     </issue>
 
@@ -30015,8 +29476,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20352"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19993"
             column="19"/>
     </issue>
 
@@ -30026,8 +29487,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20353"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19994"
             column="9"/>
     </issue>
 
@@ -30037,8 +29498,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20354"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="19995"
             column="9"/>
     </issue>
 
@@ -30048,8 +29509,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20359"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20000"
             column="19"/>
     </issue>
 
@@ -30059,8 +29520,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20360"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20001"
             column="9"/>
     </issue>
 
@@ -30070,8 +29531,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20365"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20006"
             column="19"/>
     </issue>
 
@@ -30081,8 +29542,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20366"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20007"
             column="9"/>
     </issue>
 
@@ -30092,8 +29553,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20367"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20008"
             column="9"/>
     </issue>
 
@@ -30103,8 +29564,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20372"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20013"
             column="19"/>
     </issue>
 
@@ -30114,8 +29575,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom(byte[] data)"
         errorLine2="                                                                                    ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20372"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20013"
             column="85"/>
     </issue>
 
@@ -30125,8 +29586,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20377"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20018"
             column="19"/>
     </issue>
 
@@ -30136,8 +29597,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20378"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20019"
             column="9"/>
     </issue>
 
@@ -30147,8 +29608,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20379"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20020"
             column="9"/>
     </issue>
 
@@ -30158,8 +29619,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20384"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20025"
             column="19"/>
     </issue>
 
@@ -30169,8 +29630,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20384"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20025"
             column="85"/>
     </issue>
 
@@ -30180,8 +29641,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20389"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20030"
             column="19"/>
     </issue>
 
@@ -30191,8 +29652,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20390"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20031"
             column="9"/>
     </issue>
 
@@ -30202,8 +29663,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20391"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20032"
             column="9"/>
     </issue>
 
@@ -30213,8 +29674,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20396"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20037"
             column="19"/>
     </issue>
 
@@ -30224,8 +29685,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20396"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20037"
             column="94"/>
     </issue>
 
@@ -30235,8 +29696,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20400"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20041"
             column="19"/>
     </issue>
 
@@ -30246,8 +29707,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20401"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20042"
             column="9"/>
     </issue>
 
@@ -30257,8 +29718,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20402"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20043"
             column="9"/>
     </issue>
 
@@ -30268,8 +29729,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20406"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20047"
             column="19"/>
     </issue>
 
@@ -30279,8 +29740,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20407"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20048"
             column="9"/>
     </issue>
 
@@ -30290,8 +29751,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20412"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20053"
             column="19"/>
     </issue>
 
@@ -30301,8 +29762,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20413"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20054"
             column="9"/>
     </issue>
 
@@ -30312,8 +29773,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20414"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20055"
             column="9"/>
     </issue>
 
@@ -30323,8 +29784,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20420"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20061"
             column="19"/>
     </issue>
 
@@ -30334,8 +29795,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20423"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20064"
             column="19"/>
     </issue>
 
@@ -30345,8 +29806,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20423"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20064"
             column="38"/>
     </issue>
 
@@ -30356,8 +29817,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getContent() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20464"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20105"
             column="14"/>
     </issue>
 
@@ -30367,8 +29828,8 @@
         errorLine1="      public Builder setContent(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20474"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20115"
             column="14"/>
     </issue>
 
@@ -30378,8 +29839,8 @@
         errorLine1="      public Builder setContent(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20474"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20115"
             column="33"/>
     </issue>
 
@@ -30389,8 +29850,8 @@
         errorLine1="      public Builder setContent("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20486"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20127"
             column="14"/>
     </issue>
 
@@ -30400,8 +29861,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20487"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20128"
             column="11"/>
     </issue>
 
@@ -30411,8 +29872,8 @@
         errorLine1="      public Builder mergeContent(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20499"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20140"
             column="14"/>
     </issue>
 
@@ -30422,8 +29883,8 @@
         errorLine1="      public Builder mergeContent(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20499"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20140"
             column="35"/>
     </issue>
 
@@ -30433,8 +29894,8 @@
         errorLine1="      public Builder clearContent() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20511"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20152"
             column="14"/>
     </issue>
 
@@ -30444,8 +29905,8 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.BoolProp getRotateContents() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20547"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20188"
             column="14"/>
     </issue>
 
@@ -30455,8 +29916,8 @@
         errorLine1="      public Builder setRotateContents(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20563"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20204"
             column="14"/>
     </issue>
 
@@ -30466,8 +29927,8 @@
         errorLine1="      public Builder setRotateContents(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20563"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20204"
             column="40"/>
     </issue>
 
@@ -30477,8 +29938,8 @@
         errorLine1="      public Builder setRotateContents("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20581"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20222"
             column="14"/>
     </issue>
 
@@ -30488,8 +29949,8 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.BoolProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20582"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20223"
             column="11"/>
     </issue>
 
@@ -30499,8 +29960,8 @@
         errorLine1="      public Builder mergeRotateContents(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20600"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20241"
             column="14"/>
     </issue>
 
@@ -30510,8 +29971,8 @@
         errorLine1="      public Builder mergeRotateContents(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20600"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20241"
             column="42"/>
     </issue>
 
@@ -30521,8 +29982,8 @@
         errorLine1="      public Builder clearRotateContents() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20618"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20259"
             column="14"/>
     </issue>
 
@@ -30532,8 +29993,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20627"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20268"
             column="21"/>
     </issue>
 
@@ -30543,8 +30004,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20628"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20269"
             column="9"/>
     </issue>
 
@@ -30554,8 +30015,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20629"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20270"
             column="9"/>
     </issue>
 
@@ -30565,8 +30026,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20629"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20270"
             column="32"/>
     </issue>
 
@@ -30576,8 +30037,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20687"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20328"
             column="19"/>
     </issue>
 
@@ -30587,8 +30048,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ArcAdapter> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20693"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20334"
             column="19"/>
     </issue>
 
@@ -30598,8 +30059,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.Column getColumn();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20711"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20352"
             column="5"/>
     </issue>
 
@@ -30609,8 +30070,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.Row getRow();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20722"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20363"
             column="5"/>
     </issue>
 
@@ -30620,8 +30081,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.Box getBox();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20733"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20374"
             column="5"/>
     </issue>
 
@@ -30631,8 +30092,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.Spacer getSpacer();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20744"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20385"
             column="5"/>
     </issue>
 
@@ -30642,8 +30103,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.Text getText();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20755"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20396"
             column="5"/>
     </issue>
 
@@ -30653,8 +30114,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.Image getImage();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20766"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20407"
             column="5"/>
     </issue>
 
@@ -30664,8 +30125,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.Arc getArc();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20777"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20418"
             column="5"/>
     </issue>
 
@@ -30675,8 +30136,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.Spannable getSpannable();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20788"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20429"
             column="5"/>
     </issue>
 
@@ -30686,8 +30147,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.InnerCase getInnerCase();"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20790"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20431"
             column="12"/>
     </issue>
 
@@ -30697,8 +30158,8 @@
         errorLine1="      public static InnerCase valueOf(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20827"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20468"
             column="21"/>
     </issue>
 
@@ -30708,8 +30169,8 @@
         errorLine1="      public static InnerCase forNumber(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20831"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20472"
             column="21"/>
     </issue>
 
@@ -30719,8 +30180,8 @@
         errorLine1="    public InnerCase"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20851"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20492"
             column="12"/>
     </issue>
 
@@ -30730,8 +30191,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Column getColumn() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20874"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20515"
             column="12"/>
     </issue>
 
@@ -30741,8 +30202,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Row getRow() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20936"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20577"
             column="12"/>
     </issue>
 
@@ -30752,8 +30213,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Box getBox() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="20998"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20639"
             column="12"/>
     </issue>
 
@@ -30763,8 +30224,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Spacer getSpacer() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21060"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20701"
             column="12"/>
     </issue>
 
@@ -30774,8 +30235,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Text getText() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21122"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20763"
             column="12"/>
     </issue>
 
@@ -30785,8 +30246,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Image getImage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21184"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20825"
             column="12"/>
     </issue>
 
@@ -30796,8 +30257,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Arc getArc() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21246"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20887"
             column="12"/>
     </issue>
 
@@ -30807,8 +30268,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Spannable getSpannable() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21308"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20949"
             column="12"/>
     </issue>
 
@@ -30818,8 +30279,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21358"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="20999"
             column="19"/>
     </issue>
 
@@ -30829,8 +30290,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21359"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21000"
             column="9"/>
     </issue>
 
@@ -30840,8 +30301,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21364"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21005"
             column="19"/>
     </issue>
 
@@ -30851,8 +30312,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21365"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21006"
             column="9"/>
     </issue>
 
@@ -30862,8 +30323,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21366"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21007"
             column="9"/>
     </issue>
 
@@ -30873,8 +30334,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21371"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21012"
             column="19"/>
     </issue>
 
@@ -30884,8 +30345,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21372"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21013"
             column="9"/>
     </issue>
 
@@ -30895,8 +30356,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21377"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21018"
             column="19"/>
     </issue>
 
@@ -30906,8 +30367,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21378"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21019"
             column="9"/>
     </issue>
 
@@ -30917,8 +30378,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21379"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21020"
             column="9"/>
     </issue>
 
@@ -30928,8 +30389,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21384"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21025"
             column="19"/>
     </issue>
 
@@ -30939,8 +30400,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom(byte[] data)"
         errorLine2="                                                                                       ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21384"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21025"
             column="88"/>
     </issue>
 
@@ -30950,8 +30411,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21389"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21030"
             column="19"/>
     </issue>
 
@@ -30961,8 +30422,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21390"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21031"
             column="9"/>
     </issue>
 
@@ -30972,8 +30433,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21391"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21032"
             column="9"/>
     </issue>
 
@@ -30983,8 +30444,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21396"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21037"
             column="19"/>
     </issue>
 
@@ -30994,8 +30455,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21396"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21037"
             column="88"/>
     </issue>
 
@@ -31005,8 +30466,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21401"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21042"
             column="19"/>
     </issue>
 
@@ -31016,8 +30477,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21402"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21043"
             column="9"/>
     </issue>
 
@@ -31027,8 +30488,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21403"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21044"
             column="9"/>
     </issue>
 
@@ -31038,8 +30499,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21408"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21049"
             column="19"/>
     </issue>
 
@@ -31049,8 +30510,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21408"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21049"
             column="97"/>
     </issue>
 
@@ -31060,8 +30521,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21412"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21053"
             column="19"/>
     </issue>
 
@@ -31071,8 +30532,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21413"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21054"
             column="9"/>
     </issue>
 
@@ -31082,8 +30543,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21414"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21055"
             column="9"/>
     </issue>
 
@@ -31093,8 +30554,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21418"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21059"
             column="19"/>
     </issue>
 
@@ -31104,8 +30565,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21419"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21060"
             column="9"/>
     </issue>
 
@@ -31115,8 +30576,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21424"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21065"
             column="19"/>
     </issue>
 
@@ -31126,8 +30587,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21425"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21066"
             column="9"/>
     </issue>
 
@@ -31137,8 +30598,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21426"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21067"
             column="9"/>
     </issue>
 
@@ -31148,8 +30609,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21432"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21073"
             column="19"/>
     </issue>
 
@@ -31159,8 +30620,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21435"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21076"
             column="19"/>
     </issue>
 
@@ -31170,8 +30631,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21435"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21076"
             column="38"/>
     </issue>
 
@@ -31181,8 +30642,8 @@
         errorLine1="      public InnerCase"
         errorLine2="             ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21458"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21099"
             column="14"/>
     </issue>
 
@@ -31192,8 +30653,8 @@
         errorLine1="      public Builder clearInner() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21463"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21104"
             column="14"/>
     </issue>
 
@@ -31203,8 +30664,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.Column getColumn() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21481"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21122"
             column="14"/>
     </issue>
 
@@ -31214,8 +30675,8 @@
         errorLine1="      public Builder setColumn(androidx.wear.tiles.proto.LayoutElementProto.Column value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21487"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21128"
             column="14"/>
     </issue>
 
@@ -31225,8 +30686,8 @@
         errorLine1="      public Builder setColumn(androidx.wear.tiles.proto.LayoutElementProto.Column value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21487"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21128"
             column="32"/>
     </issue>
 
@@ -31236,8 +30697,8 @@
         errorLine1="      public Builder setColumn("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21495"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21136"
             column="14"/>
     </issue>
 
@@ -31247,8 +30708,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.Column.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21496"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21137"
             column="11"/>
     </issue>
 
@@ -31258,8 +30719,8 @@
         errorLine1="      public Builder mergeColumn(androidx.wear.tiles.proto.LayoutElementProto.Column value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21504"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21145"
             column="14"/>
     </issue>
 
@@ -31269,8 +30730,8 @@
         errorLine1="      public Builder mergeColumn(androidx.wear.tiles.proto.LayoutElementProto.Column value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21504"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21145"
             column="34"/>
     </issue>
 
@@ -31280,8 +30741,8 @@
         errorLine1="      public Builder clearColumn() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21512"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21153"
             column="14"/>
     </issue>
 
@@ -31291,8 +30752,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.Row getRow() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21529"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21170"
             column="14"/>
     </issue>
 
@@ -31302,8 +30763,8 @@
         errorLine1="      public Builder setRow(androidx.wear.tiles.proto.LayoutElementProto.Row value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21535"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21176"
             column="14"/>
     </issue>
 
@@ -31313,8 +30774,8 @@
         errorLine1="      public Builder setRow(androidx.wear.tiles.proto.LayoutElementProto.Row value) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21535"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21176"
             column="29"/>
     </issue>
 
@@ -31324,8 +30785,8 @@
         errorLine1="      public Builder setRow("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21543"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21184"
             column="14"/>
     </issue>
 
@@ -31335,8 +30796,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.Row.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21544"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21185"
             column="11"/>
     </issue>
 
@@ -31346,8 +30807,8 @@
         errorLine1="      public Builder mergeRow(androidx.wear.tiles.proto.LayoutElementProto.Row value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21552"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21193"
             column="14"/>
     </issue>
 
@@ -31357,8 +30818,8 @@
         errorLine1="      public Builder mergeRow(androidx.wear.tiles.proto.LayoutElementProto.Row value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21552"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21193"
             column="31"/>
     </issue>
 
@@ -31368,8 +30829,8 @@
         errorLine1="      public Builder clearRow() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21560"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21201"
             column="14"/>
     </issue>
 
@@ -31379,8 +30840,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.Box getBox() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21577"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21218"
             column="14"/>
     </issue>
 
@@ -31390,8 +30851,8 @@
         errorLine1="      public Builder setBox(androidx.wear.tiles.proto.LayoutElementProto.Box value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21583"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21224"
             column="14"/>
     </issue>
 
@@ -31401,8 +30862,8 @@
         errorLine1="      public Builder setBox(androidx.wear.tiles.proto.LayoutElementProto.Box value) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21583"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21224"
             column="29"/>
     </issue>
 
@@ -31412,8 +30873,8 @@
         errorLine1="      public Builder setBox("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21591"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21232"
             column="14"/>
     </issue>
 
@@ -31423,8 +30884,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.Box.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21592"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21233"
             column="11"/>
     </issue>
 
@@ -31434,8 +30895,8 @@
         errorLine1="      public Builder mergeBox(androidx.wear.tiles.proto.LayoutElementProto.Box value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21600"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21241"
             column="14"/>
     </issue>
 
@@ -31445,8 +30906,8 @@
         errorLine1="      public Builder mergeBox(androidx.wear.tiles.proto.LayoutElementProto.Box value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21600"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21241"
             column="31"/>
     </issue>
 
@@ -31456,8 +30917,8 @@
         errorLine1="      public Builder clearBox() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21608"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21249"
             column="14"/>
     </issue>
 
@@ -31467,8 +30928,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.Spacer getSpacer() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21625"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21266"
             column="14"/>
     </issue>
 
@@ -31478,8 +30939,8 @@
         errorLine1="      public Builder setSpacer(androidx.wear.tiles.proto.LayoutElementProto.Spacer value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21631"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21272"
             column="14"/>
     </issue>
 
@@ -31489,8 +30950,8 @@
         errorLine1="      public Builder setSpacer(androidx.wear.tiles.proto.LayoutElementProto.Spacer value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21631"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21272"
             column="32"/>
     </issue>
 
@@ -31500,8 +30961,8 @@
         errorLine1="      public Builder setSpacer("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21639"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21280"
             column="14"/>
     </issue>
 
@@ -31511,8 +30972,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.Spacer.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21640"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21281"
             column="11"/>
     </issue>
 
@@ -31522,8 +30983,8 @@
         errorLine1="      public Builder mergeSpacer(androidx.wear.tiles.proto.LayoutElementProto.Spacer value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21648"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21289"
             column="14"/>
     </issue>
 
@@ -31533,8 +30994,8 @@
         errorLine1="      public Builder mergeSpacer(androidx.wear.tiles.proto.LayoutElementProto.Spacer value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21648"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21289"
             column="34"/>
     </issue>
 
@@ -31544,8 +31005,8 @@
         errorLine1="      public Builder clearSpacer() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21656"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21297"
             column="14"/>
     </issue>
 
@@ -31555,8 +31016,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.Text getText() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21673"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21314"
             column="14"/>
     </issue>
 
@@ -31566,8 +31027,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.LayoutElementProto.Text value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21679"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21320"
             column="14"/>
     </issue>
 
@@ -31577,8 +31038,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.LayoutElementProto.Text value) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21679"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21320"
             column="30"/>
     </issue>
 
@@ -31588,8 +31049,8 @@
         errorLine1="      public Builder setText("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21687"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21328"
             column="14"/>
     </issue>
 
@@ -31599,8 +31060,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.Text.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21688"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21329"
             column="11"/>
     </issue>
 
@@ -31610,8 +31071,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.LayoutElementProto.Text value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21696"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21337"
             column="14"/>
     </issue>
 
@@ -31621,8 +31082,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.LayoutElementProto.Text value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21696"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21337"
             column="32"/>
     </issue>
 
@@ -31632,8 +31093,8 @@
         errorLine1="      public Builder clearText() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21704"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21345"
             column="14"/>
     </issue>
 
@@ -31643,8 +31104,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.Image getImage() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21721"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21362"
             column="14"/>
     </issue>
 
@@ -31654,8 +31115,8 @@
         errorLine1="      public Builder setImage(androidx.wear.tiles.proto.LayoutElementProto.Image value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21727"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21368"
             column="14"/>
     </issue>
 
@@ -31665,8 +31126,8 @@
         errorLine1="      public Builder setImage(androidx.wear.tiles.proto.LayoutElementProto.Image value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21727"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21368"
             column="31"/>
     </issue>
 
@@ -31676,8 +31137,8 @@
         errorLine1="      public Builder setImage("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21735"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21376"
             column="14"/>
     </issue>
 
@@ -31687,8 +31148,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.Image.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21736"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21377"
             column="11"/>
     </issue>
 
@@ -31698,8 +31159,8 @@
         errorLine1="      public Builder mergeImage(androidx.wear.tiles.proto.LayoutElementProto.Image value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21744"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21385"
             column="14"/>
     </issue>
 
@@ -31709,8 +31170,8 @@
         errorLine1="      public Builder mergeImage(androidx.wear.tiles.proto.LayoutElementProto.Image value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21744"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21385"
             column="33"/>
     </issue>
 
@@ -31720,8 +31181,8 @@
         errorLine1="      public Builder clearImage() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21752"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21393"
             column="14"/>
     </issue>
 
@@ -31731,8 +31192,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.Arc getArc() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21769"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21410"
             column="14"/>
     </issue>
 
@@ -31742,8 +31203,8 @@
         errorLine1="      public Builder setArc(androidx.wear.tiles.proto.LayoutElementProto.Arc value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21775"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21416"
             column="14"/>
     </issue>
 
@@ -31753,8 +31214,8 @@
         errorLine1="      public Builder setArc(androidx.wear.tiles.proto.LayoutElementProto.Arc value) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21775"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21416"
             column="29"/>
     </issue>
 
@@ -31764,8 +31225,8 @@
         errorLine1="      public Builder setArc("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21783"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21424"
             column="14"/>
     </issue>
 
@@ -31775,8 +31236,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.Arc.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21784"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21425"
             column="11"/>
     </issue>
 
@@ -31786,8 +31247,8 @@
         errorLine1="      public Builder mergeArc(androidx.wear.tiles.proto.LayoutElementProto.Arc value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21792"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21433"
             column="14"/>
     </issue>
 
@@ -31797,8 +31258,8 @@
         errorLine1="      public Builder mergeArc(androidx.wear.tiles.proto.LayoutElementProto.Arc value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21792"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21433"
             column="31"/>
     </issue>
 
@@ -31808,8 +31269,8 @@
         errorLine1="      public Builder clearArc() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21800"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21441"
             column="14"/>
     </issue>
 
@@ -31819,8 +31280,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.Spannable getSpannable() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21817"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21458"
             column="14"/>
     </issue>
 
@@ -31830,8 +31291,8 @@
         errorLine1="      public Builder setSpannable(androidx.wear.tiles.proto.LayoutElementProto.Spannable value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21823"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21464"
             column="14"/>
     </issue>
 
@@ -31841,8 +31302,8 @@
         errorLine1="      public Builder setSpannable(androidx.wear.tiles.proto.LayoutElementProto.Spannable value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21823"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21464"
             column="35"/>
     </issue>
 
@@ -31852,8 +31313,8 @@
         errorLine1="      public Builder setSpannable("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21831"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21472"
             column="14"/>
     </issue>
 
@@ -31863,8 +31324,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.Spannable.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21832"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21473"
             column="11"/>
     </issue>
 
@@ -31874,8 +31335,8 @@
         errorLine1="      public Builder mergeSpannable(androidx.wear.tiles.proto.LayoutElementProto.Spannable value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21840"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21481"
             column="14"/>
     </issue>
 
@@ -31885,8 +31346,8 @@
         errorLine1="      public Builder mergeSpannable(androidx.wear.tiles.proto.LayoutElementProto.Spannable value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21840"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21481"
             column="37"/>
     </issue>
 
@@ -31896,8 +31357,8 @@
         errorLine1="      public Builder clearSpannable() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21848"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21489"
             column="14"/>
     </issue>
 
@@ -31907,8 +31368,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21858"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21499"
             column="21"/>
     </issue>
 
@@ -31918,8 +31379,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21859"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21500"
             column="9"/>
     </issue>
 
@@ -31929,8 +31390,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21860"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21501"
             column="9"/>
     </issue>
 
@@ -31940,8 +31401,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21860"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21501"
             column="32"/>
     </issue>
 
@@ -31951,8 +31412,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21927"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21568"
             column="19"/>
     </issue>
 
@@ -31962,8 +31423,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;LayoutElement> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21933"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21574"
             column="19"/>
     </issue>
 
@@ -31973,8 +31434,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.ArcText getText();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21951"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21592"
             column="5"/>
     </issue>
 
@@ -31984,8 +31445,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.ArcLine getLine();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21962"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21603"
             column="5"/>
     </issue>
 
@@ -31995,8 +31456,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer getSpacer();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21973"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21614"
             column="5"/>
     </issue>
 
@@ -32006,8 +31467,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter getAdapter();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21984"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21625"
             column="5"/>
     </issue>
 
@@ -32017,8 +31478,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement.InnerCase getInnerCase();"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="21986"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21627"
             column="12"/>
     </issue>
 
@@ -32028,8 +31489,8 @@
         errorLine1="      public static InnerCase valueOf(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22019"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21660"
             column="21"/>
     </issue>
 
@@ -32039,8 +31500,8 @@
         errorLine1="      public static InnerCase forNumber(int value) {"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22023"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21664"
             column="21"/>
     </issue>
 
@@ -32050,8 +31511,8 @@
         errorLine1="    public InnerCase"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22039"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21680"
             column="12"/>
     </issue>
 
@@ -32061,8 +31522,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ArcText getText() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22062"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21703"
             column="12"/>
     </issue>
 
@@ -32072,8 +31533,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ArcLine getLine() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22124"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21765"
             column="12"/>
     </issue>
 
@@ -32083,8 +31544,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer getSpacer() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22186"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21827"
             column="12"/>
     </issue>
 
@@ -32094,8 +31555,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter getAdapter() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22248"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21889"
             column="12"/>
     </issue>
 
@@ -32105,8 +31566,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22298"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21939"
             column="19"/>
     </issue>
 
@@ -32116,8 +31577,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22299"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21940"
             column="9"/>
     </issue>
 
@@ -32127,8 +31588,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22304"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21945"
             column="19"/>
     </issue>
 
@@ -32138,8 +31599,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22305"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21946"
             column="9"/>
     </issue>
 
@@ -32149,8 +31610,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22306"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21947"
             column="9"/>
     </issue>
 
@@ -32160,8 +31621,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22311"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21952"
             column="19"/>
     </issue>
 
@@ -32171,8 +31632,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22312"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21953"
             column="9"/>
     </issue>
 
@@ -32182,8 +31643,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22317"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21958"
             column="19"/>
     </issue>
 
@@ -32193,8 +31654,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22318"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21959"
             column="9"/>
     </issue>
 
@@ -32204,8 +31665,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22319"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21960"
             column="9"/>
     </issue>
 
@@ -32215,8 +31676,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22324"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21965"
             column="19"/>
     </issue>
 
@@ -32226,8 +31687,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom(byte[] data)"
         errorLine2="                                                                                          ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22324"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21965"
             column="91"/>
     </issue>
 
@@ -32237,8 +31698,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22329"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21970"
             column="19"/>
     </issue>
 
@@ -32248,8 +31709,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22330"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21971"
             column="9"/>
     </issue>
 
@@ -32259,8 +31720,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22331"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21972"
             column="9"/>
     </issue>
 
@@ -32270,8 +31731,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22336"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21977"
             column="19"/>
     </issue>
 
@@ -32281,8 +31742,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22336"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21977"
             column="91"/>
     </issue>
 
@@ -32292,8 +31753,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22341"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21982"
             column="19"/>
     </issue>
 
@@ -32303,8 +31764,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22342"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21983"
             column="9"/>
     </issue>
 
@@ -32314,8 +31775,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22343"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21984"
             column="9"/>
     </issue>
 
@@ -32325,8 +31786,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22348"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21989"
             column="19"/>
     </issue>
 
@@ -32336,8 +31797,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22348"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21989"
             column="100"/>
     </issue>
 
@@ -32347,8 +31808,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22352"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21993"
             column="19"/>
     </issue>
 
@@ -32358,8 +31819,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22353"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21994"
             column="9"/>
     </issue>
 
@@ -32369,8 +31830,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22354"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21995"
             column="9"/>
     </issue>
 
@@ -32380,8 +31841,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22358"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="21999"
             column="19"/>
     </issue>
 
@@ -32391,8 +31852,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22359"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22000"
             column="9"/>
     </issue>
 
@@ -32402,8 +31863,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22364"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22005"
             column="19"/>
     </issue>
 
@@ -32413,8 +31874,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22365"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22006"
             column="9"/>
     </issue>
 
@@ -32424,8 +31885,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22366"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22007"
             column="9"/>
     </issue>
 
@@ -32435,8 +31896,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22372"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22013"
             column="19"/>
     </issue>
 
@@ -32446,8 +31907,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22375"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22016"
             column="19"/>
     </issue>
 
@@ -32457,8 +31918,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22375"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22016"
             column="38"/>
     </issue>
 
@@ -32468,8 +31929,8 @@
         errorLine1="      public InnerCase"
         errorLine2="             ~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22398"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22039"
             column="14"/>
     </issue>
 
@@ -32479,8 +31940,8 @@
         errorLine1="      public Builder clearInner() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22403"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22044"
             column="14"/>
     </issue>
 
@@ -32490,8 +31951,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.ArcText getText() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22421"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22062"
             column="14"/>
     </issue>
 
@@ -32501,8 +31962,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.LayoutElementProto.ArcText value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22427"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22068"
             column="14"/>
     </issue>
 
@@ -32512,8 +31973,8 @@
         errorLine1="      public Builder setText(androidx.wear.tiles.proto.LayoutElementProto.ArcText value) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22427"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22068"
             column="30"/>
     </issue>
 
@@ -32523,8 +31984,8 @@
         errorLine1="      public Builder setText("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22435"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22076"
             column="14"/>
     </issue>
 
@@ -32534,8 +31995,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.ArcText.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22436"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22077"
             column="11"/>
     </issue>
 
@@ -32545,8 +32006,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.LayoutElementProto.ArcText value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22444"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22085"
             column="14"/>
     </issue>
 
@@ -32556,8 +32017,8 @@
         errorLine1="      public Builder mergeText(androidx.wear.tiles.proto.LayoutElementProto.ArcText value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22444"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22085"
             column="32"/>
     </issue>
 
@@ -32567,8 +32028,8 @@
         errorLine1="      public Builder clearText() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22452"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22093"
             column="14"/>
     </issue>
 
@@ -32578,8 +32039,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.ArcLine getLine() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22469"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22110"
             column="14"/>
     </issue>
 
@@ -32589,8 +32050,8 @@
         errorLine1="      public Builder setLine(androidx.wear.tiles.proto.LayoutElementProto.ArcLine value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22475"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22116"
             column="14"/>
     </issue>
 
@@ -32600,8 +32061,8 @@
         errorLine1="      public Builder setLine(androidx.wear.tiles.proto.LayoutElementProto.ArcLine value) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22475"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22116"
             column="30"/>
     </issue>
 
@@ -32611,8 +32072,8 @@
         errorLine1="      public Builder setLine("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22483"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22124"
             column="14"/>
     </issue>
 
@@ -32622,8 +32083,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.ArcLine.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22484"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22125"
             column="11"/>
     </issue>
 
@@ -32633,8 +32094,8 @@
         errorLine1="      public Builder mergeLine(androidx.wear.tiles.proto.LayoutElementProto.ArcLine value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22492"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22133"
             column="14"/>
     </issue>
 
@@ -32644,8 +32105,8 @@
         errorLine1="      public Builder mergeLine(androidx.wear.tiles.proto.LayoutElementProto.ArcLine value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22492"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22133"
             column="32"/>
     </issue>
 
@@ -32655,8 +32116,8 @@
         errorLine1="      public Builder clearLine() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22500"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22141"
             column="14"/>
     </issue>
 
@@ -32666,8 +32127,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer getSpacer() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22517"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22158"
             column="14"/>
     </issue>
 
@@ -32677,8 +32138,8 @@
         errorLine1="      public Builder setSpacer(androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22523"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22164"
             column="14"/>
     </issue>
 
@@ -32688,8 +32149,8 @@
         errorLine1="      public Builder setSpacer(androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22523"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22164"
             column="32"/>
     </issue>
 
@@ -32699,8 +32160,8 @@
         errorLine1="      public Builder setSpacer("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22531"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22172"
             column="14"/>
     </issue>
 
@@ -32710,8 +32171,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22532"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22173"
             column="11"/>
     </issue>
 
@@ -32721,8 +32182,8 @@
         errorLine1="      public Builder mergeSpacer(androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22540"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22181"
             column="14"/>
     </issue>
 
@@ -32732,8 +32193,8 @@
         errorLine1="      public Builder mergeSpacer(androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22540"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22181"
             column="34"/>
     </issue>
 
@@ -32743,8 +32204,8 @@
         errorLine1="      public Builder clearSpacer() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22548"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22189"
             column="14"/>
     </issue>
 
@@ -32754,8 +32215,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter getAdapter() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22565"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22206"
             column="14"/>
     </issue>
 
@@ -32765,8 +32226,8 @@
         errorLine1="      public Builder setAdapter(androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22571"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22212"
             column="14"/>
     </issue>
 
@@ -32776,8 +32237,8 @@
         errorLine1="      public Builder setAdapter(androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22571"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22212"
             column="33"/>
     </issue>
 
@@ -32787,8 +32248,8 @@
         errorLine1="      public Builder setAdapter("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22579"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22220"
             column="14"/>
     </issue>
 
@@ -32798,8 +32259,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22580"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22221"
             column="11"/>
     </issue>
 
@@ -32809,8 +32270,8 @@
         errorLine1="      public Builder mergeAdapter(androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22588"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22229"
             column="14"/>
     </issue>
 
@@ -32820,8 +32281,8 @@
         errorLine1="      public Builder mergeAdapter(androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22588"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22229"
             column="35"/>
     </issue>
 
@@ -32831,8 +32292,8 @@
         errorLine1="      public Builder clearAdapter() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22596"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22237"
             column="14"/>
     </issue>
 
@@ -32842,8 +32303,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22606"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22247"
             column="21"/>
     </issue>
 
@@ -32853,8 +32314,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22607"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22248"
             column="9"/>
     </issue>
 
@@ -32864,8 +32325,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22608"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22249"
             column="9"/>
     </issue>
 
@@ -32875,8 +32336,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22608"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22249"
             column="32"/>
     </issue>
 
@@ -32886,8 +32347,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22671"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22312"
             column="19"/>
     </issue>
 
@@ -32897,8 +32358,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ArcLayoutElement> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22677"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22318"
             column="19"/>
     </issue>
 
@@ -32908,8 +32369,8 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getRoot();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22703"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22344"
             column="5"/>
     </issue>
 
@@ -32919,8 +32380,8 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getRoot() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22740"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22381"
             column="12"/>
     </issue>
 
@@ -32930,8 +32391,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22801"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22442"
             column="19"/>
     </issue>
 
@@ -32941,8 +32402,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22802"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22443"
             column="9"/>
     </issue>
 
@@ -32952,8 +32413,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22807"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22448"
             column="19"/>
     </issue>
 
@@ -32963,8 +32424,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22808"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22449"
             column="9"/>
     </issue>
 
@@ -32974,8 +32435,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22809"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22450"
             column="9"/>
     </issue>
 
@@ -32985,8 +32446,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22814"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22455"
             column="19"/>
     </issue>
 
@@ -32996,8 +32457,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22815"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22456"
             column="9"/>
     </issue>
 
@@ -33007,8 +32468,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22820"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22461"
             column="19"/>
     </issue>
 
@@ -33018,8 +32479,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22821"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22462"
             column="9"/>
     </issue>
 
@@ -33029,8 +32490,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22822"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22463"
             column="9"/>
     </issue>
 
@@ -33040,8 +32501,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22827"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22468"
             column="19"/>
     </issue>
 
@@ -33051,8 +32512,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom(byte[] data)"
         errorLine2="                                                                                ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22827"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22468"
             column="81"/>
     </issue>
 
@@ -33062,8 +32523,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22832"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22473"
             column="19"/>
     </issue>
 
@@ -33073,8 +32534,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22833"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22474"
             column="9"/>
     </issue>
 
@@ -33084,8 +32545,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22834"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22475"
             column="9"/>
     </issue>
 
@@ -33095,8 +32556,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22839"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22480"
             column="19"/>
     </issue>
 
@@ -33106,8 +32567,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22839"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22480"
             column="81"/>
     </issue>
 
@@ -33117,8 +32578,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22844"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22485"
             column="19"/>
     </issue>
 
@@ -33128,8 +32589,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22845"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22486"
             column="9"/>
     </issue>
 
@@ -33139,8 +32600,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22846"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22487"
             column="9"/>
     </issue>
 
@@ -33150,8 +32611,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22851"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22492"
             column="19"/>
     </issue>
 
@@ -33161,8 +32622,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22851"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22492"
             column="90"/>
     </issue>
 
@@ -33172,8 +32633,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22855"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22496"
             column="19"/>
     </issue>
 
@@ -33183,8 +32644,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22856"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22497"
             column="9"/>
     </issue>
 
@@ -33194,8 +32655,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22857"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22498"
             column="9"/>
     </issue>
 
@@ -33205,8 +32666,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22861"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22502"
             column="19"/>
     </issue>
 
@@ -33216,8 +32677,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22862"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22503"
             column="9"/>
     </issue>
 
@@ -33227,8 +32688,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22867"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22508"
             column="19"/>
     </issue>
 
@@ -33238,8 +32699,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22868"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22509"
             column="9"/>
     </issue>
 
@@ -33249,8 +32710,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22869"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22510"
             column="9"/>
     </issue>
 
@@ -33260,8 +32721,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22875"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22516"
             column="19"/>
     </issue>
 
@@ -33271,8 +32732,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Layout prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22878"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22519"
             column="19"/>
     </issue>
 
@@ -33282,8 +32743,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.LayoutElementProto.Layout prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22878"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22519"
             column="38"/>
     </issue>
 
@@ -33293,8 +32754,8 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement getRoot() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22919"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22560"
             column="14"/>
     </issue>
 
@@ -33304,8 +32765,8 @@
         errorLine1="      public Builder setRoot(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22929"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22570"
             column="14"/>
     </issue>
 
@@ -33315,8 +32776,8 @@
         errorLine1="      public Builder setRoot(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22929"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22570"
             column="30"/>
     </issue>
 
@@ -33326,8 +32787,8 @@
         errorLine1="      public Builder setRoot("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22941"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22582"
             column="14"/>
     </issue>
 
@@ -33337,8 +32798,8 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.LayoutElement.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22942"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22583"
             column="11"/>
     </issue>
 
@@ -33348,8 +32809,8 @@
         errorLine1="      public Builder mergeRoot(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22954"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22595"
             column="14"/>
     </issue>
 
@@ -33359,8 +32820,8 @@
         errorLine1="      public Builder mergeRoot(androidx.wear.tiles.proto.LayoutElementProto.LayoutElement value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22954"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22595"
             column="32"/>
     </issue>
 
@@ -33370,8 +32831,8 @@
         errorLine1="      public Builder clearRoot() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22966"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22607"
             column="14"/>
     </issue>
 
@@ -33381,8 +32842,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22975"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22616"
             column="21"/>
     </issue>
 
@@ -33392,8 +32853,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22976"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22617"
             column="9"/>
     </issue>
 
@@ -33403,8 +32864,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22977"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22618"
             column="9"/>
     </issue>
 
@@ -33414,8 +32875,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="22977"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22618"
             column="32"/>
     </issue>
 
@@ -33425,8 +32886,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.LayoutElementProto.Layout getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="23034"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22675"
             column="19"/>
     </issue>
 
@@ -33436,8 +32897,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Layout> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
-            line="23040"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/LayoutElementProto.java"
+            line="22681"
             column="19"/>
     </issue>
 
@@ -33447,7 +32908,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -33458,7 +32919,7 @@
         errorLine1="    java.lang.String getId();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="23"
             column="5"/>
     </issue>
@@ -33469,7 +32930,7 @@
         errorLine1="    com.google.protobuf.ByteString"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="32"
             column="5"/>
     </issue>
@@ -33480,7 +32941,7 @@
         errorLine1="    androidx.wear.tiles.proto.ActionProto.Action getOnClick();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="54"
             column="5"/>
     </issue>
@@ -33491,7 +32952,7 @@
         errorLine1="    public java.lang.String getId() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="84"
             column="12"/>
     </issue>
@@ -33502,7 +32963,7 @@
         errorLine1="    public com.google.protobuf.ByteString"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="96"
             column="12"/>
     </issue>
@@ -33513,7 +32974,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ActionProto.Action getOnClick() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="168"
             column="12"/>
     </issue>
@@ -33524,7 +32985,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="233"
             column="19"/>
     </issue>
@@ -33535,7 +32996,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="234"
             column="9"/>
     </issue>
@@ -33546,7 +33007,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="239"
             column="19"/>
     </issue>
@@ -33557,7 +33018,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="240"
             column="9"/>
     </issue>
@@ -33568,7 +33029,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="241"
             column="9"/>
     </issue>
@@ -33579,7 +33040,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="246"
             column="19"/>
     </issue>
@@ -33590,7 +33051,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="247"
             column="9"/>
     </issue>
@@ -33601,7 +33062,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="252"
             column="19"/>
     </issue>
@@ -33612,7 +33073,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="253"
             column="9"/>
     </issue>
@@ -33623,7 +33084,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="254"
             column="9"/>
     </issue>
@@ -33634,7 +33095,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="259"
             column="19"/>
     </issue>
@@ -33645,7 +33106,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom(byte[] data)"
         errorLine2="                                                                               ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="259"
             column="80"/>
     </issue>
@@ -33656,7 +33117,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="264"
             column="19"/>
     </issue>
@@ -33667,7 +33128,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="265"
             column="9"/>
     </issue>
@@ -33678,7 +33139,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="266"
             column="9"/>
     </issue>
@@ -33689,7 +33150,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="271"
             column="19"/>
     </issue>
@@ -33700,7 +33161,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom(java.io.InputStream input)"
         errorLine2="                                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="271"
             column="80"/>
     </issue>
@@ -33711,7 +33172,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="276"
             column="19"/>
     </issue>
@@ -33722,7 +33183,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="277"
             column="9"/>
     </issue>
@@ -33733,7 +33194,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="278"
             column="9"/>
     </issue>
@@ -33744,7 +33205,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="283"
             column="19"/>
     </issue>
@@ -33755,7 +33216,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="283"
             column="89"/>
     </issue>
@@ -33766,7 +33227,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="287"
             column="19"/>
     </issue>
@@ -33777,7 +33238,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="288"
             column="9"/>
     </issue>
@@ -33788,7 +33249,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="289"
             column="9"/>
     </issue>
@@ -33799,7 +33260,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="293"
             column="19"/>
     </issue>
@@ -33810,7 +33271,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="294"
             column="9"/>
     </issue>
@@ -33821,7 +33282,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="299"
             column="19"/>
     </issue>
@@ -33832,7 +33293,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="300"
             column="9"/>
     </issue>
@@ -33843,7 +33304,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="301"
             column="9"/>
     </issue>
@@ -33854,7 +33315,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="307"
             column="19"/>
     </issue>
@@ -33865,7 +33326,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Clickable prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="310"
             column="19"/>
     </issue>
@@ -33876,7 +33337,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Clickable prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="310"
             column="38"/>
     </issue>
@@ -33887,7 +33348,7 @@
         errorLine1="      public java.lang.String getId() {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="343"
             column="14"/>
     </issue>
@@ -33898,7 +33359,7 @@
         errorLine1="      public com.google.protobuf.ByteString"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="355"
             column="14"/>
     </issue>
@@ -33909,7 +33370,7 @@
         errorLine1="      public Builder setId("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="368"
             column="14"/>
     </issue>
@@ -33920,7 +33381,7 @@
         errorLine1="          java.lang.String value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="369"
             column="11"/>
     </issue>
@@ -33931,7 +33392,7 @@
         errorLine1="      public Builder clearId() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="382"
             column="14"/>
     </issue>
@@ -33942,7 +33403,7 @@
         errorLine1="      public Builder setIdBytes("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="396"
             column="14"/>
     </issue>
@@ -33953,7 +33414,7 @@
         errorLine1="          com.google.protobuf.ByteString value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="397"
             column="11"/>
     </issue>
@@ -33964,7 +33425,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ActionProto.Action getOnClick() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="424"
             column="14"/>
     </issue>
@@ -33975,7 +33436,7 @@
         errorLine1="      public Builder setOnClick(androidx.wear.tiles.proto.ActionProto.Action value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="435"
             column="14"/>
     </issue>
@@ -33986,7 +33447,7 @@
         errorLine1="      public Builder setOnClick(androidx.wear.tiles.proto.ActionProto.Action value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="435"
             column="33"/>
     </issue>
@@ -33997,7 +33458,7 @@
         errorLine1="      public Builder setOnClick("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="448"
             column="14"/>
     </issue>
@@ -34008,7 +33469,7 @@
         errorLine1="          androidx.wear.tiles.proto.ActionProto.Action.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="449"
             column="11"/>
     </issue>
@@ -34019,7 +33480,7 @@
         errorLine1="      public Builder mergeOnClick(androidx.wear.tiles.proto.ActionProto.Action value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="462"
             column="14"/>
     </issue>
@@ -34030,7 +33491,7 @@
         errorLine1="      public Builder mergeOnClick(androidx.wear.tiles.proto.ActionProto.Action value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="462"
             column="35"/>
     </issue>
@@ -34041,7 +33502,7 @@
         errorLine1="      public Builder clearOnClick() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="475"
             column="14"/>
     </issue>
@@ -34052,7 +33513,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="484"
             column="21"/>
     </issue>
@@ -34063,7 +33524,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="485"
             column="9"/>
     </issue>
@@ -34074,7 +33535,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="486"
             column="9"/>
     </issue>
@@ -34085,7 +33546,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="486"
             column="32"/>
     </issue>
@@ -34096,7 +33557,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Clickable getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="545"
             column="19"/>
     </issue>
@@ -34107,7 +33568,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Clickable> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="551"
             column="19"/>
     </issue>
@@ -34118,7 +33579,7 @@
         errorLine1="    java.lang.String getContentDescription();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="569"
             column="5"/>
     </issue>
@@ -34129,7 +33590,7 @@
         errorLine1="    com.google.protobuf.ByteString"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="579"
             column="5"/>
     </issue>
@@ -34140,7 +33601,7 @@
         errorLine1="    public java.lang.String getContentDescription() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="611"
             column="12"/>
     </issue>
@@ -34151,7 +33612,7 @@
         errorLine1="    public com.google.protobuf.ByteString"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="624"
             column="12"/>
     </issue>
@@ -34162,7 +33623,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="676"
             column="19"/>
     </issue>
@@ -34173,7 +33634,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="677"
             column="9"/>
     </issue>
@@ -34184,7 +33645,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="682"
             column="19"/>
     </issue>
@@ -34195,7 +33656,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="683"
             column="9"/>
     </issue>
@@ -34206,7 +33667,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="684"
             column="9"/>
     </issue>
@@ -34217,7 +33678,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="689"
             column="19"/>
     </issue>
@@ -34228,7 +33689,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="690"
             column="9"/>
     </issue>
@@ -34239,7 +33700,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="695"
             column="19"/>
     </issue>
@@ -34250,7 +33711,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="696"
             column="9"/>
     </issue>
@@ -34261,7 +33722,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="697"
             column="9"/>
     </issue>
@@ -34272,7 +33733,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="702"
             column="19"/>
     </issue>
@@ -34283,7 +33744,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom(byte[] data)"
         errorLine2="                                                                               ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="702"
             column="80"/>
     </issue>
@@ -34294,7 +33755,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="707"
             column="19"/>
     </issue>
@@ -34305,7 +33766,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="708"
             column="9"/>
     </issue>
@@ -34316,7 +33777,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="709"
             column="9"/>
     </issue>
@@ -34327,7 +33788,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="714"
             column="19"/>
     </issue>
@@ -34338,7 +33799,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom(java.io.InputStream input)"
         errorLine2="                                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="714"
             column="80"/>
     </issue>
@@ -34349,7 +33810,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="719"
             column="19"/>
     </issue>
@@ -34360,7 +33821,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="720"
             column="9"/>
     </issue>
@@ -34371,7 +33832,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="721"
             column="9"/>
     </issue>
@@ -34382,7 +33843,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="726"
             column="19"/>
     </issue>
@@ -34393,7 +33854,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="726"
             column="89"/>
     </issue>
@@ -34404,7 +33865,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="730"
             column="19"/>
     </issue>
@@ -34415,7 +33876,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="731"
             column="9"/>
     </issue>
@@ -34426,7 +33887,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="732"
             column="9"/>
     </issue>
@@ -34437,7 +33898,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="736"
             column="19"/>
     </issue>
@@ -34448,7 +33909,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="737"
             column="9"/>
     </issue>
@@ -34459,7 +33920,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="742"
             column="19"/>
     </issue>
@@ -34470,7 +33931,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="743"
             column="9"/>
     </issue>
@@ -34481,7 +33942,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="744"
             column="9"/>
     </issue>
@@ -34492,7 +33953,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="750"
             column="19"/>
     </issue>
@@ -34503,7 +33964,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Semantics prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="753"
             column="19"/>
     </issue>
@@ -34514,7 +33975,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Semantics prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="753"
             column="38"/>
     </issue>
@@ -34525,7 +33986,7 @@
         errorLine1="      public java.lang.String getContentDescription() {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="787"
             column="14"/>
     </issue>
@@ -34536,7 +33997,7 @@
         errorLine1="      public com.google.protobuf.ByteString"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="800"
             column="14"/>
     </issue>
@@ -34547,7 +34008,7 @@
         errorLine1="      public Builder setContentDescription("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="814"
             column="14"/>
     </issue>
@@ -34558,7 +34019,7 @@
         errorLine1="          java.lang.String value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="815"
             column="11"/>
     </issue>
@@ -34569,7 +34030,7 @@
         errorLine1="      public Builder clearContentDescription() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="829"
             column="14"/>
     </issue>
@@ -34580,7 +34041,7 @@
         errorLine1="      public Builder setContentDescriptionBytes("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="844"
             column="14"/>
     </issue>
@@ -34591,7 +34052,7 @@
         errorLine1="          com.google.protobuf.ByteString value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="845"
             column="11"/>
     </issue>
@@ -34602,7 +34063,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="855"
             column="21"/>
     </issue>
@@ -34613,7 +34074,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="856"
             column="9"/>
     </issue>
@@ -34624,7 +34085,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="857"
             column="9"/>
     </issue>
@@ -34635,7 +34096,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="857"
             column="32"/>
     </issue>
@@ -34646,7 +34107,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Semantics getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="914"
             column="19"/>
     </issue>
@@ -34657,7 +34118,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Semantics> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="920"
             column="19"/>
     </issue>
@@ -34668,7 +34129,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getEnd();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="948"
             column="5"/>
     </issue>
@@ -34679,7 +34140,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getStart();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="969"
             column="5"/>
     </issue>
@@ -34690,7 +34151,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getTop();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="988"
             column="5"/>
     </issue>
@@ -34701,7 +34162,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getBottom();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1007"
             column="5"/>
     </issue>
@@ -34712,7 +34173,7 @@
         errorLine1="    androidx.wear.tiles.proto.TypesProto.BoolProp getRtlAware();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1032"
             column="5"/>
     </issue>
@@ -34723,7 +34184,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getEnd() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1071"
             column="12"/>
     </issue>
@@ -34734,7 +34195,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getStart() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1159"
             column="12"/>
     </issue>
@@ -34745,7 +34206,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getTop() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1245"
             column="12"/>
     </issue>
@@ -34756,7 +34217,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getBottom() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1327"
             column="12"/>
     </issue>
@@ -34767,7 +34228,7 @@
         errorLine1="    public androidx.wear.tiles.proto.TypesProto.BoolProp getRtlAware() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1415"
             column="12"/>
     </issue>
@@ -34778,7 +34239,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1488"
             column="19"/>
     </issue>
@@ -34789,7 +34250,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1489"
             column="9"/>
     </issue>
@@ -34800,7 +34261,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1494"
             column="19"/>
     </issue>
@@ -34811,7 +34272,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1495"
             column="9"/>
     </issue>
@@ -34822,7 +34283,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1496"
             column="9"/>
     </issue>
@@ -34833,7 +34294,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1501"
             column="19"/>
     </issue>
@@ -34844,7 +34305,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1502"
             column="9"/>
     </issue>
@@ -34855,7 +34316,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1507"
             column="19"/>
     </issue>
@@ -34866,7 +34327,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1508"
             column="9"/>
     </issue>
@@ -34877,7 +34338,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1509"
             column="9"/>
     </issue>
@@ -34888,7 +34349,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1514"
             column="19"/>
     </issue>
@@ -34899,7 +34360,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom(byte[] data)"
         errorLine2="                                                                             ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1514"
             column="78"/>
     </issue>
@@ -34910,7 +34371,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1519"
             column="19"/>
     </issue>
@@ -34921,7 +34382,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1520"
             column="9"/>
     </issue>
@@ -34932,7 +34393,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1521"
             column="9"/>
     </issue>
@@ -34943,7 +34404,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1526"
             column="19"/>
     </issue>
@@ -34954,7 +34415,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom(java.io.InputStream input)"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1526"
             column="78"/>
     </issue>
@@ -34965,7 +34426,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1531"
             column="19"/>
     </issue>
@@ -34976,7 +34437,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1532"
             column="9"/>
     </issue>
@@ -34987,7 +34448,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1533"
             column="9"/>
     </issue>
@@ -34998,7 +34459,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1538"
             column="19"/>
     </issue>
@@ -35009,7 +34470,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1538"
             column="87"/>
     </issue>
@@ -35020,7 +34481,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1542"
             column="19"/>
     </issue>
@@ -35031,7 +34492,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1543"
             column="9"/>
     </issue>
@@ -35042,7 +34503,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1544"
             column="9"/>
     </issue>
@@ -35053,7 +34514,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1548"
             column="19"/>
     </issue>
@@ -35064,7 +34525,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1549"
             column="9"/>
     </issue>
@@ -35075,7 +34536,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1554"
             column="19"/>
     </issue>
@@ -35086,7 +34547,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1555"
             column="9"/>
     </issue>
@@ -35097,7 +34558,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1556"
             column="9"/>
     </issue>
@@ -35108,7 +34569,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1562"
             column="19"/>
     </issue>
@@ -35119,7 +34580,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Padding prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1565"
             column="19"/>
     </issue>
@@ -35130,7 +34591,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Padding prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1565"
             column="38"/>
     </issue>
@@ -35141,7 +34602,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getEnd() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1608"
             column="14"/>
     </issue>
@@ -35152,7 +34613,7 @@
         errorLine1="      public Builder setEnd(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1619"
             column="14"/>
     </issue>
@@ -35163,7 +34624,7 @@
         errorLine1="      public Builder setEnd(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1619"
             column="29"/>
     </issue>
@@ -35174,7 +34635,7 @@
         errorLine1="      public Builder setEnd("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1632"
             column="14"/>
     </issue>
@@ -35185,7 +34646,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1633"
             column="11"/>
     </issue>
@@ -35196,7 +34657,7 @@
         errorLine1="      public Builder mergeEnd(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1646"
             column="14"/>
     </issue>
@@ -35207,7 +34668,7 @@
         errorLine1="      public Builder mergeEnd(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1646"
             column="31"/>
     </issue>
@@ -35218,7 +34679,7 @@
         errorLine1="      public Builder clearEnd() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1659"
             column="14"/>
     </issue>
@@ -35229,7 +34690,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getStart() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1685"
             column="14"/>
     </issue>
@@ -35240,7 +34701,7 @@
         errorLine1="      public Builder setStart(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1696"
             column="14"/>
     </issue>
@@ -35251,7 +34712,7 @@
         errorLine1="      public Builder setStart(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1696"
             column="31"/>
     </issue>
@@ -35262,7 +34723,7 @@
         errorLine1="      public Builder setStart("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1709"
             column="14"/>
     </issue>
@@ -35273,7 +34734,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1710"
             column="11"/>
     </issue>
@@ -35284,7 +34745,7 @@
         errorLine1="      public Builder mergeStart(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1723"
             column="14"/>
     </issue>
@@ -35295,7 +34756,7 @@
         errorLine1="      public Builder mergeStart(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1723"
             column="33"/>
     </issue>
@@ -35306,7 +34767,7 @@
         errorLine1="      public Builder clearStart() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1736"
             column="14"/>
     </issue>
@@ -35317,7 +34778,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getTop() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1760"
             column="14"/>
     </issue>
@@ -35328,7 +34789,7 @@
         errorLine1="      public Builder setTop(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1770"
             column="14"/>
     </issue>
@@ -35339,7 +34800,7 @@
         errorLine1="      public Builder setTop(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1770"
             column="29"/>
     </issue>
@@ -35350,7 +34811,7 @@
         errorLine1="      public Builder setTop("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1782"
             column="14"/>
     </issue>
@@ -35361,7 +34822,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1783"
             column="11"/>
     </issue>
@@ -35372,7 +34833,7 @@
         errorLine1="      public Builder mergeTop(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1795"
             column="14"/>
     </issue>
@@ -35383,7 +34844,7 @@
         errorLine1="      public Builder mergeTop(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1795"
             column="31"/>
     </issue>
@@ -35394,7 +34855,7 @@
         errorLine1="      public Builder clearTop() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1807"
             column="14"/>
     </issue>
@@ -35405,7 +34866,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getBottom() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1831"
             column="14"/>
     </issue>
@@ -35416,7 +34877,7 @@
         errorLine1="      public Builder setBottom(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1841"
             column="14"/>
     </issue>
@@ -35427,7 +34888,7 @@
         errorLine1="      public Builder setBottom(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1841"
             column="32"/>
     </issue>
@@ -35438,7 +34899,7 @@
         errorLine1="      public Builder setBottom("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1853"
             column="14"/>
     </issue>
@@ -35449,7 +34910,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1854"
             column="11"/>
     </issue>
@@ -35460,7 +34921,7 @@
         errorLine1="      public Builder mergeBottom(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1866"
             column="14"/>
     </issue>
@@ -35471,7 +34932,7 @@
         errorLine1="      public Builder mergeBottom(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1866"
             column="34"/>
     </issue>
@@ -35482,7 +34943,7 @@
         errorLine1="      public Builder clearBottom() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1878"
             column="14"/>
     </issue>
@@ -35493,7 +34954,7 @@
         errorLine1="      public androidx.wear.tiles.proto.TypesProto.BoolProp getRtlAware() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1908"
             column="14"/>
     </issue>
@@ -35504,7 +34965,7 @@
         errorLine1="      public Builder setRtlAware(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1921"
             column="14"/>
     </issue>
@@ -35515,7 +34976,7 @@
         errorLine1="      public Builder setRtlAware(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1921"
             column="34"/>
     </issue>
@@ -35526,7 +34987,7 @@
         errorLine1="      public Builder setRtlAware("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1936"
             column="14"/>
     </issue>
@@ -35537,7 +34998,7 @@
         errorLine1="          androidx.wear.tiles.proto.TypesProto.BoolProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1937"
             column="11"/>
     </issue>
@@ -35548,7 +35009,7 @@
         errorLine1="      public Builder mergeRtlAware(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1952"
             column="14"/>
     </issue>
@@ -35559,7 +35020,7 @@
         errorLine1="      public Builder mergeRtlAware(androidx.wear.tiles.proto.TypesProto.BoolProp value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1952"
             column="36"/>
     </issue>
@@ -35570,7 +35031,7 @@
         errorLine1="      public Builder clearRtlAware() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1967"
             column="14"/>
     </issue>
@@ -35581,7 +35042,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1976"
             column="21"/>
     </issue>
@@ -35592,7 +35053,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1977"
             column="9"/>
     </issue>
@@ -35603,7 +35064,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1978"
             column="9"/>
     </issue>
@@ -35614,7 +35075,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="1978"
             column="32"/>
     </issue>
@@ -35625,7 +35086,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Padding getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2040"
             column="19"/>
     </issue>
@@ -35636,7 +35097,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Padding> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2046"
             column="19"/>
     </issue>
@@ -35647,7 +35108,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getWidth();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2072"
             column="5"/>
     </issue>
@@ -35658,7 +35119,7 @@
         errorLine1="    androidx.wear.tiles.proto.ColorProto.ColorProp getColor();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2091"
             column="5"/>
     </issue>
@@ -35669,7 +35130,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getWidth() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2128"
             column="12"/>
     </issue>
@@ -35680,7 +35141,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ColorProto.ColorProp getColor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2210"
             column="12"/>
     </issue>
@@ -35691,7 +35152,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2271"
             column="19"/>
     </issue>
@@ -35702,7 +35163,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2272"
             column="9"/>
     </issue>
@@ -35713,7 +35174,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2277"
             column="19"/>
     </issue>
@@ -35724,7 +35185,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2278"
             column="9"/>
     </issue>
@@ -35735,7 +35196,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2279"
             column="9"/>
     </issue>
@@ -35746,7 +35207,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2284"
             column="19"/>
     </issue>
@@ -35757,7 +35218,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2285"
             column="9"/>
     </issue>
@@ -35768,7 +35229,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2290"
             column="19"/>
     </issue>
@@ -35779,7 +35240,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2291"
             column="9"/>
     </issue>
@@ -35790,7 +35251,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2292"
             column="9"/>
     </issue>
@@ -35801,7 +35262,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2297"
             column="19"/>
     </issue>
@@ -35812,7 +35273,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom(byte[] data)"
         errorLine2="                                                                            ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2297"
             column="77"/>
     </issue>
@@ -35823,7 +35284,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2302"
             column="19"/>
     </issue>
@@ -35834,7 +35295,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2303"
             column="9"/>
     </issue>
@@ -35845,7 +35306,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2304"
             column="9"/>
     </issue>
@@ -35856,7 +35317,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2309"
             column="19"/>
     </issue>
@@ -35867,7 +35328,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom(java.io.InputStream input)"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2309"
             column="77"/>
     </issue>
@@ -35878,7 +35339,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2314"
             column="19"/>
     </issue>
@@ -35889,7 +35350,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2315"
             column="9"/>
     </issue>
@@ -35900,7 +35361,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2316"
             column="9"/>
     </issue>
@@ -35911,7 +35372,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2321"
             column="19"/>
     </issue>
@@ -35922,7 +35383,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2321"
             column="86"/>
     </issue>
@@ -35933,7 +35394,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2325"
             column="19"/>
     </issue>
@@ -35944,7 +35405,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2326"
             column="9"/>
     </issue>
@@ -35955,7 +35416,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2327"
             column="9"/>
     </issue>
@@ -35966,7 +35427,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2331"
             column="19"/>
     </issue>
@@ -35977,7 +35438,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2332"
             column="9"/>
     </issue>
@@ -35988,7 +35449,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2337"
             column="19"/>
     </issue>
@@ -35999,7 +35460,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2338"
             column="9"/>
     </issue>
@@ -36010,7 +35471,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2339"
             column="9"/>
     </issue>
@@ -36021,7 +35482,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2345"
             column="19"/>
     </issue>
@@ -36032,7 +35493,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Border prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2348"
             column="19"/>
     </issue>
@@ -36043,7 +35504,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Border prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2348"
             column="38"/>
     </issue>
@@ -36054,7 +35515,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getWidth() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2389"
             column="14"/>
     </issue>
@@ -36065,7 +35526,7 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2399"
             column="14"/>
     </issue>
@@ -36076,7 +35537,7 @@
         errorLine1="      public Builder setWidth(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2399"
             column="31"/>
     </issue>
@@ -36087,7 +35548,7 @@
         errorLine1="      public Builder setWidth("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2411"
             column="14"/>
     </issue>
@@ -36098,7 +35559,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2412"
             column="11"/>
     </issue>
@@ -36109,7 +35570,7 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2424"
             column="14"/>
     </issue>
@@ -36120,7 +35581,7 @@
         errorLine1="      public Builder mergeWidth(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2424"
             column="33"/>
     </issue>
@@ -36131,7 +35592,7 @@
         errorLine1="      public Builder clearWidth() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2436"
             column="14"/>
     </issue>
@@ -36142,7 +35603,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ColorProto.ColorProp getColor() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2460"
             column="14"/>
     </issue>
@@ -36153,7 +35614,7 @@
         errorLine1="      public Builder setColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2470"
             column="14"/>
     </issue>
@@ -36164,7 +35625,7 @@
         errorLine1="      public Builder setColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2470"
             column="31"/>
     </issue>
@@ -36175,7 +35636,7 @@
         errorLine1="      public Builder setColor("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2482"
             column="14"/>
     </issue>
@@ -36186,7 +35647,7 @@
         errorLine1="          androidx.wear.tiles.proto.ColorProto.ColorProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2483"
             column="11"/>
     </issue>
@@ -36197,7 +35658,7 @@
         errorLine1="      public Builder mergeColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2495"
             column="14"/>
     </issue>
@@ -36208,7 +35669,7 @@
         errorLine1="      public Builder mergeColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2495"
             column="33"/>
     </issue>
@@ -36219,7 +35680,7 @@
         errorLine1="      public Builder clearColor() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2507"
             column="14"/>
     </issue>
@@ -36230,7 +35691,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2516"
             column="21"/>
     </issue>
@@ -36241,7 +35702,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2517"
             column="9"/>
     </issue>
@@ -36252,7 +35713,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2518"
             column="9"/>
     </issue>
@@ -36263,7 +35724,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2518"
             column="32"/>
     </issue>
@@ -36274,7 +35735,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Border getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2576"
             column="19"/>
     </issue>
@@ -36285,7 +35746,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Border> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2582"
             column="19"/>
     </issue>
@@ -36296,7 +35757,7 @@
         errorLine1="    androidx.wear.tiles.proto.DimensionProto.DpProp getRadius();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2608"
             column="5"/>
     </issue>
@@ -36307,7 +35768,7 @@
         errorLine1="    public androidx.wear.tiles.proto.DimensionProto.DpProp getRadius() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2645"
             column="12"/>
     </issue>
@@ -36318,7 +35779,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2706"
             column="19"/>
     </issue>
@@ -36329,7 +35790,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2707"
             column="9"/>
     </issue>
@@ -36340,7 +35801,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2712"
             column="19"/>
     </issue>
@@ -36351,7 +35812,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2713"
             column="9"/>
     </issue>
@@ -36362,7 +35823,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2714"
             column="9"/>
     </issue>
@@ -36373,7 +35834,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2719"
             column="19"/>
     </issue>
@@ -36384,7 +35845,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2720"
             column="9"/>
     </issue>
@@ -36395,7 +35856,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2725"
             column="19"/>
     </issue>
@@ -36406,7 +35867,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2726"
             column="9"/>
     </issue>
@@ -36417,7 +35878,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2727"
             column="9"/>
     </issue>
@@ -36428,7 +35889,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2732"
             column="19"/>
     </issue>
@@ -36439,7 +35900,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom(byte[] data)"
         errorLine2="                                                                            ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2732"
             column="77"/>
     </issue>
@@ -36450,7 +35911,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2737"
             column="19"/>
     </issue>
@@ -36461,7 +35922,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2738"
             column="9"/>
     </issue>
@@ -36472,7 +35933,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2739"
             column="9"/>
     </issue>
@@ -36483,7 +35944,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2744"
             column="19"/>
     </issue>
@@ -36494,7 +35955,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom(java.io.InputStream input)"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2744"
             column="77"/>
     </issue>
@@ -36505,7 +35966,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2749"
             column="19"/>
     </issue>
@@ -36516,7 +35977,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2750"
             column="9"/>
     </issue>
@@ -36527,7 +35988,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2751"
             column="9"/>
     </issue>
@@ -36538,7 +35999,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2756"
             column="19"/>
     </issue>
@@ -36549,7 +36010,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2756"
             column="86"/>
     </issue>
@@ -36560,7 +36021,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2760"
             column="19"/>
     </issue>
@@ -36571,7 +36032,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2761"
             column="9"/>
     </issue>
@@ -36582,7 +36043,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2762"
             column="9"/>
     </issue>
@@ -36593,7 +36054,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2766"
             column="19"/>
     </issue>
@@ -36604,7 +36065,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2767"
             column="9"/>
     </issue>
@@ -36615,7 +36076,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2772"
             column="19"/>
     </issue>
@@ -36626,7 +36087,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2773"
             column="9"/>
     </issue>
@@ -36637,7 +36098,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2774"
             column="9"/>
     </issue>
@@ -36648,7 +36109,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2780"
             column="19"/>
     </issue>
@@ -36659,7 +36120,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Corner prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2783"
             column="19"/>
     </issue>
@@ -36670,7 +36131,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Corner prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2783"
             column="38"/>
     </issue>
@@ -36681,7 +36142,7 @@
         errorLine1="      public androidx.wear.tiles.proto.DimensionProto.DpProp getRadius() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2824"
             column="14"/>
     </issue>
@@ -36692,7 +36153,7 @@
         errorLine1="      public Builder setRadius(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2834"
             column="14"/>
     </issue>
@@ -36703,7 +36164,7 @@
         errorLine1="      public Builder setRadius(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2834"
             column="32"/>
     </issue>
@@ -36714,7 +36175,7 @@
         errorLine1="      public Builder setRadius("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2846"
             column="14"/>
     </issue>
@@ -36725,7 +36186,7 @@
         errorLine1="          androidx.wear.tiles.proto.DimensionProto.DpProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2847"
             column="11"/>
     </issue>
@@ -36736,7 +36197,7 @@
         errorLine1="      public Builder mergeRadius(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2859"
             column="14"/>
     </issue>
@@ -36747,7 +36208,7 @@
         errorLine1="      public Builder mergeRadius(androidx.wear.tiles.proto.DimensionProto.DpProp value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2859"
             column="34"/>
     </issue>
@@ -36758,7 +36219,7 @@
         errorLine1="      public Builder clearRadius() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2871"
             column="14"/>
     </issue>
@@ -36769,7 +36230,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2880"
             column="21"/>
     </issue>
@@ -36780,7 +36241,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2881"
             column="9"/>
     </issue>
@@ -36791,7 +36252,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2882"
             column="9"/>
     </issue>
@@ -36802,7 +36263,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2882"
             column="32"/>
     </issue>
@@ -36813,7 +36274,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Corner getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2939"
             column="19"/>
     </issue>
@@ -36824,7 +36285,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Corner> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2945"
             column="19"/>
     </issue>
@@ -36835,7 +36296,7 @@
         errorLine1="    androidx.wear.tiles.proto.ColorProto.ColorProp getColor();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2973"
             column="5"/>
     </issue>
@@ -36846,7 +36307,7 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Corner getCorner();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="2996"
             column="5"/>
     </issue>
@@ -36857,7 +36318,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ColorProto.ColorProp getColor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3035"
             column="12"/>
     </issue>
@@ -36868,7 +36329,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Corner getCorner() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3125"
             column="12"/>
     </issue>
@@ -36879,7 +36340,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3194"
             column="19"/>
     </issue>
@@ -36890,7 +36351,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3195"
             column="9"/>
     </issue>
@@ -36901,7 +36362,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3200"
             column="19"/>
     </issue>
@@ -36912,7 +36373,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3201"
             column="9"/>
     </issue>
@@ -36923,7 +36384,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3202"
             column="9"/>
     </issue>
@@ -36934,7 +36395,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3207"
             column="19"/>
     </issue>
@@ -36945,7 +36406,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3208"
             column="9"/>
     </issue>
@@ -36956,7 +36417,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3213"
             column="19"/>
     </issue>
@@ -36967,7 +36428,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3214"
             column="9"/>
     </issue>
@@ -36978,7 +36439,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3215"
             column="9"/>
     </issue>
@@ -36989,7 +36450,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3220"
             column="19"/>
     </issue>
@@ -37000,7 +36461,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom(byte[] data)"
         errorLine2="                                                                                ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3220"
             column="81"/>
     </issue>
@@ -37011,7 +36472,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3225"
             column="19"/>
     </issue>
@@ -37022,7 +36483,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3226"
             column="9"/>
     </issue>
@@ -37033,7 +36494,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3227"
             column="9"/>
     </issue>
@@ -37044,7 +36505,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3232"
             column="19"/>
     </issue>
@@ -37055,7 +36516,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3232"
             column="81"/>
     </issue>
@@ -37066,7 +36527,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3237"
             column="19"/>
     </issue>
@@ -37077,7 +36538,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3238"
             column="9"/>
     </issue>
@@ -37088,7 +36549,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3239"
             column="9"/>
     </issue>
@@ -37099,7 +36560,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3244"
             column="19"/>
     </issue>
@@ -37110,7 +36571,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3244"
             column="90"/>
     </issue>
@@ -37121,7 +36582,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3248"
             column="19"/>
     </issue>
@@ -37132,7 +36593,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3249"
             column="9"/>
     </issue>
@@ -37143,7 +36604,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3250"
             column="9"/>
     </issue>
@@ -37154,7 +36615,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3254"
             column="19"/>
     </issue>
@@ -37165,7 +36626,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3255"
             column="9"/>
     </issue>
@@ -37176,7 +36637,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3260"
             column="19"/>
     </issue>
@@ -37187,7 +36648,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3261"
             column="9"/>
     </issue>
@@ -37198,7 +36659,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3262"
             column="9"/>
     </issue>
@@ -37209,7 +36670,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3268"
             column="19"/>
     </issue>
@@ -37220,7 +36681,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Background prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3271"
             column="19"/>
     </issue>
@@ -37231,7 +36692,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Background prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3271"
             column="38"/>
     </issue>
@@ -37242,7 +36703,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ColorProto.ColorProp getColor() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3314"
             column="14"/>
     </issue>
@@ -37253,7 +36714,7 @@
         errorLine1="      public Builder setColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3325"
             column="14"/>
     </issue>
@@ -37264,7 +36725,7 @@
         errorLine1="      public Builder setColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3325"
             column="31"/>
     </issue>
@@ -37275,7 +36736,7 @@
         errorLine1="      public Builder setColor("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3338"
             column="14"/>
     </issue>
@@ -37286,7 +36747,7 @@
         errorLine1="          androidx.wear.tiles.proto.ColorProto.ColorProp.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3339"
             column="11"/>
     </issue>
@@ -37297,7 +36758,7 @@
         errorLine1="      public Builder mergeColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3352"
             column="14"/>
     </issue>
@@ -37308,7 +36769,7 @@
         errorLine1="      public Builder mergeColor(androidx.wear.tiles.proto.ColorProto.ColorProp value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3352"
             column="33"/>
     </issue>
@@ -37319,7 +36780,7 @@
         errorLine1="      public Builder clearColor() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3365"
             column="14"/>
     </issue>
@@ -37330,7 +36791,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Corner getCorner() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3393"
             column="14"/>
     </issue>
@@ -37341,7 +36802,7 @@
         errorLine1="      public Builder setCorner(androidx.wear.tiles.proto.ModifiersProto.Corner value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3405"
             column="14"/>
     </issue>
@@ -37352,7 +36813,7 @@
         errorLine1="      public Builder setCorner(androidx.wear.tiles.proto.ModifiersProto.Corner value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3405"
             column="32"/>
     </issue>
@@ -37363,7 +36824,7 @@
         errorLine1="      public Builder setCorner("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3419"
             column="14"/>
     </issue>
@@ -37374,7 +36835,7 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Corner.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3420"
             column="11"/>
     </issue>
@@ -37385,7 +36846,7 @@
         errorLine1="      public Builder mergeCorner(androidx.wear.tiles.proto.ModifiersProto.Corner value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3434"
             column="14"/>
     </issue>
@@ -37396,7 +36857,7 @@
         errorLine1="      public Builder mergeCorner(androidx.wear.tiles.proto.ModifiersProto.Corner value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3434"
             column="34"/>
     </issue>
@@ -37407,7 +36868,7 @@
         errorLine1="      public Builder clearCorner() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3448"
             column="14"/>
     </issue>
@@ -37418,7 +36879,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3457"
             column="21"/>
     </issue>
@@ -37429,7 +36890,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3458"
             column="9"/>
     </issue>
@@ -37440,7 +36901,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3459"
             column="9"/>
     </issue>
@@ -37451,7 +36912,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3459"
             column="32"/>
     </issue>
@@ -37462,7 +36923,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Background getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3517"
             column="19"/>
     </issue>
@@ -37473,7 +36934,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Background> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3523"
             column="19"/>
     </issue>
@@ -37484,7 +36945,7 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Clickable getClickable();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3551"
             column="5"/>
     </issue>
@@ -37495,7 +36956,7 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Semantics getSemantics();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3572"
             column="5"/>
     </issue>
@@ -37506,7 +36967,7 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Padding getPadding();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3591"
             column="5"/>
     </issue>
@@ -37517,7 +36978,7 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Border getBorder();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3610"
             column="5"/>
     </issue>
@@ -37528,7 +36989,7 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Background getBackground();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3629"
             column="5"/>
     </issue>
@@ -37539,7 +37000,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Clickable getClickable() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3670"
             column="12"/>
     </issue>
@@ -37550,7 +37011,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Semantics getSemantics() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3758"
             column="12"/>
     </issue>
@@ -37561,7 +37022,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Padding getPadding() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3844"
             column="12"/>
     </issue>
@@ -37572,7 +37033,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Border getBorder() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="3926"
             column="12"/>
     </issue>
@@ -37583,7 +37044,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Background getBackground() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4008"
             column="12"/>
     </issue>
@@ -37594,7 +37055,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4069"
             column="19"/>
     </issue>
@@ -37605,7 +37066,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4070"
             column="9"/>
     </issue>
@@ -37616,7 +37077,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4075"
             column="19"/>
     </issue>
@@ -37627,7 +37088,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4076"
             column="9"/>
     </issue>
@@ -37638,7 +37099,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4077"
             column="9"/>
     </issue>
@@ -37649,7 +37110,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4082"
             column="19"/>
     </issue>
@@ -37660,7 +37121,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4083"
             column="9"/>
     </issue>
@@ -37671,7 +37132,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4088"
             column="19"/>
     </issue>
@@ -37682,7 +37143,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4089"
             column="9"/>
     </issue>
@@ -37693,7 +37154,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4090"
             column="9"/>
     </issue>
@@ -37704,7 +37165,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4095"
             column="19"/>
     </issue>
@@ -37715,7 +37176,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom(byte[] data)"
         errorLine2="                                                                               ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4095"
             column="80"/>
     </issue>
@@ -37726,7 +37187,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4100"
             column="19"/>
     </issue>
@@ -37737,7 +37198,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4101"
             column="9"/>
     </issue>
@@ -37748,7 +37209,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4102"
             column="9"/>
     </issue>
@@ -37759,7 +37220,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4107"
             column="19"/>
     </issue>
@@ -37770,7 +37231,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom(java.io.InputStream input)"
         errorLine2="                                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4107"
             column="80"/>
     </issue>
@@ -37781,7 +37242,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4112"
             column="19"/>
     </issue>
@@ -37792,7 +37253,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4113"
             column="9"/>
     </issue>
@@ -37803,7 +37264,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4114"
             column="9"/>
     </issue>
@@ -37814,7 +37275,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4119"
             column="19"/>
     </issue>
@@ -37825,7 +37286,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4119"
             column="89"/>
     </issue>
@@ -37836,7 +37297,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4123"
             column="19"/>
     </issue>
@@ -37847,7 +37308,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4124"
             column="9"/>
     </issue>
@@ -37858,7 +37319,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4125"
             column="9"/>
     </issue>
@@ -37869,7 +37330,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4129"
             column="19"/>
     </issue>
@@ -37880,7 +37341,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4130"
             column="9"/>
     </issue>
@@ -37891,7 +37352,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4135"
             column="19"/>
     </issue>
@@ -37902,7 +37363,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4136"
             column="9"/>
     </issue>
@@ -37913,7 +37374,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4137"
             column="9"/>
     </issue>
@@ -37924,7 +37385,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4143"
             column="19"/>
     </issue>
@@ -37935,7 +37396,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Modifiers prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4146"
             column="19"/>
     </issue>
@@ -37946,7 +37407,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.Modifiers prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4146"
             column="38"/>
     </issue>
@@ -37957,7 +37418,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Clickable getClickable() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4191"
             column="14"/>
     </issue>
@@ -37968,7 +37429,7 @@
         errorLine1="      public Builder setClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4202"
             column="14"/>
     </issue>
@@ -37979,7 +37440,7 @@
         errorLine1="      public Builder setClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4202"
             column="35"/>
     </issue>
@@ -37990,7 +37451,7 @@
         errorLine1="      public Builder setClickable("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4215"
             column="14"/>
     </issue>
@@ -38001,7 +37462,7 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Clickable.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4216"
             column="11"/>
     </issue>
@@ -38012,7 +37473,7 @@
         errorLine1="      public Builder mergeClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4229"
             column="14"/>
     </issue>
@@ -38023,7 +37484,7 @@
         errorLine1="      public Builder mergeClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4229"
             column="37"/>
     </issue>
@@ -38034,7 +37495,7 @@
         errorLine1="      public Builder clearClickable() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4242"
             column="14"/>
     </issue>
@@ -38045,7 +37506,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Semantics getSemantics() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4268"
             column="14"/>
     </issue>
@@ -38056,7 +37517,7 @@
         errorLine1="      public Builder setSemantics(androidx.wear.tiles.proto.ModifiersProto.Semantics value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4279"
             column="14"/>
     </issue>
@@ -38067,7 +37528,7 @@
         errorLine1="      public Builder setSemantics(androidx.wear.tiles.proto.ModifiersProto.Semantics value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4279"
             column="35"/>
     </issue>
@@ -38078,7 +37539,7 @@
         errorLine1="      public Builder setSemantics("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4292"
             column="14"/>
     </issue>
@@ -38089,7 +37550,7 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Semantics.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4293"
             column="11"/>
     </issue>
@@ -38100,7 +37561,7 @@
         errorLine1="      public Builder mergeSemantics(androidx.wear.tiles.proto.ModifiersProto.Semantics value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4306"
             column="14"/>
     </issue>
@@ -38111,7 +37572,7 @@
         errorLine1="      public Builder mergeSemantics(androidx.wear.tiles.proto.ModifiersProto.Semantics value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4306"
             column="37"/>
     </issue>
@@ -38122,7 +37583,7 @@
         errorLine1="      public Builder clearSemantics() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4319"
             column="14"/>
     </issue>
@@ -38133,7 +37594,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Padding getPadding() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4343"
             column="14"/>
     </issue>
@@ -38144,7 +37605,7 @@
         errorLine1="      public Builder setPadding(androidx.wear.tiles.proto.ModifiersProto.Padding value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4353"
             column="14"/>
     </issue>
@@ -38155,7 +37616,7 @@
         errorLine1="      public Builder setPadding(androidx.wear.tiles.proto.ModifiersProto.Padding value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4353"
             column="33"/>
     </issue>
@@ -38166,7 +37627,7 @@
         errorLine1="      public Builder setPadding("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4365"
             column="14"/>
     </issue>
@@ -38177,7 +37638,7 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Padding.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4366"
             column="11"/>
     </issue>
@@ -38188,7 +37649,7 @@
         errorLine1="      public Builder mergePadding(androidx.wear.tiles.proto.ModifiersProto.Padding value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4378"
             column="14"/>
     </issue>
@@ -38199,7 +37660,7 @@
         errorLine1="      public Builder mergePadding(androidx.wear.tiles.proto.ModifiersProto.Padding value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4378"
             column="35"/>
     </issue>
@@ -38210,7 +37671,7 @@
         errorLine1="      public Builder clearPadding() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4390"
             column="14"/>
     </issue>
@@ -38221,7 +37682,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Border getBorder() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4414"
             column="14"/>
     </issue>
@@ -38232,7 +37693,7 @@
         errorLine1="      public Builder setBorder(androidx.wear.tiles.proto.ModifiersProto.Border value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4424"
             column="14"/>
     </issue>
@@ -38243,7 +37704,7 @@
         errorLine1="      public Builder setBorder(androidx.wear.tiles.proto.ModifiersProto.Border value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4424"
             column="32"/>
     </issue>
@@ -38254,7 +37715,7 @@
         errorLine1="      public Builder setBorder("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4436"
             column="14"/>
     </issue>
@@ -38265,7 +37726,7 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Border.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4437"
             column="11"/>
     </issue>
@@ -38276,7 +37737,7 @@
         errorLine1="      public Builder mergeBorder(androidx.wear.tiles.proto.ModifiersProto.Border value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4449"
             column="14"/>
     </issue>
@@ -38287,7 +37748,7 @@
         errorLine1="      public Builder mergeBorder(androidx.wear.tiles.proto.ModifiersProto.Border value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4449"
             column="34"/>
     </issue>
@@ -38298,7 +37759,7 @@
         errorLine1="      public Builder clearBorder() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4461"
             column="14"/>
     </issue>
@@ -38309,7 +37770,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Background getBackground() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4485"
             column="14"/>
     </issue>
@@ -38320,7 +37781,7 @@
         errorLine1="      public Builder setBackground(androidx.wear.tiles.proto.ModifiersProto.Background value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4495"
             column="14"/>
     </issue>
@@ -38331,7 +37792,7 @@
         errorLine1="      public Builder setBackground(androidx.wear.tiles.proto.ModifiersProto.Background value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4495"
             column="36"/>
     </issue>
@@ -38342,7 +37803,7 @@
         errorLine1="      public Builder setBackground("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4507"
             column="14"/>
     </issue>
@@ -38353,7 +37814,7 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Background.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4508"
             column="11"/>
     </issue>
@@ -38364,7 +37825,7 @@
         errorLine1="      public Builder mergeBackground(androidx.wear.tiles.proto.ModifiersProto.Background value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4520"
             column="14"/>
     </issue>
@@ -38375,7 +37836,7 @@
         errorLine1="      public Builder mergeBackground(androidx.wear.tiles.proto.ModifiersProto.Background value) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4520"
             column="38"/>
     </issue>
@@ -38386,7 +37847,7 @@
         errorLine1="      public Builder clearBackground() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4532"
             column="14"/>
     </issue>
@@ -38397,7 +37858,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4541"
             column="21"/>
     </issue>
@@ -38408,7 +37869,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4542"
             column="9"/>
     </issue>
@@ -38419,7 +37880,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4543"
             column="9"/>
     </issue>
@@ -38430,7 +37891,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4543"
             column="32"/>
     </issue>
@@ -38441,7 +37902,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.Modifiers getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4605"
             column="19"/>
     </issue>
@@ -38452,7 +37913,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Modifiers> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4611"
             column="19"/>
     </issue>
@@ -38463,7 +37924,7 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Clickable getClickable();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4639"
             column="5"/>
     </issue>
@@ -38474,7 +37935,7 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Semantics getSemantics();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4660"
             column="5"/>
     </issue>
@@ -38485,7 +37946,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Clickable getClickable() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4700"
             column="12"/>
     </issue>
@@ -38496,7 +37957,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Semantics getSemantics() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4788"
             column="12"/>
     </issue>
@@ -38507,7 +37968,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4853"
             column="19"/>
     </issue>
@@ -38518,7 +37979,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4854"
             column="9"/>
     </issue>
@@ -38529,7 +37990,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4859"
             column="19"/>
     </issue>
@@ -38540,7 +38001,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4860"
             column="9"/>
     </issue>
@@ -38551,7 +38012,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4861"
             column="9"/>
     </issue>
@@ -38562,7 +38023,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4866"
             column="19"/>
     </issue>
@@ -38573,7 +38034,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4867"
             column="9"/>
     </issue>
@@ -38584,7 +38045,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4872"
             column="19"/>
     </issue>
@@ -38595,7 +38056,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4873"
             column="9"/>
     </issue>
@@ -38606,7 +38067,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4874"
             column="9"/>
     </issue>
@@ -38617,7 +38078,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4879"
             column="19"/>
     </issue>
@@ -38628,7 +38089,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom(byte[] data)"
         errorLine2="                                                                                  ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4879"
             column="83"/>
     </issue>
@@ -38639,7 +38100,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4884"
             column="19"/>
     </issue>
@@ -38650,7 +38111,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4885"
             column="9"/>
     </issue>
@@ -38661,7 +38122,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4886"
             column="9"/>
     </issue>
@@ -38672,7 +38133,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4891"
             column="19"/>
     </issue>
@@ -38683,7 +38144,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4891"
             column="83"/>
     </issue>
@@ -38694,7 +38155,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4896"
             column="19"/>
     </issue>
@@ -38705,7 +38166,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4897"
             column="9"/>
     </issue>
@@ -38716,7 +38177,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4898"
             column="9"/>
     </issue>
@@ -38727,7 +38188,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4903"
             column="19"/>
     </issue>
@@ -38738,7 +38199,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4903"
             column="92"/>
     </issue>
@@ -38749,7 +38210,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4907"
             column="19"/>
     </issue>
@@ -38760,7 +38221,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4908"
             column="9"/>
     </issue>
@@ -38771,7 +38232,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4909"
             column="9"/>
     </issue>
@@ -38782,7 +38243,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4913"
             column="19"/>
     </issue>
@@ -38793,7 +38254,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4914"
             column="9"/>
     </issue>
@@ -38804,7 +38265,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4919"
             column="19"/>
     </issue>
@@ -38815,7 +38276,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4920"
             column="9"/>
     </issue>
@@ -38826,7 +38287,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4921"
             column="9"/>
     </issue>
@@ -38837,7 +38298,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4927"
             column="19"/>
     </issue>
@@ -38848,7 +38309,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4930"
             column="19"/>
     </issue>
@@ -38859,7 +38320,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4930"
             column="38"/>
     </issue>
@@ -38870,7 +38331,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Clickable getClickable() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4974"
             column="14"/>
     </issue>
@@ -38881,7 +38342,7 @@
         errorLine1="      public Builder setClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4985"
             column="14"/>
     </issue>
@@ -38892,7 +38353,7 @@
         errorLine1="      public Builder setClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4985"
             column="35"/>
     </issue>
@@ -38903,7 +38364,7 @@
         errorLine1="      public Builder setClickable("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4998"
             column="14"/>
     </issue>
@@ -38914,7 +38375,7 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Clickable.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="4999"
             column="11"/>
     </issue>
@@ -38925,7 +38386,7 @@
         errorLine1="      public Builder mergeClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5012"
             column="14"/>
     </issue>
@@ -38936,7 +38397,7 @@
         errorLine1="      public Builder mergeClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5012"
             column="37"/>
     </issue>
@@ -38947,7 +38408,7 @@
         errorLine1="      public Builder clearClickable() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5025"
             column="14"/>
     </issue>
@@ -38958,7 +38419,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Semantics getSemantics() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5051"
             column="14"/>
     </issue>
@@ -38969,7 +38430,7 @@
         errorLine1="      public Builder setSemantics(androidx.wear.tiles.proto.ModifiersProto.Semantics value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5062"
             column="14"/>
     </issue>
@@ -38980,7 +38441,7 @@
         errorLine1="      public Builder setSemantics(androidx.wear.tiles.proto.ModifiersProto.Semantics value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5062"
             column="35"/>
     </issue>
@@ -38991,7 +38452,7 @@
         errorLine1="      public Builder setSemantics("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5075"
             column="14"/>
     </issue>
@@ -39002,7 +38463,7 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Semantics.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5076"
             column="11"/>
     </issue>
@@ -39013,7 +38474,7 @@
         errorLine1="      public Builder mergeSemantics(androidx.wear.tiles.proto.ModifiersProto.Semantics value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5089"
             column="14"/>
     </issue>
@@ -39024,7 +38485,7 @@
         errorLine1="      public Builder mergeSemantics(androidx.wear.tiles.proto.ModifiersProto.Semantics value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5089"
             column="37"/>
     </issue>
@@ -39035,7 +38496,7 @@
         errorLine1="      public Builder clearSemantics() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5102"
             column="14"/>
     </issue>
@@ -39046,7 +38507,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5111"
             column="21"/>
     </issue>
@@ -39057,7 +38518,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5112"
             column="9"/>
     </issue>
@@ -39068,7 +38529,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5113"
             column="9"/>
     </issue>
@@ -39079,7 +38540,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5113"
             column="32"/>
     </issue>
@@ -39090,7 +38551,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.ArcModifiers getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5171"
             column="19"/>
     </issue>
@@ -39101,7 +38562,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ArcModifiers> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5177"
             column="19"/>
     </issue>
@@ -39112,7 +38573,7 @@
         errorLine1="    androidx.wear.tiles.proto.ModifiersProto.Clickable getClickable();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5205"
             column="5"/>
     </issue>
@@ -39123,7 +38584,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ModifiersProto.Clickable getClickable() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5245"
             column="12"/>
     </issue>
@@ -39134,7 +38595,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5310"
             column="19"/>
     </issue>
@@ -39145,7 +38606,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5311"
             column="9"/>
     </issue>
@@ -39156,7 +38617,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5316"
             column="19"/>
     </issue>
@@ -39167,7 +38628,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5317"
             column="9"/>
     </issue>
@@ -39178,7 +38639,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5318"
             column="9"/>
     </issue>
@@ -39189,7 +38650,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5323"
             column="19"/>
     </issue>
@@ -39200,7 +38661,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5324"
             column="9"/>
     </issue>
@@ -39211,7 +38672,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5329"
             column="19"/>
     </issue>
@@ -39222,7 +38683,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5330"
             column="9"/>
     </issue>
@@ -39233,7 +38694,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5331"
             column="9"/>
     </issue>
@@ -39244,7 +38705,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5336"
             column="19"/>
     </issue>
@@ -39255,7 +38716,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom(byte[] data)"
         errorLine2="                                                                                   ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5336"
             column="84"/>
     </issue>
@@ -39266,7 +38727,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5341"
             column="19"/>
     </issue>
@@ -39277,7 +38738,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5342"
             column="9"/>
     </issue>
@@ -39288,7 +38749,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5343"
             column="9"/>
     </issue>
@@ -39299,7 +38760,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5348"
             column="19"/>
     </issue>
@@ -39310,7 +38771,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5348"
             column="84"/>
     </issue>
@@ -39321,7 +38782,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5353"
             column="19"/>
     </issue>
@@ -39332,7 +38793,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5354"
             column="9"/>
     </issue>
@@ -39343,7 +38804,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5355"
             column="9"/>
     </issue>
@@ -39354,7 +38815,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5360"
             column="19"/>
     </issue>
@@ -39365,7 +38826,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5360"
             column="93"/>
     </issue>
@@ -39376,7 +38837,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5364"
             column="19"/>
     </issue>
@@ -39387,7 +38848,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5365"
             column="9"/>
     </issue>
@@ -39398,7 +38859,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5366"
             column="9"/>
     </issue>
@@ -39409,7 +38870,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5370"
             column="19"/>
     </issue>
@@ -39420,7 +38881,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5371"
             column="9"/>
     </issue>
@@ -39431,7 +38892,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5376"
             column="19"/>
     </issue>
@@ -39442,7 +38903,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5377"
             column="9"/>
     </issue>
@@ -39453,7 +38914,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5378"
             column="9"/>
     </issue>
@@ -39464,7 +38925,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5384"
             column="19"/>
     </issue>
@@ -39475,7 +38936,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5387"
             column="19"/>
     </issue>
@@ -39486,7 +38947,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5387"
             column="38"/>
     </issue>
@@ -39497,7 +38958,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ModifiersProto.Clickable getClickable() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5431"
             column="14"/>
     </issue>
@@ -39508,7 +38969,7 @@
         errorLine1="      public Builder setClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5442"
             column="14"/>
     </issue>
@@ -39519,7 +38980,7 @@
         errorLine1="      public Builder setClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5442"
             column="35"/>
     </issue>
@@ -39530,7 +38991,7 @@
         errorLine1="      public Builder setClickable("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5455"
             column="14"/>
     </issue>
@@ -39541,7 +39002,7 @@
         errorLine1="          androidx.wear.tiles.proto.ModifiersProto.Clickable.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5456"
             column="11"/>
     </issue>
@@ -39552,7 +39013,7 @@
         errorLine1="      public Builder mergeClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5469"
             column="14"/>
     </issue>
@@ -39563,7 +39024,7 @@
         errorLine1="      public Builder mergeClickable(androidx.wear.tiles.proto.ModifiersProto.Clickable value) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5469"
             column="37"/>
     </issue>
@@ -39574,7 +39035,7 @@
         errorLine1="      public Builder clearClickable() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5482"
             column="14"/>
     </issue>
@@ -39585,7 +39046,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5491"
             column="21"/>
     </issue>
@@ -39596,7 +39057,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5492"
             column="9"/>
     </issue>
@@ -39607,7 +39068,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5493"
             column="9"/>
     </issue>
@@ -39618,7 +39079,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5493"
             column="32"/>
     </issue>
@@ -39629,7 +39090,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ModifiersProto.SpanModifiers getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5550"
             column="19"/>
     </issue>
@@ -39640,7 +39101,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;SpanModifiers> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ModifiersProto.java"
             line="5556"
             column="19"/>
     </issue>
@@ -39651,7 +39112,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -39659,33 +39120,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    @java.lang.Deprecated java.lang.String getClickableId();"
-        errorLine2="                          ~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="25"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    @java.lang.Deprecated com.google.protobuf.ByteString"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="36"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters getDeviceParameters();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="56"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="32"
             column="5"/>
     </issue>
 
@@ -39695,41 +39134,19 @@
         errorLine1="    androidx.wear.tiles.proto.StateProto.State getState();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="75"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="51"
             column="5"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    @java.lang.Deprecated public java.lang.String getClickableId() {"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="106"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    @java.lang.Deprecated public com.google.protobuf.ByteString"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="120"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters getDeviceParameters() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="196"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="89"
             column="12"/>
     </issue>
 
@@ -39739,8 +39156,8 @@
         errorLine1="    public androidx.wear.tiles.proto.StateProto.State getState() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="278"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="171"
             column="12"/>
     </issue>
 
@@ -39750,8 +39167,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="339"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="232"
             column="19"/>
     </issue>
 
@@ -39761,8 +39178,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="340"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="233"
             column="9"/>
     </issue>
 
@@ -39772,8 +39189,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="345"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="238"
             column="19"/>
     </issue>
 
@@ -39783,8 +39200,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="346"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="239"
             column="9"/>
     </issue>
 
@@ -39794,8 +39211,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="347"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="240"
             column="9"/>
     </issue>
 
@@ -39805,8 +39222,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="352"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="245"
             column="19"/>
     </issue>
 
@@ -39816,8 +39233,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="353"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="246"
             column="9"/>
     </issue>
 
@@ -39827,8 +39244,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="358"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="251"
             column="19"/>
     </issue>
 
@@ -39838,8 +39255,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="359"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="252"
             column="9"/>
     </issue>
 
@@ -39849,8 +39266,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="360"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="253"
             column="9"/>
     </issue>
 
@@ -39860,8 +39277,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="365"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="258"
             column="19"/>
     </issue>
 
@@ -39871,8 +39288,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom(byte[] data)"
         errorLine2="                                                                               ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="365"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="258"
             column="80"/>
     </issue>
 
@@ -39882,8 +39299,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="370"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="263"
             column="19"/>
     </issue>
 
@@ -39893,8 +39310,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="371"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="264"
             column="9"/>
     </issue>
 
@@ -39904,8 +39321,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="372"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="265"
             column="9"/>
     </issue>
 
@@ -39915,8 +39332,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="377"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="270"
             column="19"/>
     </issue>
 
@@ -39926,8 +39343,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom(java.io.InputStream input)"
         errorLine2="                                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="377"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="270"
             column="80"/>
     </issue>
 
@@ -39937,8 +39354,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="382"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="275"
             column="19"/>
     </issue>
 
@@ -39948,8 +39365,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="383"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="276"
             column="9"/>
     </issue>
 
@@ -39959,8 +39376,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="384"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="277"
             column="9"/>
     </issue>
 
@@ -39970,8 +39387,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="389"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="282"
             column="19"/>
     </issue>
 
@@ -39981,8 +39398,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="389"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="282"
             column="89"/>
     </issue>
 
@@ -39992,8 +39409,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="393"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="286"
             column="19"/>
     </issue>
 
@@ -40003,8 +39420,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="394"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="287"
             column="9"/>
     </issue>
 
@@ -40014,8 +39431,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="395"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="288"
             column="9"/>
     </issue>
 
@@ -40025,8 +39442,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="399"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="292"
             column="19"/>
     </issue>
 
@@ -40036,8 +39453,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="400"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="293"
             column="9"/>
     </issue>
 
@@ -40047,8 +39464,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="405"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="298"
             column="19"/>
     </issue>
 
@@ -40058,8 +39475,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="406"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="299"
             column="9"/>
     </issue>
 
@@ -40069,8 +39486,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="407"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="300"
             column="9"/>
     </issue>
 
@@ -40080,8 +39497,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="413"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="306"
             column="19"/>
     </issue>
 
@@ -40091,8 +39508,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.RequestProto.TileRequest prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="416"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="309"
             column="19"/>
     </issue>
 
@@ -40102,96 +39519,19 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.RequestProto.TileRequest prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="416"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="309"
             column="38"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      @java.lang.Deprecated public java.lang.String getClickableId() {"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="450"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      @java.lang.Deprecated public com.google.protobuf.ByteString"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="464"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      @java.lang.Deprecated public Builder setClickableId("
-        errorLine2="                                   ~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="479"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="          java.lang.String value) {"
-        errorLine2="          ~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="480"
-            column="11"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      @java.lang.Deprecated public Builder clearClickableId() {"
-        errorLine2="                                   ~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="495"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      @java.lang.Deprecated public Builder setClickableIdBytes("
-        errorLine2="                                   ~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="511"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="          com.google.protobuf.ByteString value) {"
-        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="512"
-            column="11"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="      public androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters getDeviceParameters() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="537"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="351"
             column="14"/>
     </issue>
 
@@ -40201,8 +39541,8 @@
         errorLine1="      public Builder setDeviceParameters(androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="547"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="361"
             column="14"/>
     </issue>
 
@@ -40212,8 +39552,8 @@
         errorLine1="      public Builder setDeviceParameters(androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters value) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="547"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="361"
             column="42"/>
     </issue>
 
@@ -40223,8 +39563,8 @@
         errorLine1="      public Builder setDeviceParameters("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="559"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="373"
             column="14"/>
     </issue>
 
@@ -40234,8 +39574,8 @@
         errorLine1="          androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="560"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="374"
             column="11"/>
     </issue>
 
@@ -40245,8 +39585,8 @@
         errorLine1="      public Builder mergeDeviceParameters(androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="572"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="386"
             column="14"/>
     </issue>
 
@@ -40256,8 +39596,8 @@
         errorLine1="      public Builder mergeDeviceParameters(androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters value) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="572"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="386"
             column="44"/>
     </issue>
 
@@ -40267,8 +39607,8 @@
         errorLine1="      public Builder clearDeviceParameters() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="584"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="398"
             column="14"/>
     </issue>
 
@@ -40278,8 +39618,8 @@
         errorLine1="      public androidx.wear.tiles.proto.StateProto.State getState() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="608"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="422"
             column="14"/>
     </issue>
 
@@ -40289,8 +39629,8 @@
         errorLine1="      public Builder setState(androidx.wear.tiles.proto.StateProto.State value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="618"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="432"
             column="14"/>
     </issue>
 
@@ -40300,8 +39640,8 @@
         errorLine1="      public Builder setState(androidx.wear.tiles.proto.StateProto.State value) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="618"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="432"
             column="31"/>
     </issue>
 
@@ -40311,8 +39651,8 @@
         errorLine1="      public Builder setState("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="630"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="444"
             column="14"/>
     </issue>
 
@@ -40322,8 +39662,8 @@
         errorLine1="          androidx.wear.tiles.proto.StateProto.State.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="631"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="445"
             column="11"/>
     </issue>
 
@@ -40333,8 +39673,8 @@
         errorLine1="      public Builder mergeState(androidx.wear.tiles.proto.StateProto.State value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="643"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="457"
             column="14"/>
     </issue>
 
@@ -40344,8 +39684,8 @@
         errorLine1="      public Builder mergeState(androidx.wear.tiles.proto.StateProto.State value) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="643"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="457"
             column="33"/>
     </issue>
 
@@ -40355,8 +39695,8 @@
         errorLine1="      public Builder clearState() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="655"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="469"
             column="14"/>
     </issue>
 
@@ -40366,8 +39706,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="664"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="478"
             column="21"/>
     </issue>
 
@@ -40377,8 +39717,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="665"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="479"
             column="9"/>
     </issue>
 
@@ -40388,8 +39728,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="666"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="480"
             column="9"/>
     </issue>
 
@@ -40399,8 +39739,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="666"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="480"
             column="32"/>
     </issue>
 
@@ -40410,8 +39750,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.TileRequest getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="726"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="538"
             column="19"/>
     </issue>
 
@@ -40421,8 +39761,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;TileRequest> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="732"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="544"
             column="19"/>
     </issue>
 
@@ -40432,8 +39772,8 @@
         errorLine1="    java.lang.String getVersion();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="749"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="561"
             column="5"/>
     </issue>
 
@@ -40443,8 +39783,8 @@
         errorLine1="    com.google.protobuf.ByteString"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="758"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="570"
             column="5"/>
     </issue>
 
@@ -40454,8 +39794,8 @@
         errorLine1="    java.util.List&lt;java.lang.String>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="770"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="582"
             column="5"/>
     </issue>
 
@@ -40465,8 +39805,8 @@
         errorLine1="    java.lang.String getResourceIds(int index);"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="792"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="604"
             column="5"/>
     </issue>
 
@@ -40476,8 +39816,8 @@
         errorLine1="    com.google.protobuf.ByteString"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="803"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="615"
             column="5"/>
     </issue>
 
@@ -40487,8 +39827,8 @@
         errorLine1="    androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters getDeviceParameters();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="823"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="635"
             column="5"/>
     </issue>
 
@@ -40498,8 +39838,8 @@
         errorLine1="    public java.lang.String getVersion() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="853"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="665"
             column="12"/>
     </issue>
 
@@ -40509,8 +39849,8 @@
         errorLine1="    public com.google.protobuf.ByteString"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="865"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="677"
             column="12"/>
     </issue>
 
@@ -40520,8 +39860,8 @@
         errorLine1="    public java.util.List&lt;java.lang.String> getResourceIdsList() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="926"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="738"
             column="12"/>
     </issue>
 
@@ -40531,8 +39871,8 @@
         errorLine1="    public java.lang.String getResourceIds(int index) {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="953"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="765"
             column="12"/>
     </issue>
 
@@ -40542,8 +39882,8 @@
         errorLine1="    public com.google.protobuf.ByteString"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="967"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="779"
             column="12"/>
     </issue>
 
@@ -40553,8 +39893,8 @@
         errorLine1="    public androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters getDeviceParameters() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1079"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="891"
             column="12"/>
     </issue>
 
@@ -40564,8 +39904,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1140"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="952"
             column="19"/>
     </issue>
 
@@ -40575,8 +39915,8 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1141"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="953"
             column="9"/>
     </issue>
 
@@ -40586,8 +39926,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1146"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="958"
             column="19"/>
     </issue>
 
@@ -40597,8 +39937,8 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1147"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="959"
             column="9"/>
     </issue>
 
@@ -40608,8 +39948,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1148"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="960"
             column="9"/>
     </issue>
 
@@ -40619,8 +39959,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1153"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="965"
             column="19"/>
     </issue>
 
@@ -40630,8 +39970,8 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1154"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="966"
             column="9"/>
     </issue>
 
@@ -40641,8 +39981,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1159"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="971"
             column="19"/>
     </issue>
 
@@ -40652,8 +39992,8 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1160"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="972"
             column="9"/>
     </issue>
 
@@ -40663,8 +40003,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1161"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="973"
             column="9"/>
     </issue>
 
@@ -40674,8 +40014,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1166"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="978"
             column="19"/>
     </issue>
 
@@ -40685,8 +40025,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom(byte[] data)"
         errorLine2="                                                                                    ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1166"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="978"
             column="85"/>
     </issue>
 
@@ -40696,8 +40036,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1171"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="983"
             column="19"/>
     </issue>
 
@@ -40707,8 +40047,8 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1172"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="984"
             column="9"/>
     </issue>
 
@@ -40718,8 +40058,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1173"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="985"
             column="9"/>
     </issue>
 
@@ -40729,8 +40069,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1178"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="990"
             column="19"/>
     </issue>
 
@@ -40740,8 +40080,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1178"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="990"
             column="85"/>
     </issue>
 
@@ -40751,8 +40091,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1183"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="995"
             column="19"/>
     </issue>
 
@@ -40762,8 +40102,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1184"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="996"
             column="9"/>
     </issue>
 
@@ -40773,8 +40113,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1185"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="997"
             column="9"/>
     </issue>
 
@@ -40784,8 +40124,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1190"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1002"
             column="19"/>
     </issue>
 
@@ -40795,8 +40135,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1190"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1002"
             column="94"/>
     </issue>
 
@@ -40806,8 +40146,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1194"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1006"
             column="19"/>
     </issue>
 
@@ -40817,8 +40157,8 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1195"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1007"
             column="9"/>
     </issue>
 
@@ -40828,8 +40168,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1196"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1008"
             column="9"/>
     </issue>
 
@@ -40839,8 +40179,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1200"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1012"
             column="19"/>
     </issue>
 
@@ -40850,8 +40190,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1201"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1013"
             column="9"/>
     </issue>
 
@@ -40861,8 +40201,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1206"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1018"
             column="19"/>
     </issue>
 
@@ -40872,8 +40212,8 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1207"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1019"
             column="9"/>
     </issue>
 
@@ -40883,8 +40223,8 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1208"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1020"
             column="9"/>
     </issue>
 
@@ -40894,8 +40234,8 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1214"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1026"
             column="19"/>
     </issue>
 
@@ -40905,8 +40245,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.RequestProto.ResourcesRequest prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1217"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1029"
             column="19"/>
     </issue>
 
@@ -40916,8 +40256,8 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.RequestProto.ResourcesRequest prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1217"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1029"
             column="38"/>
     </issue>
 
@@ -40927,8 +40267,8 @@
         errorLine1="      public java.lang.String getVersion() {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1249"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1061"
             column="14"/>
     </issue>
 
@@ -40938,8 +40278,8 @@
         errorLine1="      public com.google.protobuf.ByteString"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1261"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1073"
             column="14"/>
     </issue>
 
@@ -40949,8 +40289,8 @@
         errorLine1="      public Builder setVersion("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1274"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1086"
             column="14"/>
     </issue>
 
@@ -40960,8 +40300,8 @@
         errorLine1="          java.lang.String value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1275"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1087"
             column="11"/>
     </issue>
 
@@ -40971,8 +40311,8 @@
         errorLine1="      public Builder clearVersion() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1288"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1100"
             column="14"/>
     </issue>
 
@@ -40982,8 +40322,8 @@
         errorLine1="      public Builder setVersionBytes("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1302"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1114"
             column="14"/>
     </issue>
 
@@ -40993,8 +40333,8 @@
         errorLine1="          com.google.protobuf.ByteString value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1303"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1115"
             column="11"/>
     </issue>
 
@@ -41004,8 +40344,8 @@
         errorLine1="      public java.util.List&lt;java.lang.String>"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1319"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1131"
             column="14"/>
     </issue>
 
@@ -41015,8 +40355,8 @@
         errorLine1="      public java.lang.String getResourceIds(int index) {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1348"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1160"
             column="14"/>
     </issue>
 
@@ -41026,8 +40366,8 @@
         errorLine1="      public com.google.protobuf.ByteString"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1362"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1174"
             column="14"/>
     </issue>
 
@@ -41037,8 +40377,8 @@
         errorLine1="      public Builder setResourceIds("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1377"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1189"
             column="14"/>
     </issue>
 
@@ -41048,8 +40388,8 @@
         errorLine1="          int index, java.lang.String value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1378"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1190"
             column="22"/>
     </issue>
 
@@ -41059,8 +40399,8 @@
         errorLine1="      public Builder addResourceIds("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1393"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1205"
             column="14"/>
     </issue>
 
@@ -41070,8 +40410,8 @@
         errorLine1="          java.lang.String value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1394"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1206"
             column="11"/>
     </issue>
 
@@ -41081,8 +40421,8 @@
         errorLine1="      public Builder addAllResourceIds("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1409"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1221"
             column="14"/>
     </issue>
 
@@ -41092,8 +40432,8 @@
         errorLine1="          java.lang.Iterable&lt;java.lang.String> values) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1410"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1222"
             column="11"/>
     </issue>
 
@@ -41103,8 +40443,8 @@
         errorLine1="      public Builder clearResourceIds() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1424"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1236"
             column="14"/>
     </issue>
 
@@ -41114,8 +40454,8 @@
         errorLine1="      public Builder addResourceIdsBytes("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1439"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1251"
             column="14"/>
     </issue>
 
@@ -41125,8 +40465,8 @@
         errorLine1="          com.google.protobuf.ByteString value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1440"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1252"
             column="11"/>
     </issue>
 
@@ -41136,8 +40476,8 @@
         errorLine1="      public androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters getDeviceParameters() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1465"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1277"
             column="14"/>
     </issue>
 
@@ -41147,8 +40487,8 @@
         errorLine1="      public Builder setDeviceParameters(androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1475"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1287"
             column="14"/>
     </issue>
 
@@ -41158,8 +40498,8 @@
         errorLine1="      public Builder setDeviceParameters(androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters value) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1475"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1287"
             column="42"/>
     </issue>
 
@@ -41169,8 +40509,8 @@
         errorLine1="      public Builder setDeviceParameters("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1487"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1299"
             column="14"/>
     </issue>
 
@@ -41180,8 +40520,8 @@
         errorLine1="          androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1488"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1300"
             column="11"/>
     </issue>
 
@@ -41191,8 +40531,8 @@
         errorLine1="      public Builder mergeDeviceParameters(androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1500"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1312"
             column="14"/>
     </issue>
 
@@ -41202,8 +40542,8 @@
         errorLine1="      public Builder mergeDeviceParameters(androidx.wear.tiles.proto.DeviceParametersProto.DeviceParameters value) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1500"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1312"
             column="44"/>
     </issue>
 
@@ -41213,8 +40553,8 @@
         errorLine1="      public Builder clearDeviceParameters() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1512"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1324"
             column="14"/>
     </issue>
 
@@ -41224,8 +40564,8 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1521"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1333"
             column="21"/>
     </issue>
 
@@ -41235,8 +40575,8 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1522"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1334"
             column="9"/>
     </issue>
 
@@ -41246,8 +40586,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1523"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1335"
             column="9"/>
     </issue>
 
@@ -41257,8 +40597,8 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1523"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1335"
             column="32"/>
     </issue>
 
@@ -41268,8 +40608,8 @@
         errorLine1="    public static androidx.wear.tiles.proto.RequestProto.ResourcesRequest getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1583"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1395"
             column="19"/>
     </issue>
 
@@ -41279,8 +40619,8 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ResourcesRequest> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
-            line="1589"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/RequestProto.java"
+            line="1401"
             column="19"/>
     </issue>
 
@@ -41290,7 +40630,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -41301,7 +40641,7 @@
         errorLine1="    public static ImageFormat valueOf(int value) {"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="74"
             column="19"/>
     </issue>
@@ -41312,7 +40652,7 @@
         errorLine1="    public static ImageFormat forNumber(int value) {"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="78"
             column="19"/>
     </issue>
@@ -41323,7 +40663,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumLiteMap&lt;ImageFormat>"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="86"
             column="19"/>
     </issue>
@@ -41334,7 +40674,7 @@
         errorLine1="    public static com.google.protobuf.Internal.EnumVerifier "
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="99"
             column="19"/>
     </issue>
@@ -41345,7 +40685,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="192"
             column="19"/>
     </issue>
@@ -41356,7 +40696,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="193"
             column="9"/>
     </issue>
@@ -41367,7 +40707,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="198"
             column="19"/>
     </issue>
@@ -41378,7 +40718,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="199"
             column="9"/>
     </issue>
@@ -41389,7 +40729,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="200"
             column="9"/>
     </issue>
@@ -41400,7 +40740,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="205"
             column="19"/>
     </issue>
@@ -41411,7 +40751,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="206"
             column="9"/>
     </issue>
@@ -41422,7 +40762,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="211"
             column="19"/>
     </issue>
@@ -41433,7 +40773,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="212"
             column="9"/>
     </issue>
@@ -41444,7 +40784,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="213"
             column="9"/>
     </issue>
@@ -41455,7 +40795,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="218"
             column="19"/>
     </issue>
@@ -41466,7 +40806,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom(byte[] data)"
         errorLine2="                                                                                                ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="218"
             column="97"/>
     </issue>
@@ -41477,7 +40817,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="223"
             column="19"/>
     </issue>
@@ -41488,7 +40828,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="224"
             column="9"/>
     </issue>
@@ -41499,7 +40839,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="225"
             column="9"/>
     </issue>
@@ -41510,7 +40850,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="230"
             column="19"/>
     </issue>
@@ -41521,7 +40861,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="230"
             column="97"/>
     </issue>
@@ -41532,7 +40872,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="235"
             column="19"/>
     </issue>
@@ -41543,7 +40883,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="236"
             column="9"/>
     </issue>
@@ -41554,7 +40894,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="237"
             column="9"/>
     </issue>
@@ -41565,7 +40905,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="242"
             column="19"/>
     </issue>
@@ -41576,7 +40916,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="242"
             column="106"/>
     </issue>
@@ -41587,7 +40927,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="246"
             column="19"/>
     </issue>
@@ -41598,7 +40938,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="247"
             column="9"/>
     </issue>
@@ -41609,7 +40949,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="248"
             column="9"/>
     </issue>
@@ -41620,7 +40960,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="252"
             column="19"/>
     </issue>
@@ -41631,7 +40971,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="253"
             column="9"/>
     </issue>
@@ -41642,7 +40982,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="258"
             column="19"/>
     </issue>
@@ -41653,7 +40993,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="259"
             column="9"/>
     </issue>
@@ -41664,7 +41004,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="260"
             column="9"/>
     </issue>
@@ -41675,7 +41015,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="266"
             column="19"/>
     </issue>
@@ -41686,7 +41026,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="269"
             column="19"/>
     </issue>
@@ -41697,7 +41037,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="269"
             column="38"/>
     </issue>
@@ -41708,7 +41048,7 @@
         errorLine1="      public Builder setResourceId(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="314"
             column="14"/>
     </issue>
@@ -41719,7 +41059,7 @@
         errorLine1="      public Builder clearResourceId() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="328"
             column="14"/>
     </issue>
@@ -41730,7 +41070,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="338"
             column="21"/>
     </issue>
@@ -41741,7 +41081,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="339"
             column="9"/>
     </issue>
@@ -41752,7 +41092,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="340"
             column="9"/>
     </issue>
@@ -41763,7 +41103,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="340"
             column="32"/>
     </issue>
@@ -41774,7 +41114,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="397"
             column="19"/>
     </issue>
@@ -41785,7 +41125,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;AndroidImageResourceByResId> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="403"
             column="19"/>
     </issue>
@@ -41796,7 +41136,7 @@
         errorLine1="    com.google.protobuf.ByteString getData();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="420"
             column="5"/>
     </issue>
@@ -41807,7 +41147,7 @@
         errorLine1="    androidx.wear.tiles.proto.ResourceProto.ImageFormat getFormat();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="467"
             column="5"/>
     </issue>
@@ -41818,7 +41158,7 @@
         errorLine1="    public com.google.protobuf.ByteString getData() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="496"
             column="12"/>
     </issue>
@@ -41829,7 +41169,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ResourceProto.ImageFormat getFormat() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="637"
             column="12"/>
     </issue>
@@ -41840,7 +41180,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="688"
             column="19"/>
     </issue>
@@ -41851,7 +41191,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="689"
             column="9"/>
     </issue>
@@ -41862,7 +41202,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="694"
             column="19"/>
     </issue>
@@ -41873,7 +41213,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="695"
             column="9"/>
     </issue>
@@ -41884,7 +41224,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="696"
             column="9"/>
     </issue>
@@ -41895,7 +41235,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="701"
             column="19"/>
     </issue>
@@ -41906,7 +41246,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="702"
             column="9"/>
     </issue>
@@ -41917,7 +41257,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="707"
             column="19"/>
     </issue>
@@ -41928,7 +41268,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="708"
             column="9"/>
     </issue>
@@ -41939,7 +41279,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="709"
             column="9"/>
     </issue>
@@ -41950,7 +41290,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="714"
             column="19"/>
     </issue>
@@ -41961,7 +41301,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom(byte[] data)"
         errorLine2="                                                                                        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="714"
             column="89"/>
     </issue>
@@ -41972,7 +41312,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="719"
             column="19"/>
     </issue>
@@ -41983,7 +41323,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="720"
             column="9"/>
     </issue>
@@ -41994,7 +41334,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="721"
             column="9"/>
     </issue>
@@ -42005,7 +41345,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="726"
             column="19"/>
     </issue>
@@ -42016,7 +41356,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="726"
             column="89"/>
     </issue>
@@ -42027,7 +41367,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="731"
             column="19"/>
     </issue>
@@ -42038,7 +41378,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="732"
             column="9"/>
     </issue>
@@ -42049,7 +41389,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="733"
             column="9"/>
     </issue>
@@ -42060,7 +41400,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="738"
             column="19"/>
     </issue>
@@ -42071,7 +41411,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="738"
             column="98"/>
     </issue>
@@ -42082,7 +41422,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="742"
             column="19"/>
     </issue>
@@ -42093,7 +41433,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="743"
             column="9"/>
     </issue>
@@ -42104,7 +41444,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="744"
             column="9"/>
     </issue>
@@ -42115,7 +41455,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="748"
             column="19"/>
     </issue>
@@ -42126,7 +41466,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="749"
             column="9"/>
     </issue>
@@ -42137,7 +41477,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="754"
             column="19"/>
     </issue>
@@ -42148,7 +41488,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="755"
             column="9"/>
     </issue>
@@ -42159,7 +41499,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="756"
             column="9"/>
     </issue>
@@ -42170,7 +41510,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="762"
             column="19"/>
     </issue>
@@ -42181,7 +41521,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ResourceProto.InlineImageResource prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="765"
             column="19"/>
     </issue>
@@ -42192,7 +41532,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ResourceProto.InlineImageResource prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="765"
             column="38"/>
     </issue>
@@ -42203,7 +41543,7 @@
         errorLine1="      public com.google.protobuf.ByteString getData() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="797"
             column="14"/>
     </issue>
@@ -42214,7 +41554,7 @@
         errorLine1="      public Builder setData(com.google.protobuf.ByteString value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="809"
             column="14"/>
     </issue>
@@ -42225,7 +41565,7 @@
         errorLine1="      public Builder setData(com.google.protobuf.ByteString value) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="809"
             column="30"/>
     </issue>
@@ -42236,7 +41576,7 @@
         errorLine1="      public Builder clearData() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="822"
             column="14"/>
     </issue>
@@ -42247,7 +41587,7 @@
         errorLine1="      public Builder setWidthPx(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="851"
             column="14"/>
     </issue>
@@ -42258,7 +41598,7 @@
         errorLine1="      public Builder clearWidthPx() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="865"
             column="14"/>
     </issue>
@@ -42269,7 +41609,7 @@
         errorLine1="      public Builder setHeightPx(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="894"
             column="14"/>
     </issue>
@@ -42280,7 +41620,7 @@
         errorLine1="      public Builder clearHeightPx() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="908"
             column="14"/>
     </issue>
@@ -42291,7 +41631,7 @@
         errorLine1="      public Builder setFormatValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="941"
             column="14"/>
     </issue>
@@ -42302,7 +41642,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ResourceProto.ImageFormat getFormat() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="958"
             column="14"/>
     </issue>
@@ -42313,7 +41653,7 @@
         errorLine1="      public Builder setFormat(androidx.wear.tiles.proto.ResourceProto.ImageFormat value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="973"
             column="14"/>
     </issue>
@@ -42324,7 +41664,7 @@
         errorLine1="      public Builder setFormat(androidx.wear.tiles.proto.ResourceProto.ImageFormat value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="973"
             column="32"/>
     </issue>
@@ -42335,7 +41675,7 @@
         errorLine1="      public Builder clearFormat() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="989"
             column="14"/>
     </issue>
@@ -42346,7 +41686,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="999"
             column="21"/>
     </issue>
@@ -42357,7 +41697,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1000"
             column="9"/>
     </issue>
@@ -42368,7 +41708,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1001"
             column="9"/>
     </issue>
@@ -42379,7 +41719,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1001"
             column="32"/>
     </issue>
@@ -42390,7 +41730,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.InlineImageResource getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1062"
             column="19"/>
     </issue>
@@ -42401,7 +41741,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;InlineImageResource> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1068"
             column="19"/>
     </issue>
@@ -42412,7 +41752,7 @@
         errorLine1="    androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId getAndroidResourceByResid();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1094"
             column="5"/>
     </issue>
@@ -42423,7 +41763,7 @@
         errorLine1="    androidx.wear.tiles.proto.ResourceProto.InlineImageResource getInlineResource();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1113"
             column="5"/>
     </issue>
@@ -42434,7 +41774,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId getAndroidResourceByResid() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1152"
             column="12"/>
     </issue>
@@ -42445,7 +41785,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ResourceProto.InlineImageResource getInlineResource() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1234"
             column="12"/>
     </issue>
@@ -42456,7 +41796,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1295"
             column="19"/>
     </issue>
@@ -42467,7 +41807,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1296"
             column="9"/>
     </issue>
@@ -42478,7 +41818,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1301"
             column="19"/>
     </issue>
@@ -42489,7 +41829,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1302"
             column="9"/>
     </issue>
@@ -42500,7 +41840,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1303"
             column="9"/>
     </issue>
@@ -42511,7 +41851,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1308"
             column="19"/>
     </issue>
@@ -42522,7 +41862,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1309"
             column="9"/>
     </issue>
@@ -42533,7 +41873,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1314"
             column="19"/>
     </issue>
@@ -42544,7 +41884,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1315"
             column="9"/>
     </issue>
@@ -42555,7 +41895,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1316"
             column="9"/>
     </issue>
@@ -42566,7 +41906,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1321"
             column="19"/>
     </issue>
@@ -42577,7 +41917,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom(byte[] data)"
         errorLine2="                                                                                  ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1321"
             column="83"/>
     </issue>
@@ -42588,7 +41928,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1326"
             column="19"/>
     </issue>
@@ -42599,7 +41939,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1327"
             column="9"/>
     </issue>
@@ -42610,7 +41950,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1328"
             column="9"/>
     </issue>
@@ -42621,7 +41961,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1333"
             column="19"/>
     </issue>
@@ -42632,7 +41972,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1333"
             column="83"/>
     </issue>
@@ -42643,7 +41983,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1338"
             column="19"/>
     </issue>
@@ -42654,7 +41994,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1339"
             column="9"/>
     </issue>
@@ -42665,7 +42005,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1340"
             column="9"/>
     </issue>
@@ -42676,7 +42016,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1345"
             column="19"/>
     </issue>
@@ -42687,7 +42027,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1345"
             column="92"/>
     </issue>
@@ -42698,7 +42038,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1349"
             column="19"/>
     </issue>
@@ -42709,7 +42049,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1350"
             column="9"/>
     </issue>
@@ -42720,7 +42060,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1351"
             column="9"/>
     </issue>
@@ -42731,7 +42071,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1355"
             column="19"/>
     </issue>
@@ -42742,7 +42082,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1356"
             column="9"/>
     </issue>
@@ -42753,7 +42093,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1361"
             column="19"/>
     </issue>
@@ -42764,7 +42104,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1362"
             column="9"/>
     </issue>
@@ -42775,7 +42115,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1363"
             column="9"/>
     </issue>
@@ -42786,7 +42126,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1369"
             column="19"/>
     </issue>
@@ -42797,7 +42137,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ResourceProto.ImageResource prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1372"
             column="19"/>
     </issue>
@@ -42808,7 +42148,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ResourceProto.ImageResource prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1372"
             column="38"/>
     </issue>
@@ -42819,7 +42159,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId getAndroidResourceByResid() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1415"
             column="14"/>
     </issue>
@@ -42830,7 +42170,7 @@
         errorLine1="      public Builder setAndroidResourceByResid(androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1425"
             column="14"/>
     </issue>
@@ -42841,7 +42181,7 @@
         errorLine1="      public Builder setAndroidResourceByResid(androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId value) {"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1425"
             column="48"/>
     </issue>
@@ -42852,7 +42192,7 @@
         errorLine1="      public Builder setAndroidResourceByResid("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1437"
             column="14"/>
     </issue>
@@ -42863,7 +42203,7 @@
         errorLine1="          androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1438"
             column="11"/>
     </issue>
@@ -42874,7 +42214,7 @@
         errorLine1="      public Builder mergeAndroidResourceByResid(androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1450"
             column="14"/>
     </issue>
@@ -42885,7 +42225,7 @@
         errorLine1="      public Builder mergeAndroidResourceByResid(androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId value) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1450"
             column="50"/>
     </issue>
@@ -42896,7 +42236,7 @@
         errorLine1="      public Builder clearAndroidResourceByResid() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1462"
             column="14"/>
     </issue>
@@ -42907,7 +42247,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ResourceProto.InlineImageResource getInlineResource() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1486"
             column="14"/>
     </issue>
@@ -42918,7 +42258,7 @@
         errorLine1="      public Builder setInlineResource(androidx.wear.tiles.proto.ResourceProto.InlineImageResource value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1496"
             column="14"/>
     </issue>
@@ -42929,7 +42269,7 @@
         errorLine1="      public Builder setInlineResource(androidx.wear.tiles.proto.ResourceProto.InlineImageResource value) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1496"
             column="40"/>
     </issue>
@@ -42940,7 +42280,7 @@
         errorLine1="      public Builder setInlineResource("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1508"
             column="14"/>
     </issue>
@@ -42951,7 +42291,7 @@
         errorLine1="          androidx.wear.tiles.proto.ResourceProto.InlineImageResource.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1509"
             column="11"/>
     </issue>
@@ -42962,7 +42302,7 @@
         errorLine1="      public Builder mergeInlineResource(androidx.wear.tiles.proto.ResourceProto.InlineImageResource value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1521"
             column="14"/>
     </issue>
@@ -42973,7 +42313,7 @@
         errorLine1="      public Builder mergeInlineResource(androidx.wear.tiles.proto.ResourceProto.InlineImageResource value) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1521"
             column="42"/>
     </issue>
@@ -42984,7 +42324,7 @@
         errorLine1="      public Builder clearInlineResource() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1533"
             column="14"/>
     </issue>
@@ -42995,7 +42335,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1542"
             column="21"/>
     </issue>
@@ -43006,7 +42346,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1543"
             column="9"/>
     </issue>
@@ -43017,7 +42357,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1544"
             column="9"/>
     </issue>
@@ -43028,7 +42368,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1544"
             column="32"/>
     </issue>
@@ -43039,7 +42379,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.ImageResource getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1602"
             column="19"/>
     </issue>
@@ -43050,7 +42390,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;ImageResource> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1608"
             column="19"/>
     </issue>
@@ -43061,7 +42401,7 @@
         errorLine1="    java.lang.String getVersion();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1630"
             column="5"/>
     </issue>
@@ -43072,7 +42412,7 @@
         errorLine1="    com.google.protobuf.ByteString"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1644"
             column="5"/>
     </issue>
@@ -43083,7 +42423,7 @@
         errorLine1="        java.lang.String key);"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1663"
             column="9"/>
     </issue>
@@ -43094,7 +42434,7 @@
         errorLine1="    java.util.Map&lt;java.lang.String, androidx.wear.tiles.proto.ResourceProto.ImageResource>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1668"
             column="5"/>
     </issue>
@@ -43105,7 +42445,7 @@
         errorLine1="    java.util.Map&lt;java.lang.String, androidx.wear.tiles.proto.ResourceProto.ImageResource>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1677"
             column="5"/>
     </issue>
@@ -43116,7 +42456,7 @@
         errorLine1="    androidx.wear.tiles.proto.ResourceProto.ImageResource getIdToImageOrDefault("
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1687"
             column="5"/>
     </issue>
@@ -43127,7 +42467,7 @@
         errorLine1="        java.lang.String key,"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1688"
             column="9"/>
     </issue>
@@ -43138,7 +42478,7 @@
         errorLine1="        androidx.wear.tiles.proto.ResourceProto.ImageResource defaultValue);"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1689"
             column="9"/>
     </issue>
@@ -43149,7 +42489,7 @@
         errorLine1="    androidx.wear.tiles.proto.ResourceProto.ImageResource getIdToImageOrThrow("
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1698"
             column="5"/>
     </issue>
@@ -43160,7 +42500,7 @@
         errorLine1="        java.lang.String key);"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1699"
             column="9"/>
     </issue>
@@ -43171,7 +42511,7 @@
         errorLine1="    public java.lang.String getVersion() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1732"
             column="12"/>
     </issue>
@@ -43182,7 +42522,7 @@
         errorLine1="    public com.google.protobuf.ByteString"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1749"
             column="12"/>
     </issue>
@@ -43193,7 +42533,7 @@
         errorLine1="        java.lang.String key) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1853"
             column="9"/>
     </issue>
@@ -43204,7 +42544,7 @@
         errorLine1="    public java.util.Map&lt;java.lang.String, androidx.wear.tiles.proto.ResourceProto.ImageResource> getIdToImage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1862"
             column="12"/>
     </issue>
@@ -43215,7 +42555,7 @@
         errorLine1="    public java.util.Map&lt;java.lang.String, androidx.wear.tiles.proto.ResourceProto.ImageResource> getIdToImageMap() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1874"
             column="12"/>
     </issue>
@@ -43226,7 +42566,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ResourceProto.ImageResource getIdToImageOrDefault("
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1887"
             column="12"/>
     </issue>
@@ -43237,7 +42577,7 @@
         errorLine1="        java.lang.String key,"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1888"
             column="9"/>
     </issue>
@@ -43248,7 +42588,7 @@
         errorLine1="        androidx.wear.tiles.proto.ResourceProto.ImageResource defaultValue) {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1889"
             column="9"/>
     </issue>
@@ -43259,7 +42599,7 @@
         errorLine1="    public androidx.wear.tiles.proto.ResourceProto.ImageResource getIdToImageOrThrow("
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1904"
             column="12"/>
     </issue>
@@ -43270,7 +42610,7 @@
         errorLine1="        java.lang.String key) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1905"
             column="9"/>
     </issue>
@@ -43281,7 +42621,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1926"
             column="19"/>
     </issue>
@@ -43292,7 +42632,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1927"
             column="9"/>
     </issue>
@@ -43303,7 +42643,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1932"
             column="19"/>
     </issue>
@@ -43314,7 +42654,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1933"
             column="9"/>
     </issue>
@@ -43325,7 +42665,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1934"
             column="9"/>
     </issue>
@@ -43336,7 +42676,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1939"
             column="19"/>
     </issue>
@@ -43347,7 +42687,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1940"
             column="9"/>
     </issue>
@@ -43358,7 +42698,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1945"
             column="19"/>
     </issue>
@@ -43369,7 +42709,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1946"
             column="9"/>
     </issue>
@@ -43380,7 +42720,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1947"
             column="9"/>
     </issue>
@@ -43391,7 +42731,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1952"
             column="19"/>
     </issue>
@@ -43402,7 +42742,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom(byte[] data)"
         errorLine2="                                                                              ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1952"
             column="79"/>
     </issue>
@@ -43413,7 +42753,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1957"
             column="19"/>
     </issue>
@@ -43424,7 +42764,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1958"
             column="9"/>
     </issue>
@@ -43435,7 +42775,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1959"
             column="9"/>
     </issue>
@@ -43446,7 +42786,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1964"
             column="19"/>
     </issue>
@@ -43457,7 +42797,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom(java.io.InputStream input)"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1964"
             column="79"/>
     </issue>
@@ -43468,7 +42808,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1969"
             column="19"/>
     </issue>
@@ -43479,7 +42819,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1970"
             column="9"/>
     </issue>
@@ -43490,7 +42830,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1971"
             column="9"/>
     </issue>
@@ -43501,7 +42841,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1976"
             column="19"/>
     </issue>
@@ -43512,7 +42852,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1976"
             column="88"/>
     </issue>
@@ -43523,7 +42863,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1980"
             column="19"/>
     </issue>
@@ -43534,7 +42874,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1981"
             column="9"/>
     </issue>
@@ -43545,7 +42885,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1982"
             column="9"/>
     </issue>
@@ -43556,7 +42896,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1986"
             column="19"/>
     </issue>
@@ -43567,7 +42907,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1987"
             column="9"/>
     </issue>
@@ -43578,7 +42918,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1992"
             column="19"/>
     </issue>
@@ -43589,7 +42929,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1993"
             column="9"/>
     </issue>
@@ -43600,7 +42940,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="1994"
             column="9"/>
     </issue>
@@ -43611,7 +42951,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2000"
             column="19"/>
     </issue>
@@ -43622,7 +42962,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ResourceProto.Resources prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2003"
             column="19"/>
     </issue>
@@ -43633,7 +42973,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.ResourceProto.Resources prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2003"
             column="38"/>
     </issue>
@@ -43644,7 +42984,7 @@
         errorLine1="      public java.lang.String getVersion() {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2039"
             column="14"/>
     </issue>
@@ -43655,7 +42995,7 @@
         errorLine1="      public com.google.protobuf.ByteString"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2056"
             column="14"/>
     </issue>
@@ -43666,7 +43006,7 @@
         errorLine1="      public Builder setVersion("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2074"
             column="14"/>
     </issue>
@@ -43677,7 +43017,7 @@
         errorLine1="          java.lang.String value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2075"
             column="11"/>
     </issue>
@@ -43688,7 +43028,7 @@
         errorLine1="      public Builder clearVersion() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2093"
             column="14"/>
     </issue>
@@ -43699,7 +43039,7 @@
         errorLine1="      public Builder setVersionBytes("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2112"
             column="14"/>
     </issue>
@@ -43710,7 +43050,7 @@
         errorLine1="          com.google.protobuf.ByteString value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2113"
             column="11"/>
     </issue>
@@ -43721,7 +43061,7 @@
         errorLine1="          java.lang.String key) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2134"
             column="11"/>
     </issue>
@@ -43732,7 +43072,7 @@
         errorLine1="      public Builder clearIdToImage() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2139"
             column="14"/>
     </issue>
@@ -43743,7 +43083,7 @@
         errorLine1="      public Builder removeIdToImage("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2152"
             column="14"/>
     </issue>
@@ -43754,7 +43094,7 @@
         errorLine1="          java.lang.String key) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2153"
             column="11"/>
     </issue>
@@ -43765,7 +43105,7 @@
         errorLine1="      public java.util.Map&lt;java.lang.String, androidx.wear.tiles.proto.ResourceProto.ImageResource> getIdToImage() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2164"
             column="14"/>
     </issue>
@@ -43776,7 +43116,7 @@
         errorLine1="      public java.util.Map&lt;java.lang.String, androidx.wear.tiles.proto.ResourceProto.ImageResource> getIdToImageMap() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2175"
             column="14"/>
     </issue>
@@ -43787,7 +43127,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ResourceProto.ImageResource getIdToImageOrDefault("
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2188"
             column="14"/>
     </issue>
@@ -43798,7 +43138,7 @@
         errorLine1="          java.lang.String key,"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2189"
             column="11"/>
     </issue>
@@ -43809,7 +43149,7 @@
         errorLine1="          androidx.wear.tiles.proto.ResourceProto.ImageResource defaultValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2190"
             column="11"/>
     </issue>
@@ -43820,7 +43160,7 @@
         errorLine1="      public androidx.wear.tiles.proto.ResourceProto.ImageResource getIdToImageOrThrow("
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2205"
             column="14"/>
     </issue>
@@ -43831,7 +43171,7 @@
         errorLine1="          java.lang.String key) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2206"
             column="11"/>
     </issue>
@@ -43842,7 +43182,7 @@
         errorLine1="      public Builder putIdToImage("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2222"
             column="14"/>
     </issue>
@@ -43853,7 +43193,7 @@
         errorLine1="          java.lang.String key,"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2223"
             column="11"/>
     </issue>
@@ -43864,7 +43204,7 @@
         errorLine1="          androidx.wear.tiles.proto.ResourceProto.ImageResource value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2224"
             column="11"/>
     </issue>
@@ -43875,7 +43215,7 @@
         errorLine1="      public Builder putAllIdToImage("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2238"
             column="14"/>
     </issue>
@@ -43886,7 +43226,7 @@
         errorLine1="          java.util.Map&lt;java.lang.String, androidx.wear.tiles.proto.ResourceProto.ImageResource> values) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2239"
             column="11"/>
     </issue>
@@ -43897,7 +43237,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2249"
             column="21"/>
     </issue>
@@ -43908,7 +43248,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2250"
             column="9"/>
     </issue>
@@ -43919,7 +43259,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2251"
             column="9"/>
     </issue>
@@ -43930,7 +43270,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2251"
             column="32"/>
     </issue>
@@ -43941,7 +43281,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.ResourceProto.Resources getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2310"
             column="19"/>
     </issue>
@@ -43952,7 +43292,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Resources> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/ResourceProto.java"
             line="2316"
             column="19"/>
     </issue>
@@ -43963,7 +43303,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -43974,7 +43314,7 @@
         errorLine1="    java.lang.String getLastClickableId();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="23"
             column="5"/>
     </issue>
@@ -43985,7 +43325,7 @@
         errorLine1="    com.google.protobuf.ByteString"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="32"
             column="5"/>
     </issue>
@@ -43996,7 +43336,7 @@
         errorLine1="    public java.lang.String getLastClickableId() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="61"
             column="12"/>
     </issue>
@@ -44007,7 +43347,7 @@
         errorLine1="    public com.google.protobuf.ByteString"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="73"
             column="12"/>
     </issue>
@@ -44018,7 +43358,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="122"
             column="19"/>
     </issue>
@@ -44029,7 +43369,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="123"
             column="9"/>
     </issue>
@@ -44040,7 +43380,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="128"
             column="19"/>
     </issue>
@@ -44051,7 +43391,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="129"
             column="9"/>
     </issue>
@@ -44062,7 +43402,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="130"
             column="9"/>
     </issue>
@@ -44073,7 +43413,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="135"
             column="19"/>
     </issue>
@@ -44084,7 +43424,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="136"
             column="9"/>
     </issue>
@@ -44095,7 +43435,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="141"
             column="19"/>
     </issue>
@@ -44106,7 +43446,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="142"
             column="9"/>
     </issue>
@@ -44117,7 +43457,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="143"
             column="9"/>
     </issue>
@@ -44128,7 +43468,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="148"
             column="19"/>
     </issue>
@@ -44139,7 +43479,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom(byte[] data)"
         errorLine2="                                                                       ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="148"
             column="72"/>
     </issue>
@@ -44150,7 +43490,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="153"
             column="19"/>
     </issue>
@@ -44161,7 +43501,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="154"
             column="9"/>
     </issue>
@@ -44172,7 +43512,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="155"
             column="9"/>
     </issue>
@@ -44183,7 +43523,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="160"
             column="19"/>
     </issue>
@@ -44194,7 +43534,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom(java.io.InputStream input)"
         errorLine2="                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="160"
             column="72"/>
     </issue>
@@ -44205,7 +43545,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="165"
             column="19"/>
     </issue>
@@ -44216,7 +43556,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="166"
             column="9"/>
     </issue>
@@ -44227,7 +43567,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="167"
             column="9"/>
     </issue>
@@ -44238,7 +43578,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="172"
             column="19"/>
     </issue>
@@ -44249,7 +43589,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="172"
             column="81"/>
     </issue>
@@ -44260,7 +43600,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="176"
             column="19"/>
     </issue>
@@ -44271,7 +43611,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="177"
             column="9"/>
     </issue>
@@ -44282,7 +43622,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="178"
             column="9"/>
     </issue>
@@ -44293,7 +43633,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="182"
             column="19"/>
     </issue>
@@ -44304,7 +43644,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="183"
             column="9"/>
     </issue>
@@ -44315,7 +43655,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="188"
             column="19"/>
     </issue>
@@ -44326,7 +43666,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="189"
             column="9"/>
     </issue>
@@ -44337,7 +43677,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="190"
             column="9"/>
     </issue>
@@ -44348,7 +43688,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="196"
             column="19"/>
     </issue>
@@ -44359,7 +43699,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.StateProto.State prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="199"
             column="19"/>
     </issue>
@@ -44370,7 +43710,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.StateProto.State prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="199"
             column="38"/>
     </issue>
@@ -44381,7 +43721,7 @@
         errorLine1="      public java.lang.String getLastClickableId() {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="230"
             column="14"/>
     </issue>
@@ -44392,7 +43732,7 @@
         errorLine1="      public com.google.protobuf.ByteString"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="242"
             column="14"/>
     </issue>
@@ -44403,7 +43743,7 @@
         errorLine1="      public Builder setLastClickableId("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="255"
             column="14"/>
     </issue>
@@ -44414,7 +43754,7 @@
         errorLine1="          java.lang.String value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="256"
             column="11"/>
     </issue>
@@ -44425,7 +43765,7 @@
         errorLine1="      public Builder clearLastClickableId() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="269"
             column="14"/>
     </issue>
@@ -44436,7 +43776,7 @@
         errorLine1="      public Builder setLastClickableIdBytes("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="283"
             column="14"/>
     </issue>
@@ -44447,7 +43787,7 @@
         errorLine1="          com.google.protobuf.ByteString value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="284"
             column="11"/>
     </issue>
@@ -44458,7 +43798,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="294"
             column="21"/>
     </issue>
@@ -44469,7 +43809,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="295"
             column="9"/>
     </issue>
@@ -44480,7 +43820,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="296"
             column="9"/>
     </issue>
@@ -44491,7 +43831,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="296"
             column="32"/>
     </issue>
@@ -44502,7 +43842,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.StateProto.State getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="353"
             column="19"/>
     </issue>
@@ -44513,7 +43853,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;State> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/StateProto.java"
             line="359"
             column="19"/>
     </issue>
@@ -44524,7 +43864,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -44535,7 +43875,7 @@
         errorLine1="    java.lang.String getResourcesVersion();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="23"
             column="5"/>
     </issue>
@@ -44546,7 +43886,7 @@
         errorLine1="    com.google.protobuf.ByteString"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="32"
             column="5"/>
     </issue>
@@ -44557,7 +43897,7 @@
         errorLine1="    androidx.wear.tiles.proto.TimelineProto.Timeline getTimeline();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="52"
             column="5"/>
     </issue>
@@ -44568,7 +43908,7 @@
         errorLine1="    androidx.wear.tiles.proto.VersionProto.VersionInfo getSchemaVersion();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="71"
             column="5"/>
     </issue>
@@ -44579,7 +43919,7 @@
         errorLine1="    public java.lang.String getResourcesVersion() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="114"
             column="12"/>
     </issue>
@@ -44590,7 +43930,7 @@
         errorLine1="    public com.google.protobuf.ByteString"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="126"
             column="12"/>
     </issue>
@@ -44601,7 +43941,7 @@
         errorLine1="    public androidx.wear.tiles.proto.TimelineProto.Timeline getTimeline() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="196"
             column="12"/>
     </issue>
@@ -44612,7 +43952,7 @@
         errorLine1="    public androidx.wear.tiles.proto.VersionProto.VersionInfo getSchemaVersion() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="278"
             column="12"/>
     </issue>
@@ -44623,7 +43963,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="389"
             column="19"/>
     </issue>
@@ -44634,7 +43974,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="390"
             column="9"/>
     </issue>
@@ -44645,7 +43985,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="395"
             column="19"/>
     </issue>
@@ -44656,7 +43996,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="396"
             column="9"/>
     </issue>
@@ -44667,7 +44007,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="397"
             column="9"/>
     </issue>
@@ -44678,7 +44018,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="402"
             column="19"/>
     </issue>
@@ -44689,7 +44029,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="403"
             column="9"/>
     </issue>
@@ -44700,7 +44040,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="408"
             column="19"/>
     </issue>
@@ -44711,7 +44051,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="409"
             column="9"/>
     </issue>
@@ -44722,7 +44062,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="410"
             column="9"/>
     </issue>
@@ -44733,7 +44073,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="415"
             column="19"/>
     </issue>
@@ -44744,7 +44084,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom(byte[] data)"
         errorLine2="                                                                     ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="415"
             column="70"/>
     </issue>
@@ -44755,7 +44095,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="420"
             column="19"/>
     </issue>
@@ -44766,7 +44106,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="421"
             column="9"/>
     </issue>
@@ -44777,7 +44117,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="422"
             column="9"/>
     </issue>
@@ -44788,7 +44128,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="427"
             column="19"/>
     </issue>
@@ -44799,7 +44139,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom(java.io.InputStream input)"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="427"
             column="70"/>
     </issue>
@@ -44810,7 +44150,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="432"
             column="19"/>
     </issue>
@@ -44821,7 +44161,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="433"
             column="9"/>
     </issue>
@@ -44832,7 +44172,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="434"
             column="9"/>
     </issue>
@@ -44843,7 +44183,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="439"
             column="19"/>
     </issue>
@@ -44854,7 +44194,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="439"
             column="79"/>
     </issue>
@@ -44865,7 +44205,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="443"
             column="19"/>
     </issue>
@@ -44876,7 +44216,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="444"
             column="9"/>
     </issue>
@@ -44887,7 +44227,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="445"
             column="9"/>
     </issue>
@@ -44898,7 +44238,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="449"
             column="19"/>
     </issue>
@@ -44909,7 +44249,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="450"
             column="9"/>
     </issue>
@@ -44920,7 +44260,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="455"
             column="19"/>
     </issue>
@@ -44931,7 +44271,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="456"
             column="9"/>
     </issue>
@@ -44942,7 +44282,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="457"
             column="9"/>
     </issue>
@@ -44953,7 +44293,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="463"
             column="19"/>
     </issue>
@@ -44964,7 +44304,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TileProto.Tile prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="466"
             column="19"/>
     </issue>
@@ -44975,7 +44315,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TileProto.Tile prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="466"
             column="38"/>
     </issue>
@@ -44986,7 +44326,7 @@
         errorLine1="      public java.lang.String getResourcesVersion() {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="498"
             column="14"/>
     </issue>
@@ -44997,7 +44337,7 @@
         errorLine1="      public com.google.protobuf.ByteString"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="510"
             column="14"/>
     </issue>
@@ -45008,7 +44348,7 @@
         errorLine1="      public Builder setResourcesVersion("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="523"
             column="14"/>
     </issue>
@@ -45019,7 +44359,7 @@
         errorLine1="          java.lang.String value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="524"
             column="11"/>
     </issue>
@@ -45030,7 +44370,7 @@
         errorLine1="      public Builder clearResourcesVersion() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="537"
             column="14"/>
     </issue>
@@ -45041,7 +44381,7 @@
         errorLine1="      public Builder setResourcesVersionBytes("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="551"
             column="14"/>
     </issue>
@@ -45052,7 +44392,7 @@
         errorLine1="          com.google.protobuf.ByteString value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="552"
             column="11"/>
     </issue>
@@ -45063,7 +44403,7 @@
         errorLine1="      public androidx.wear.tiles.proto.TimelineProto.Timeline getTimeline() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="577"
             column="14"/>
     </issue>
@@ -45074,7 +44414,7 @@
         errorLine1="      public Builder setTimeline(androidx.wear.tiles.proto.TimelineProto.Timeline value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="587"
             column="14"/>
     </issue>
@@ -45085,7 +44425,7 @@
         errorLine1="      public Builder setTimeline(androidx.wear.tiles.proto.TimelineProto.Timeline value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="587"
             column="34"/>
     </issue>
@@ -45096,7 +44436,7 @@
         errorLine1="      public Builder setTimeline("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="599"
             column="14"/>
     </issue>
@@ -45107,7 +44447,7 @@
         errorLine1="          androidx.wear.tiles.proto.TimelineProto.Timeline.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="600"
             column="11"/>
     </issue>
@@ -45118,7 +44458,7 @@
         errorLine1="      public Builder mergeTimeline(androidx.wear.tiles.proto.TimelineProto.Timeline value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="612"
             column="14"/>
     </issue>
@@ -45129,7 +44469,7 @@
         errorLine1="      public Builder mergeTimeline(androidx.wear.tiles.proto.TimelineProto.Timeline value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="612"
             column="36"/>
     </issue>
@@ -45140,7 +44480,7 @@
         errorLine1="      public Builder clearTimeline() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="624"
             column="14"/>
     </issue>
@@ -45151,7 +44491,7 @@
         errorLine1="      public androidx.wear.tiles.proto.VersionProto.VersionInfo getSchemaVersion() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="648"
             column="14"/>
     </issue>
@@ -45162,7 +44502,7 @@
         errorLine1="      public Builder setSchemaVersion(androidx.wear.tiles.proto.VersionProto.VersionInfo value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="658"
             column="14"/>
     </issue>
@@ -45173,7 +44513,7 @@
         errorLine1="      public Builder setSchemaVersion(androidx.wear.tiles.proto.VersionProto.VersionInfo value) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="658"
             column="39"/>
     </issue>
@@ -45184,7 +44524,7 @@
         errorLine1="      public Builder setSchemaVersion("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="670"
             column="14"/>
     </issue>
@@ -45195,7 +44535,7 @@
         errorLine1="          androidx.wear.tiles.proto.VersionProto.VersionInfo.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="671"
             column="11"/>
     </issue>
@@ -45206,7 +44546,7 @@
         errorLine1="      public Builder mergeSchemaVersion(androidx.wear.tiles.proto.VersionProto.VersionInfo value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="683"
             column="14"/>
     </issue>
@@ -45217,7 +44557,7 @@
         errorLine1="      public Builder mergeSchemaVersion(androidx.wear.tiles.proto.VersionProto.VersionInfo value) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="683"
             column="41"/>
     </issue>
@@ -45228,7 +44568,7 @@
         errorLine1="      public Builder clearSchemaVersion() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="695"
             column="14"/>
     </issue>
@@ -45239,7 +44579,7 @@
         errorLine1="      public Builder setFreshnessIntervalMillis(long value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="729"
             column="14"/>
     </issue>
@@ -45250,7 +44590,7 @@
         errorLine1="      public Builder clearFreshnessIntervalMillis() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="746"
             column="14"/>
     </issue>
@@ -45261,7 +44601,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="756"
             column="21"/>
     </issue>
@@ -45272,7 +44612,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="757"
             column="9"/>
     </issue>
@@ -45283,7 +44623,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="758"
             column="9"/>
     </issue>
@@ -45294,7 +44634,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="758"
             column="32"/>
     </issue>
@@ -45305,7 +44645,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TileProto.Tile getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="819"
             column="19"/>
     </issue>
@@ -45316,7 +44656,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Tile> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TileProto.java"
             line="825"
             column="19"/>
     </issue>
@@ -45327,7 +44667,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -45338,7 +44678,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="126"
             column="19"/>
     </issue>
@@ -45349,7 +44689,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="127"
             column="9"/>
     </issue>
@@ -45360,7 +44700,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="132"
             column="19"/>
     </issue>
@@ -45371,7 +44711,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="133"
             column="9"/>
     </issue>
@@ -45382,7 +44722,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="134"
             column="9"/>
     </issue>
@@ -45393,7 +44733,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="139"
             column="19"/>
     </issue>
@@ -45404,7 +44744,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="140"
             column="9"/>
     </issue>
@@ -45415,7 +44755,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="145"
             column="19"/>
     </issue>
@@ -45426,7 +44766,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="146"
             column="9"/>
     </issue>
@@ -45437,7 +44777,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="147"
             column="9"/>
     </issue>
@@ -45448,7 +44788,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="152"
             column="19"/>
     </issue>
@@ -45459,7 +44799,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom(byte[] data)"
         errorLine2="                                                                                 ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="152"
             column="82"/>
     </issue>
@@ -45470,7 +44810,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="157"
             column="19"/>
     </issue>
@@ -45481,7 +44821,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="158"
             column="9"/>
     </issue>
@@ -45492,7 +44832,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="159"
             column="9"/>
     </issue>
@@ -45503,7 +44843,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="164"
             column="19"/>
     </issue>
@@ -45514,7 +44854,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="164"
             column="82"/>
     </issue>
@@ -45525,7 +44865,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="169"
             column="19"/>
     </issue>
@@ -45536,7 +44876,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="170"
             column="9"/>
     </issue>
@@ -45547,7 +44887,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="171"
             column="9"/>
     </issue>
@@ -45558,7 +44898,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="176"
             column="19"/>
     </issue>
@@ -45569,7 +44909,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="176"
             column="91"/>
     </issue>
@@ -45580,7 +44920,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="180"
             column="19"/>
     </issue>
@@ -45591,7 +44931,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="181"
             column="9"/>
     </issue>
@@ -45602,7 +44942,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="182"
             column="9"/>
     </issue>
@@ -45613,7 +44953,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="186"
             column="19"/>
     </issue>
@@ -45624,7 +44964,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="187"
             column="9"/>
     </issue>
@@ -45635,7 +44975,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="192"
             column="19"/>
     </issue>
@@ -45646,7 +44986,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="193"
             column="9"/>
     </issue>
@@ -45657,7 +44997,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="194"
             column="9"/>
     </issue>
@@ -45668,7 +45008,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="200"
             column="19"/>
     </issue>
@@ -45679,7 +45019,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TimelineProto.TimeInterval prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="203"
             column="19"/>
     </issue>
@@ -45690,7 +45030,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TimelineProto.TimeInterval prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="203"
             column="38"/>
     </issue>
@@ -45701,7 +45041,7 @@
         errorLine1="      public Builder setStartMillis(long value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="247"
             column="14"/>
     </issue>
@@ -45712,7 +45052,7 @@
         errorLine1="      public Builder clearStartMillis() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="260"
             column="14"/>
     </issue>
@@ -45723,7 +45063,7 @@
         errorLine1="      public Builder setEndMillis(long value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="287"
             column="14"/>
     </issue>
@@ -45734,7 +45074,7 @@
         errorLine1="      public Builder clearEndMillis() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="300"
             column="14"/>
     </issue>
@@ -45745,7 +45085,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="310"
             column="21"/>
     </issue>
@@ -45756,7 +45096,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="311"
             column="9"/>
     </issue>
@@ -45767,7 +45107,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="312"
             column="9"/>
     </issue>
@@ -45778,7 +45118,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="312"
             column="32"/>
     </issue>
@@ -45789,7 +45129,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimeInterval getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="371"
             column="19"/>
     </issue>
@@ -45800,7 +45140,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;TimeInterval> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="377"
             column="19"/>
     </issue>
@@ -45811,7 +45151,7 @@
         errorLine1="    androidx.wear.tiles.proto.TimelineProto.TimeInterval getValidity();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="403"
             column="5"/>
     </issue>
@@ -45822,7 +45162,7 @@
         errorLine1="    androidx.wear.tiles.proto.LayoutElementProto.Layout getLayout();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="422"
             column="5"/>
     </issue>
@@ -45833,7 +45173,7 @@
         errorLine1="    public androidx.wear.tiles.proto.TimelineProto.TimeInterval getValidity() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="459"
             column="12"/>
     </issue>
@@ -45844,7 +45184,7 @@
         errorLine1="    public androidx.wear.tiles.proto.LayoutElementProto.Layout getLayout() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="541"
             column="12"/>
     </issue>
@@ -45855,7 +45195,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="602"
             column="19"/>
     </issue>
@@ -45866,7 +45206,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="603"
             column="9"/>
     </issue>
@@ -45877,7 +45217,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="608"
             column="19"/>
     </issue>
@@ -45888,7 +45228,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="609"
             column="9"/>
     </issue>
@@ -45899,7 +45239,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="610"
             column="9"/>
     </issue>
@@ -45910,7 +45250,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="615"
             column="19"/>
     </issue>
@@ -45921,7 +45261,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="616"
             column="9"/>
     </issue>
@@ -45932,7 +45272,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="621"
             column="19"/>
     </issue>
@@ -45943,7 +45283,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="622"
             column="9"/>
     </issue>
@@ -45954,7 +45294,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="623"
             column="9"/>
     </issue>
@@ -45965,7 +45305,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="628"
             column="19"/>
     </issue>
@@ -45976,7 +45316,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom(byte[] data)"
         errorLine2="                                                                                  ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="628"
             column="83"/>
     </issue>
@@ -45987,7 +45327,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="633"
             column="19"/>
     </issue>
@@ -45998,7 +45338,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="634"
             column="9"/>
     </issue>
@@ -46009,7 +45349,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="635"
             column="9"/>
     </issue>
@@ -46020,7 +45360,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="640"
             column="19"/>
     </issue>
@@ -46031,7 +45371,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom(java.io.InputStream input)"
         errorLine2="                                                                                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="640"
             column="83"/>
     </issue>
@@ -46042,7 +45382,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="645"
             column="19"/>
     </issue>
@@ -46053,7 +45393,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="646"
             column="9"/>
     </issue>
@@ -46064,7 +45404,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="647"
             column="9"/>
     </issue>
@@ -46075,7 +45415,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="652"
             column="19"/>
     </issue>
@@ -46086,7 +45426,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="652"
             column="92"/>
     </issue>
@@ -46097,7 +45437,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="656"
             column="19"/>
     </issue>
@@ -46108,7 +45448,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="657"
             column="9"/>
     </issue>
@@ -46119,7 +45459,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="658"
             column="9"/>
     </issue>
@@ -46130,7 +45470,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="662"
             column="19"/>
     </issue>
@@ -46141,7 +45481,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="663"
             column="9"/>
     </issue>
@@ -46152,7 +45492,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="668"
             column="19"/>
     </issue>
@@ -46163,7 +45503,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="669"
             column="9"/>
     </issue>
@@ -46174,7 +45514,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="670"
             column="9"/>
     </issue>
@@ -46185,7 +45525,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="676"
             column="19"/>
     </issue>
@@ -46196,7 +45536,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TimelineProto.TimelineEntry prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="679"
             column="19"/>
     </issue>
@@ -46207,7 +45547,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TimelineProto.TimelineEntry prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="679"
             column="38"/>
     </issue>
@@ -46218,7 +45558,7 @@
         errorLine1="      public androidx.wear.tiles.proto.TimelineProto.TimeInterval getValidity() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="720"
             column="14"/>
     </issue>
@@ -46229,7 +45569,7 @@
         errorLine1="      public Builder setValidity(androidx.wear.tiles.proto.TimelineProto.TimeInterval value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="730"
             column="14"/>
     </issue>
@@ -46240,7 +45580,7 @@
         errorLine1="      public Builder setValidity(androidx.wear.tiles.proto.TimelineProto.TimeInterval value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="730"
             column="34"/>
     </issue>
@@ -46251,7 +45591,7 @@
         errorLine1="      public Builder setValidity("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="742"
             column="14"/>
     </issue>
@@ -46262,7 +45602,7 @@
         errorLine1="          androidx.wear.tiles.proto.TimelineProto.TimeInterval.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="743"
             column="11"/>
     </issue>
@@ -46273,7 +45613,7 @@
         errorLine1="      public Builder mergeValidity(androidx.wear.tiles.proto.TimelineProto.TimeInterval value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="755"
             column="14"/>
     </issue>
@@ -46284,7 +45624,7 @@
         errorLine1="      public Builder mergeValidity(androidx.wear.tiles.proto.TimelineProto.TimeInterval value) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="755"
             column="36"/>
     </issue>
@@ -46295,7 +45635,7 @@
         errorLine1="      public Builder clearValidity() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="767"
             column="14"/>
     </issue>
@@ -46306,7 +45646,7 @@
         errorLine1="      public androidx.wear.tiles.proto.LayoutElementProto.Layout getLayout() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="791"
             column="14"/>
     </issue>
@@ -46317,7 +45657,7 @@
         errorLine1="      public Builder setLayout(androidx.wear.tiles.proto.LayoutElementProto.Layout value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="801"
             column="14"/>
     </issue>
@@ -46328,7 +45668,7 @@
         errorLine1="      public Builder setLayout(androidx.wear.tiles.proto.LayoutElementProto.Layout value) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="801"
             column="32"/>
     </issue>
@@ -46339,7 +45679,7 @@
         errorLine1="      public Builder setLayout("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="813"
             column="14"/>
     </issue>
@@ -46350,7 +45690,7 @@
         errorLine1="          androidx.wear.tiles.proto.LayoutElementProto.Layout.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="814"
             column="11"/>
     </issue>
@@ -46361,7 +45701,7 @@
         errorLine1="      public Builder mergeLayout(androidx.wear.tiles.proto.LayoutElementProto.Layout value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="826"
             column="14"/>
     </issue>
@@ -46372,7 +45712,7 @@
         errorLine1="      public Builder mergeLayout(androidx.wear.tiles.proto.LayoutElementProto.Layout value) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="826"
             column="34"/>
     </issue>
@@ -46383,7 +45723,7 @@
         errorLine1="      public Builder clearLayout() {  copyOnWrite();"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="838"
             column="14"/>
     </issue>
@@ -46394,7 +45734,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="847"
             column="21"/>
     </issue>
@@ -46405,7 +45745,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="848"
             column="9"/>
     </issue>
@@ -46416,7 +45756,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="849"
             column="9"/>
     </issue>
@@ -46427,7 +45767,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="849"
             column="32"/>
     </issue>
@@ -46438,7 +45778,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.TimelineEntry getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="907"
             column="19"/>
     </issue>
@@ -46449,7 +45789,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;TimelineEntry> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="913"
             column="19"/>
     </issue>
@@ -46460,7 +45800,7 @@
         errorLine1="    java.util.List&lt;androidx.wear.tiles.proto.TimelineProto.TimelineEntry> "
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="929"
             column="5"/>
     </issue>
@@ -46471,7 +45811,7 @@
         errorLine1="    androidx.wear.tiles.proto.TimelineProto.TimelineEntry getTimelineEntries(int index);"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="938"
             column="5"/>
     </issue>
@@ -46482,7 +45822,7 @@
         errorLine1="    public java.util.List&lt;androidx.wear.tiles.proto.TimelineProto.TimelineEntry> getTimelineEntriesList() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="982"
             column="12"/>
     </issue>
@@ -46493,7 +45833,7 @@
         errorLine1="    public java.util.List&lt;? extends androidx.wear.tiles.proto.TimelineProto.TimelineEntryOrBuilder> "
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="992"
             column="12"/>
     </issue>
@@ -46504,7 +45844,7 @@
         errorLine1="    public androidx.wear.tiles.proto.TimelineProto.TimelineEntry getTimelineEntries(int index) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1015"
             column="12"/>
     </issue>
@@ -46515,7 +45855,7 @@
         errorLine1="    public androidx.wear.tiles.proto.TimelineProto.TimelineEntryOrBuilder getTimelineEntriesOrBuilder("
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1025"
             column="12"/>
     </issue>
@@ -46526,7 +45866,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1151"
             column="19"/>
     </issue>
@@ -46537,7 +45877,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1152"
             column="9"/>
     </issue>
@@ -46548,7 +45888,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1157"
             column="19"/>
     </issue>
@@ -46559,7 +45899,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1158"
             column="9"/>
     </issue>
@@ -46570,7 +45910,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1159"
             column="9"/>
     </issue>
@@ -46581,7 +45921,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1164"
             column="19"/>
     </issue>
@@ -46592,7 +45932,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1165"
             column="9"/>
     </issue>
@@ -46603,7 +45943,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1170"
             column="19"/>
     </issue>
@@ -46614,7 +45954,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1171"
             column="9"/>
     </issue>
@@ -46625,7 +45965,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1172"
             column="9"/>
     </issue>
@@ -46636,7 +45976,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1177"
             column="19"/>
     </issue>
@@ -46647,7 +45987,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom(byte[] data)"
         errorLine2="                                                                             ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1177"
             column="78"/>
     </issue>
@@ -46658,7 +45998,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1182"
             column="19"/>
     </issue>
@@ -46669,7 +46009,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1183"
             column="9"/>
     </issue>
@@ -46680,7 +46020,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1184"
             column="9"/>
     </issue>
@@ -46691,7 +46031,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1189"
             column="19"/>
     </issue>
@@ -46702,7 +46042,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom(java.io.InputStream input)"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1189"
             column="78"/>
     </issue>
@@ -46713,7 +46053,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1194"
             column="19"/>
     </issue>
@@ -46724,7 +46064,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1195"
             column="9"/>
     </issue>
@@ -46735,7 +46075,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1196"
             column="9"/>
     </issue>
@@ -46746,7 +46086,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1201"
             column="19"/>
     </issue>
@@ -46757,7 +46097,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1201"
             column="87"/>
     </issue>
@@ -46768,7 +46108,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1205"
             column="19"/>
     </issue>
@@ -46779,7 +46119,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1206"
             column="9"/>
     </issue>
@@ -46790,7 +46130,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1207"
             column="9"/>
     </issue>
@@ -46801,7 +46141,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1211"
             column="19"/>
     </issue>
@@ -46812,7 +46152,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1212"
             column="9"/>
     </issue>
@@ -46823,7 +46163,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1217"
             column="19"/>
     </issue>
@@ -46834,7 +46174,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1218"
             column="9"/>
     </issue>
@@ -46845,7 +46185,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1219"
             column="9"/>
     </issue>
@@ -46856,7 +46196,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1225"
             column="19"/>
     </issue>
@@ -46867,7 +46207,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TimelineProto.Timeline prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1228"
             column="19"/>
     </issue>
@@ -46878,7 +46218,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TimelineProto.Timeline prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1228"
             column="38"/>
     </issue>
@@ -46889,7 +46229,7 @@
         errorLine1="      public java.util.List&lt;androidx.wear.tiles.proto.TimelineProto.TimelineEntry> getTimelineEntriesList() {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1267"
             column="14"/>
     </issue>
@@ -46900,7 +46240,7 @@
         errorLine1="      public androidx.wear.tiles.proto.TimelineProto.TimelineEntry getTimelineEntries(int index) {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1289"
             column="14"/>
     </issue>
@@ -46911,7 +46251,7 @@
         errorLine1="      public Builder setTimelineEntries("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1299"
             column="14"/>
     </issue>
@@ -46922,7 +46262,7 @@
         errorLine1="          int index, androidx.wear.tiles.proto.TimelineProto.TimelineEntry value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1300"
             column="22"/>
     </issue>
@@ -46933,7 +46273,7 @@
         errorLine1="      public Builder setTimelineEntries("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1312"
             column="14"/>
     </issue>
@@ -46944,7 +46284,7 @@
         errorLine1="          int index, androidx.wear.tiles.proto.TimelineProto.TimelineEntry.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1313"
             column="22"/>
     </issue>
@@ -46955,7 +46295,7 @@
         errorLine1="      public Builder addTimelineEntries(androidx.wear.tiles.proto.TimelineProto.TimelineEntry value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1325"
             column="14"/>
     </issue>
@@ -46966,7 +46306,7 @@
         errorLine1="      public Builder addTimelineEntries(androidx.wear.tiles.proto.TimelineProto.TimelineEntry value) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1325"
             column="41"/>
     </issue>
@@ -46977,7 +46317,7 @@
         errorLine1="      public Builder addTimelineEntries("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1337"
             column="14"/>
     </issue>
@@ -46988,7 +46328,7 @@
         errorLine1="          int index, androidx.wear.tiles.proto.TimelineProto.TimelineEntry value) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1338"
             column="22"/>
     </issue>
@@ -46999,7 +46339,7 @@
         errorLine1="      public Builder addTimelineEntries("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1350"
             column="14"/>
     </issue>
@@ -47010,7 +46350,7 @@
         errorLine1="          androidx.wear.tiles.proto.TimelineProto.TimelineEntry.Builder builderForValue) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1351"
             column="11"/>
     </issue>
@@ -47021,7 +46361,7 @@
         errorLine1="      public Builder addTimelineEntries("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1363"
             column="14"/>
     </issue>
@@ -47032,7 +46372,7 @@
         errorLine1="          int index, androidx.wear.tiles.proto.TimelineProto.TimelineEntry.Builder builderForValue) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1364"
             column="22"/>
     </issue>
@@ -47043,7 +46383,7 @@
         errorLine1="      public Builder addAllTimelineEntries("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1376"
             column="14"/>
     </issue>
@@ -47054,7 +46394,7 @@
         errorLine1="          java.lang.Iterable&lt;? extends androidx.wear.tiles.proto.TimelineProto.TimelineEntry> values) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1377"
             column="11"/>
     </issue>
@@ -47065,7 +46405,7 @@
         errorLine1="      public Builder clearTimelineEntries() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1389"
             column="14"/>
     </issue>
@@ -47076,7 +46416,7 @@
         errorLine1="      public Builder removeTimelineEntries(int index) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1401"
             column="14"/>
     </issue>
@@ -47087,7 +46427,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1411"
             column="21"/>
     </issue>
@@ -47098,7 +46438,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1412"
             column="9"/>
     </issue>
@@ -47109,7 +46449,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1413"
             column="9"/>
     </issue>
@@ -47120,7 +46460,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1413"
             column="32"/>
     </issue>
@@ -47131,7 +46471,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TimelineProto.Timeline getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1471"
             column="19"/>
     </issue>
@@ -47142,7 +46482,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Timeline> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TimelineProto.java"
             line="1477"
             column="19"/>
     </issue>
@@ -47153,7 +46493,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -47164,7 +46504,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="77"
             column="19"/>
     </issue>
@@ -47175,7 +46515,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="78"
             column="9"/>
     </issue>
@@ -47186,7 +46526,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="83"
             column="19"/>
     </issue>
@@ -47197,7 +46537,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="84"
             column="9"/>
     </issue>
@@ -47208,7 +46548,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="85"
             column="9"/>
     </issue>
@@ -47219,7 +46559,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="90"
             column="19"/>
     </issue>
@@ -47230,7 +46570,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="91"
             column="9"/>
     </issue>
@@ -47241,7 +46581,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="96"
             column="19"/>
     </issue>
@@ -47252,7 +46592,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="97"
             column="9"/>
     </issue>
@@ -47263,7 +46603,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="98"
             column="9"/>
     </issue>
@@ -47274,7 +46614,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="103"
             column="19"/>
     </issue>
@@ -47285,7 +46625,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom(byte[] data)"
         errorLine2="                                                                           ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="103"
             column="76"/>
     </issue>
@@ -47296,7 +46636,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="108"
             column="19"/>
     </issue>
@@ -47307,7 +46647,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="109"
             column="9"/>
     </issue>
@@ -47318,7 +46658,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="110"
             column="9"/>
     </issue>
@@ -47329,7 +46669,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="115"
             column="19"/>
     </issue>
@@ -47340,7 +46680,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom(java.io.InputStream input)"
         errorLine2="                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="115"
             column="76"/>
     </issue>
@@ -47351,7 +46691,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="120"
             column="19"/>
     </issue>
@@ -47362,7 +46702,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="121"
             column="9"/>
     </issue>
@@ -47373,7 +46713,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="122"
             column="9"/>
     </issue>
@@ -47384,7 +46724,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="127"
             column="19"/>
     </issue>
@@ -47395,7 +46735,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="127"
             column="85"/>
     </issue>
@@ -47406,7 +46746,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="131"
             column="19"/>
     </issue>
@@ -47417,7 +46757,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="132"
             column="9"/>
     </issue>
@@ -47428,7 +46768,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="133"
             column="9"/>
     </issue>
@@ -47439,7 +46779,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="137"
             column="19"/>
     </issue>
@@ -47450,7 +46790,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="138"
             column="9"/>
     </issue>
@@ -47461,7 +46801,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="143"
             column="19"/>
     </issue>
@@ -47472,7 +46812,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="144"
             column="9"/>
     </issue>
@@ -47483,7 +46823,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="145"
             column="9"/>
     </issue>
@@ -47494,7 +46834,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="151"
             column="19"/>
     </issue>
@@ -47505,7 +46845,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TypesProto.Int32Prop prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="154"
             column="19"/>
     </issue>
@@ -47516,7 +46856,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TypesProto.Int32Prop prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="154"
             column="38"/>
     </issue>
@@ -47527,7 +46867,7 @@
         errorLine1="      public Builder setValue(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="197"
             column="14"/>
     </issue>
@@ -47538,7 +46878,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="210"
             column="14"/>
     </issue>
@@ -47549,7 +46889,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="220"
             column="21"/>
     </issue>
@@ -47560,7 +46900,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="221"
             column="9"/>
     </issue>
@@ -47571,7 +46911,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="222"
             column="9"/>
     </issue>
@@ -47582,7 +46922,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="222"
             column="32"/>
     </issue>
@@ -47593,7 +46933,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.Int32Prop getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="279"
             column="19"/>
     </issue>
@@ -47604,7 +46944,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;Int32Prop> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="285"
             column="19"/>
     </issue>
@@ -47615,7 +46955,7 @@
         errorLine1="    java.lang.String getValue();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="302"
             column="5"/>
     </issue>
@@ -47626,7 +46966,7 @@
         errorLine1="    com.google.protobuf.ByteString"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="311"
             column="5"/>
     </issue>
@@ -47637,7 +46977,7 @@
         errorLine1="    public java.lang.String getValue() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="340"
             column="12"/>
     </issue>
@@ -47648,7 +46988,7 @@
         errorLine1="    public com.google.protobuf.ByteString"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="352"
             column="12"/>
     </issue>
@@ -47659,7 +46999,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="401"
             column="19"/>
     </issue>
@@ -47670,7 +47010,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="402"
             column="9"/>
     </issue>
@@ -47681,7 +47021,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="407"
             column="19"/>
     </issue>
@@ -47692,7 +47032,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="408"
             column="9"/>
     </issue>
@@ -47703,7 +47043,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="409"
             column="9"/>
     </issue>
@@ -47714,7 +47054,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="414"
             column="19"/>
     </issue>
@@ -47725,7 +47065,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="415"
             column="9"/>
     </issue>
@@ -47736,7 +47076,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="420"
             column="19"/>
     </issue>
@@ -47747,7 +47087,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="421"
             column="9"/>
     </issue>
@@ -47758,7 +47098,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="422"
             column="9"/>
     </issue>
@@ -47769,7 +47109,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="427"
             column="19"/>
     </issue>
@@ -47780,7 +47120,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom(byte[] data)"
         errorLine2="                                                                            ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="427"
             column="77"/>
     </issue>
@@ -47791,7 +47131,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="432"
             column="19"/>
     </issue>
@@ -47802,7 +47142,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="433"
             column="9"/>
     </issue>
@@ -47813,7 +47153,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="434"
             column="9"/>
     </issue>
@@ -47824,7 +47164,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="439"
             column="19"/>
     </issue>
@@ -47835,7 +47175,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="439"
             column="77"/>
     </issue>
@@ -47846,7 +47186,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="444"
             column="19"/>
     </issue>
@@ -47857,7 +47197,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="445"
             column="9"/>
     </issue>
@@ -47868,7 +47208,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="446"
             column="9"/>
     </issue>
@@ -47879,7 +47219,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="451"
             column="19"/>
     </issue>
@@ -47890,7 +47230,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="451"
             column="86"/>
     </issue>
@@ -47901,7 +47241,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="455"
             column="19"/>
     </issue>
@@ -47912,7 +47252,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="456"
             column="9"/>
     </issue>
@@ -47923,7 +47263,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="457"
             column="9"/>
     </issue>
@@ -47934,7 +47274,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="461"
             column="19"/>
     </issue>
@@ -47945,7 +47285,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="462"
             column="9"/>
     </issue>
@@ -47956,7 +47296,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="467"
             column="19"/>
     </issue>
@@ -47967,7 +47307,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="468"
             column="9"/>
     </issue>
@@ -47978,7 +47318,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="469"
             column="9"/>
     </issue>
@@ -47989,7 +47329,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="475"
             column="19"/>
     </issue>
@@ -48000,7 +47340,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TypesProto.StringProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="478"
             column="19"/>
     </issue>
@@ -48011,7 +47351,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TypesProto.StringProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="478"
             column="38"/>
     </issue>
@@ -48022,7 +47362,7 @@
         errorLine1="      public java.lang.String getValue() {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="509"
             column="14"/>
     </issue>
@@ -48033,7 +47373,7 @@
         errorLine1="      public com.google.protobuf.ByteString"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="521"
             column="14"/>
     </issue>
@@ -48044,7 +47384,7 @@
         errorLine1="      public Builder setValue("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="534"
             column="14"/>
     </issue>
@@ -48055,7 +47395,7 @@
         errorLine1="          java.lang.String value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="535"
             column="11"/>
     </issue>
@@ -48066,7 +47406,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="548"
             column="14"/>
     </issue>
@@ -48077,7 +47417,7 @@
         errorLine1="      public Builder setValueBytes("
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="562"
             column="14"/>
     </issue>
@@ -48088,7 +47428,7 @@
         errorLine1="          com.google.protobuf.ByteString value) {"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="563"
             column="11"/>
     </issue>
@@ -48099,7 +47439,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="573"
             column="21"/>
     </issue>
@@ -48110,7 +47450,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="574"
             column="9"/>
     </issue>
@@ -48121,7 +47461,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="575"
             column="9"/>
     </issue>
@@ -48132,7 +47472,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="575"
             column="32"/>
     </issue>
@@ -48143,7 +47483,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.StringProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="632"
             column="19"/>
     </issue>
@@ -48154,7 +47494,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;StringProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="638"
             column="19"/>
     </issue>
@@ -48165,7 +47505,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="709"
             column="19"/>
     </issue>
@@ -48176,7 +47516,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="710"
             column="9"/>
     </issue>
@@ -48187,7 +47527,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="715"
             column="19"/>
     </issue>
@@ -48198,7 +47538,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="716"
             column="9"/>
     </issue>
@@ -48209,7 +47549,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="717"
             column="9"/>
     </issue>
@@ -48220,7 +47560,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="722"
             column="19"/>
     </issue>
@@ -48231,7 +47571,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="723"
             column="9"/>
     </issue>
@@ -48242,7 +47582,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="728"
             column="19"/>
     </issue>
@@ -48253,7 +47593,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="729"
             column="9"/>
     </issue>
@@ -48264,7 +47604,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="730"
             column="9"/>
     </issue>
@@ -48275,7 +47615,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="735"
             column="19"/>
     </issue>
@@ -48286,7 +47626,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom(byte[] data)"
         errorLine2="                                                                           ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="735"
             column="76"/>
     </issue>
@@ -48297,7 +47637,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="740"
             column="19"/>
     </issue>
@@ -48308,7 +47648,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="741"
             column="9"/>
     </issue>
@@ -48319,7 +47659,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="742"
             column="9"/>
     </issue>
@@ -48330,7 +47670,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="747"
             column="19"/>
     </issue>
@@ -48341,7 +47681,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="747"
             column="76"/>
     </issue>
@@ -48352,7 +47692,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="752"
             column="19"/>
     </issue>
@@ -48363,7 +47703,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="753"
             column="9"/>
     </issue>
@@ -48374,7 +47714,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="754"
             column="9"/>
     </issue>
@@ -48385,7 +47725,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="759"
             column="19"/>
     </issue>
@@ -48396,7 +47736,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="759"
             column="85"/>
     </issue>
@@ -48407,7 +47747,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="763"
             column="19"/>
     </issue>
@@ -48418,7 +47758,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="764"
             column="9"/>
     </issue>
@@ -48429,7 +47769,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="765"
             column="9"/>
     </issue>
@@ -48440,7 +47780,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="769"
             column="19"/>
     </issue>
@@ -48451,7 +47791,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="770"
             column="9"/>
     </issue>
@@ -48462,7 +47802,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="775"
             column="19"/>
     </issue>
@@ -48473,7 +47813,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="776"
             column="9"/>
     </issue>
@@ -48484,7 +47824,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="777"
             column="9"/>
     </issue>
@@ -48495,7 +47835,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="783"
             column="19"/>
     </issue>
@@ -48506,7 +47846,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TypesProto.FloatProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="786"
             column="19"/>
     </issue>
@@ -48517,7 +47857,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TypesProto.FloatProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="786"
             column="38"/>
     </issue>
@@ -48528,7 +47868,7 @@
         errorLine1="      public Builder setValue(float value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="829"
             column="14"/>
     </issue>
@@ -48539,7 +47879,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="842"
             column="14"/>
     </issue>
@@ -48550,7 +47890,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="852"
             column="21"/>
     </issue>
@@ -48561,7 +47901,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="853"
             column="9"/>
     </issue>
@@ -48572,7 +47912,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="854"
             column="9"/>
     </issue>
@@ -48583,7 +47923,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="854"
             column="32"/>
     </issue>
@@ -48594,7 +47934,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.FloatProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="911"
             column="19"/>
     </issue>
@@ -48605,7 +47945,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;FloatProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="917"
             column="19"/>
     </issue>
@@ -48616,7 +47956,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="988"
             column="19"/>
     </issue>
@@ -48627,7 +47967,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="989"
             column="9"/>
     </issue>
@@ -48638,7 +47978,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="994"
             column="19"/>
     </issue>
@@ -48649,7 +47989,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="995"
             column="9"/>
     </issue>
@@ -48660,7 +48000,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="996"
             column="9"/>
     </issue>
@@ -48671,7 +48011,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1001"
             column="19"/>
     </issue>
@@ -48682,7 +48022,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1002"
             column="9"/>
     </issue>
@@ -48693,7 +48033,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1007"
             column="19"/>
     </issue>
@@ -48704,7 +48044,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1008"
             column="9"/>
     </issue>
@@ -48715,7 +48055,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1009"
             column="9"/>
     </issue>
@@ -48726,7 +48066,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1014"
             column="19"/>
     </issue>
@@ -48737,7 +48077,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom(byte[] data)"
         errorLine2="                                                                          ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1014"
             column="75"/>
     </issue>
@@ -48748,7 +48088,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1019"
             column="19"/>
     </issue>
@@ -48759,7 +48099,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1020"
             column="9"/>
     </issue>
@@ -48770,7 +48110,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1021"
             column="9"/>
     </issue>
@@ -48781,7 +48121,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1026"
             column="19"/>
     </issue>
@@ -48792,7 +48132,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1026"
             column="75"/>
     </issue>
@@ -48803,7 +48143,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1031"
             column="19"/>
     </issue>
@@ -48814,7 +48154,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1032"
             column="9"/>
     </issue>
@@ -48825,7 +48165,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1033"
             column="9"/>
     </issue>
@@ -48836,7 +48176,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1038"
             column="19"/>
     </issue>
@@ -48847,7 +48187,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1038"
             column="84"/>
     </issue>
@@ -48858,7 +48198,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1042"
             column="19"/>
     </issue>
@@ -48869,7 +48209,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1043"
             column="9"/>
     </issue>
@@ -48880,7 +48220,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1044"
             column="9"/>
     </issue>
@@ -48891,7 +48231,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1048"
             column="19"/>
     </issue>
@@ -48902,7 +48242,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1049"
             column="9"/>
     </issue>
@@ -48913,7 +48253,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1054"
             column="19"/>
     </issue>
@@ -48924,7 +48264,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1055"
             column="9"/>
     </issue>
@@ -48935,7 +48275,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1056"
             column="9"/>
     </issue>
@@ -48946,7 +48286,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1062"
             column="19"/>
     </issue>
@@ -48957,7 +48297,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TypesProto.BoolProp prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1065"
             column="19"/>
     </issue>
@@ -48968,7 +48308,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.TypesProto.BoolProp prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1065"
             column="38"/>
     </issue>
@@ -48979,7 +48319,7 @@
         errorLine1="      public Builder setValue(boolean value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1108"
             column="14"/>
     </issue>
@@ -48990,7 +48330,7 @@
         errorLine1="      public Builder clearValue() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1121"
             column="14"/>
     </issue>
@@ -49001,7 +48341,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1131"
             column="21"/>
     </issue>
@@ -49012,7 +48352,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1132"
             column="9"/>
     </issue>
@@ -49023,7 +48363,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1133"
             column="9"/>
     </issue>
@@ -49034,7 +48374,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1133"
             column="32"/>
     </issue>
@@ -49045,7 +48385,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.TypesProto.BoolProp getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1190"
             column="19"/>
     </issue>
@@ -49056,7 +48396,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;BoolProp> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/TypesProto.java"
             line="1196"
             column="19"/>
     </issue>
@@ -49067,7 +48407,7 @@
         errorLine1="      com.google.protobuf.ExtensionRegistryLite registry) {"
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="9"
             column="7"/>
     </issue>
@@ -49078,7 +48418,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="138"
             column="19"/>
     </issue>
@@ -49089,7 +48429,7 @@
         errorLine1="        java.nio.ByteBuffer data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="139"
             column="9"/>
     </issue>
@@ -49100,7 +48440,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="144"
             column="19"/>
     </issue>
@@ -49111,7 +48451,7 @@
         errorLine1="        java.nio.ByteBuffer data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="145"
             column="9"/>
     </issue>
@@ -49122,7 +48462,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="146"
             column="9"/>
     </issue>
@@ -49133,7 +48473,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="151"
             column="19"/>
     </issue>
@@ -49144,7 +48484,7 @@
         errorLine1="        com.google.protobuf.ByteString data)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="152"
             column="9"/>
     </issue>
@@ -49155,7 +48495,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="157"
             column="19"/>
     </issue>
@@ -49166,7 +48506,7 @@
         errorLine1="        com.google.protobuf.ByteString data,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="158"
             column="9"/>
     </issue>
@@ -49177,7 +48517,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="159"
             column="9"/>
     </issue>
@@ -49188,7 +48528,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom(byte[] data)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="164"
             column="19"/>
     </issue>
@@ -49199,7 +48539,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom(byte[] data)"
         errorLine2="                                                                               ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="164"
             column="80"/>
     </issue>
@@ -49210,7 +48550,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="169"
             column="19"/>
     </issue>
@@ -49221,7 +48561,7 @@
         errorLine1="        byte[] data,"
         errorLine2="        ~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="170"
             column="9"/>
     </issue>
@@ -49232,7 +48572,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="171"
             column="9"/>
     </issue>
@@ -49243,7 +48583,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="176"
             column="19"/>
     </issue>
@@ -49254,7 +48594,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom(java.io.InputStream input)"
         errorLine2="                                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="176"
             column="80"/>
     </issue>
@@ -49265,7 +48605,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="181"
             column="19"/>
     </issue>
@@ -49276,7 +48616,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="182"
             column="9"/>
     </issue>
@@ -49287,7 +48627,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="183"
             column="9"/>
     </issue>
@@ -49298,7 +48638,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="188"
             column="19"/>
     </issue>
@@ -49309,7 +48649,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseDelimitedFrom(java.io.InputStream input)"
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="188"
             column="89"/>
     </issue>
@@ -49320,7 +48660,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseDelimitedFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="192"
             column="19"/>
     </issue>
@@ -49331,7 +48671,7 @@
         errorLine1="        java.io.InputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="193"
             column="9"/>
     </issue>
@@ -49342,7 +48682,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="194"
             column="9"/>
     </issue>
@@ -49353,7 +48693,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="198"
             column="19"/>
     </issue>
@@ -49364,7 +48704,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="199"
             column="9"/>
     </issue>
@@ -49375,7 +48715,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo parseFrom("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="204"
             column="19"/>
     </issue>
@@ -49386,7 +48726,7 @@
         errorLine1="        com.google.protobuf.CodedInputStream input,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="205"
             column="9"/>
     </issue>
@@ -49397,7 +48737,7 @@
         errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="206"
             column="9"/>
     </issue>
@@ -49408,7 +48748,7 @@
         errorLine1="    public static Builder newBuilder() {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="212"
             column="19"/>
     </issue>
@@ -49419,7 +48759,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.VersionProto.VersionInfo prototype) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="215"
             column="19"/>
     </issue>
@@ -49430,7 +48770,7 @@
         errorLine1="    public static Builder newBuilder(androidx.wear.tiles.proto.VersionProto.VersionInfo prototype) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="215"
             column="38"/>
     </issue>
@@ -49441,7 +48781,7 @@
         errorLine1="      public Builder setMajor(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="261"
             column="14"/>
     </issue>
@@ -49452,7 +48792,7 @@
         errorLine1="      public Builder clearMajor() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="275"
             column="14"/>
     </issue>
@@ -49463,7 +48803,7 @@
         errorLine1="      public Builder setMinor(int value) {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="306"
             column="14"/>
     </issue>
@@ -49474,7 +48814,7 @@
         errorLine1="      public Builder clearMinor() {"
         errorLine2="             ~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="321"
             column="14"/>
     </issue>
@@ -49485,7 +48825,7 @@
         errorLine1="    protected final java.lang.Object dynamicMethod("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="331"
             column="21"/>
     </issue>
@@ -49496,7 +48836,7 @@
         errorLine1="        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="332"
             column="9"/>
     </issue>
@@ -49507,7 +48847,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="333"
             column="9"/>
     </issue>
@@ -49518,7 +48858,7 @@
         errorLine1="        java.lang.Object arg0, java.lang.Object arg1) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="333"
             column="32"/>
     </issue>
@@ -49529,7 +48869,7 @@
         errorLine1="    public static androidx.wear.tiles.proto.VersionProto.VersionInfo getDefaultInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="392"
             column="19"/>
     </issue>
@@ -49540,7 +48880,7 @@
         errorLine1="    public static com.google.protobuf.Parser&lt;VersionInfo> parser() {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="../../../../out/androidx/wear/wear-tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/VersionProto.java"
             line="398"
             column="19"/>
     </issue>

wear/tiles/tiles-proto/src/main/java/androidx/wear/tiles/proto/package-info.java

diff --git a/wear/wear-tiles-proto/src/main/java/androidx/wear/tiles/proto/package-info.java b/wear/tiles/tiles-proto/src/main/java/androidx/wear/tiles/proto/package-info.java
similarity index 100%
rename from wear/wear-tiles-proto/src/main/java/androidx/wear/tiles/proto/package-info.java
rename to wear/tiles/tiles-proto/src/main/java/androidx/wear/tiles/proto/package-info.java

wear/tiles/tiles-proto/src/main/proto/action.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/action.proto b/wear/tiles/tiles-proto/src/main/proto/action.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/action.proto
rename to wear/tiles/tiles-proto/src/main/proto/action.proto

wear/tiles/tiles-proto/src/main/proto/color.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/color.proto b/wear/tiles/tiles-proto/src/main/proto/color.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/color.proto
rename to wear/tiles/tiles-proto/src/main/proto/color.proto

wear/tiles/tiles-proto/src/main/proto/device_parameters.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/device_parameters.proto b/wear/tiles/tiles-proto/src/main/proto/device_parameters.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/device_parameters.proto
rename to wear/tiles/tiles-proto/src/main/proto/device_parameters.proto

wear/tiles/tiles-proto/src/main/proto/dimension.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/dimension.proto b/wear/tiles/tiles-proto/src/main/proto/dimension.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/dimension.proto
rename to wear/tiles/tiles-proto/src/main/proto/dimension.proto

wear/tiles/tiles-proto/src/main/proto/events.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/events.proto b/wear/tiles/tiles-proto/src/main/proto/events.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/events.proto
rename to wear/tiles/tiles-proto/src/main/proto/events.proto

wear/tiles/tiles-proto/src/main/proto/layout.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/layout.proto b/wear/tiles/tiles-proto/src/main/proto/layout.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/layout.proto
rename to wear/tiles/tiles-proto/src/main/proto/layout.proto

wear/tiles/tiles-proto/src/main/proto/modifiers.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/modifiers.proto b/wear/tiles/tiles-proto/src/main/proto/modifiers.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/modifiers.proto
rename to wear/tiles/tiles-proto/src/main/proto/modifiers.proto

wear/tiles/tiles-proto/src/main/proto/requests.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/requests.proto b/wear/tiles/tiles-proto/src/main/proto/requests.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/requests.proto
rename to wear/tiles/tiles-proto/src/main/proto/requests.proto

wear/tiles/tiles-proto/src/main/proto/resources.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/resources.proto b/wear/tiles/tiles-proto/src/main/proto/resources.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/resources.proto
rename to wear/tiles/tiles-proto/src/main/proto/resources.proto

wear/tiles/tiles-proto/src/main/proto/state.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/state.proto b/wear/tiles/tiles-proto/src/main/proto/state.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/state.proto
rename to wear/tiles/tiles-proto/src/main/proto/state.proto

wear/tiles/tiles-proto/src/main/proto/tile.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/tile.proto b/wear/tiles/tiles-proto/src/main/proto/tile.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/tile.proto
rename to wear/tiles/tiles-proto/src/main/proto/tile.proto

wear/tiles/tiles-proto/src/main/proto/timeline.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/timeline.proto b/wear/tiles/tiles-proto/src/main/proto/timeline.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/timeline.proto
rename to wear/tiles/tiles-proto/src/main/proto/timeline.proto

wear/tiles/tiles-proto/src/main/proto/types.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/types.proto b/wear/tiles/tiles-proto/src/main/proto/types.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/types.proto
rename to wear/tiles/tiles-proto/src/main/proto/types.proto

wear/tiles/tiles-proto/src/main/proto/version.proto

diff --git a/wear/wear-tiles-proto/src/main/proto/version.proto b/wear/tiles/tiles-proto/src/main/proto/version.proto
similarity index 100%
rename from wear/wear-tiles-proto/src/main/proto/version.proto
rename to wear/tiles/tiles-proto/src/main/proto/version.proto

wear/tiles/tiles-renderer/api/current.txt

diff --git a/wear/wear-tiles-renderer/api/current.txt b/wear/tiles/tiles-renderer/api/current.txt
similarity index 100%
rename from wear/wear-tiles-renderer/api/current.txt
rename to wear/tiles/tiles-renderer/api/current.txt

wear/tiles/tiles-renderer/api/public_plus_experimental_current.txt

diff --git a/wear/wear-tiles-renderer/api/public_plus_experimental_current.txt b/wear/tiles/tiles-renderer/api/public_plus_experimental_current.txt
similarity index 100%
rename from wear/wear-tiles-renderer/api/public_plus_experimental_current.txt
rename to wear/tiles/tiles-renderer/api/public_plus_experimental_current.txt

wear/tiles/tiles-renderer/api/res-current.txt

diff --git a/wear/wear-tiles-renderer/api/res-current.txt b/wear/tiles/tiles-renderer/api/res-current.txt
similarity index 100%
rename from wear/wear-tiles-renderer/api/res-current.txt
rename to wear/tiles/tiles-renderer/api/res-current.txt

wear/tiles/tiles-renderer/api/restricted_current.txt

diff --git a/wear/wear-tiles-renderer/api/restricted_current.txt b/wear/tiles/tiles-renderer/api/restricted_current.txt
similarity index 100%
rename from wear/wear-tiles-renderer/api/restricted_current.txt
rename to wear/tiles/tiles-renderer/api/restricted_current.txt

wear/tiles/tiles-renderer/build.gradle

diff --git a/wear/wear-tiles-renderer/build.gradle b/wear/tiles/tiles-renderer/build.gradle
similarity index 90%
rename from wear/wear-tiles-renderer/build.gradle
rename to wear/tiles/tiles-renderer/build.gradle
index b405d45..b65ef4c 100644
--- a/wear/wear-tiles-renderer/build.gradle
+++ b/wear/tiles/tiles-renderer/build.gradle
@@ -35,12 +35,12 @@
     implementation 'androidx.annotation:annotation:1.2.0-alpha01'
     implementation "androidx.concurrent:concurrent-futures:1.1.0"
     implementation "androidx.core:core:1.3.2"
-    implementation(project(":wear:wear-tiles"))
-    implementation(project(path: ":wear:wear-tiles-proto", configuration: "shadow"))
+    implementation(project(":wear:tiles:tiles"))
+    implementation(project(path: ":wear:tiles:tiles-proto", configuration: "shadow"))
     implementation(KOTLIN_COROUTINES_CORE)
     implementation(KOTLIN_COROUTINES_ANDROID)
 
-    androidTestImplementation(project(path: ":wear:wear-tiles-proto", configuration: "shadow"))
+    androidTestImplementation(project(path: ":wear:tiles:tiles-proto", configuration: "shadow"))
     androidTestImplementation(project(":test-screenshot"))
     androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
     androidTestImplementation(ANDROIDX_TEST_CORE)
@@ -99,8 +99,7 @@
 androidx {
     name = "Android Wear Tiles Renderer"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR
-    // Tie the versions together to keep everything simpler.
+    mavenGroup = LibraryGroups.WEAR_TILES
     mavenVersion = LibraryVersions.WEAR_TILES
     inceptionYear = "2021"
     description = "Android Wear Tiles Renderer components. These components can be used to parse " +

wear/tiles/tiles-renderer/src/androidTest/AndroidManifest.xml

diff --git a/wear/wear-tiles-renderer/src/androidTest/AndroidManifest.xml b/wear/tiles/tiles-renderer/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/AndroidManifest.xml
rename to wear/tiles/tiles-renderer/src/androidTest/AndroidManifest.xml

wear/tiles/tiles-renderer/src/androidTest/java/androidx/wear/tiles/renderer/test/TileRendererGoldenTest.java

diff --git a/wear/wear-tiles-renderer/src/androidTest/java/androidx/wear/tiles/renderer/test/TileRendererGoldenTest.java b/wear/tiles/tiles-renderer/src/androidTest/java/androidx/wear/tiles/renderer/test/TileRendererGoldenTest.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/java/androidx/wear/tiles/renderer/test/TileRendererGoldenTest.java
rename to wear/tiles/tiles-renderer/src/androidTest/java/androidx/wear/tiles/renderer/test/TileRendererGoldenTest.java

wear/tiles/tiles-renderer/src/androidTest/proto/action.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/action.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/action.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/action.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/action.proto

wear/tiles/tiles-renderer/src/androidTest/proto/color.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/color.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/color.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/color.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/color.proto

wear/tiles/tiles-renderer/src/androidTest/proto/device_parameters.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/device_parameters.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/device_parameters.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/device_parameters.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/device_parameters.proto

wear/tiles/tiles-renderer/src/androidTest/proto/dimension.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/dimension.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/dimension.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/dimension.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/dimension.proto

wear/tiles/tiles-renderer/src/androidTest/proto/events.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/events.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/events.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/events.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/events.proto

wear/tiles/tiles-renderer/src/androidTest/proto/layout.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/layout.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/layout.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/layout.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/layout.proto

wear/tiles/tiles-renderer/src/androidTest/proto/modifiers.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/modifiers.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/modifiers.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/modifiers.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/modifiers.proto

wear/tiles/tiles-renderer/src/androidTest/proto/requests.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/requests.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/requests.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/requests.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/requests.proto

wear/tiles/tiles-renderer/src/androidTest/proto/resources.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/resources.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/resources.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/resources.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/resources.proto

wear/tiles/tiles-renderer/src/androidTest/proto/state.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/state.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/state.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/state.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/state.proto

wear/tiles/tiles-renderer/src/androidTest/proto/tile.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/tile.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/tile.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/tile.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/tile.proto

wear/tiles/tiles-renderer/src/androidTest/proto/timeline.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/timeline.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/timeline.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/timeline.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/timeline.proto

wear/tiles/tiles-renderer/src/androidTest/proto/types.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/types.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/types.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/types.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/types.proto

wear/tiles/tiles-renderer/src/androidTest/proto/version.proto

diff --git a/wear/wear-tiles-renderer/src/androidTest/proto/version.proto b/wear/tiles/tiles-renderer/src/androidTest/proto/version.proto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/proto/version.proto
rename to wear/tiles/tiles-renderer/src/androidTest/proto/version.proto

wear/tiles/tiles-renderer/src/androidTest/res/drawable/android_24dp.xml

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/drawable/android_24dp.xml b/wear/tiles/tiles-renderer/src/androidTest/res/drawable/android_24dp.xml
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/drawable/android_24dp.xml
rename to wear/tiles/tiles-renderer/src/androidTest/res/drawable/android_24dp.xml

wear/tiles/tiles-renderer/src/androidTest/res/drawable/broken_drawable.xml

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/drawable/broken_drawable.xml b/wear/tiles/tiles-renderer/src/androidTest/res/drawable/broken_drawable.xml
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/drawable/broken_drawable.xml
rename to wear/tiles/tiles-renderer/src/androidTest/res/drawable/broken_drawable.xml

wear/tiles/tiles-renderer/src/androidTest/res/drawable/filled_image.png

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/drawable/filled_image.png b/wear/tiles/tiles-renderer/src/androidTest/res/drawable/filled_image.png
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/drawable/filled_image.png
rename to wear/tiles/tiles-renderer/src/androidTest/res/drawable/filled_image.png
Binary files differ

wear/tiles/tiles-renderer/src/androidTest/res/drawable/ic_channel_foreground.xml

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/drawable/ic_channel_foreground.xml b/wear/tiles/tiles-renderer/src/androidTest/res/drawable/ic_channel_foreground.xml
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/drawable/ic_channel_foreground.xml
rename to wear/tiles/tiles-renderer/src/androidTest/res/drawable/ic_channel_foreground.xml

wear/tiles/tiles-renderer/src/androidTest/res/mipmap-anydpi-v26/android_withbg_120dp.xml

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/mipmap-anydpi-v26/android_withbg_120dp.xml b/wear/tiles/tiles-renderer/src/androidTest/res/mipmap-anydpi-v26/android_withbg_120dp.xml
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/mipmap-anydpi-v26/android_withbg_120dp.xml
rename to wear/tiles/tiles-renderer/src/androidTest/res/mipmap-anydpi-v26/android_withbg_120dp.xml

wear/tiles/tiles-renderer/src/androidTest/res/raw/all_modifiers.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/all_modifiers.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/all_modifiers.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/all_modifiers.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/all_modifiers.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_above_360.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/arc_above_360.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_above_360.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/arc_above_360.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_above_360.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_alignment.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/arc_alignment.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_alignment.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/arc_alignment.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_alignment.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_alignment_mixed_types.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/arc_alignment_mixed_types.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_alignment_mixed_types.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/arc_alignment_mixed_types.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_alignment_mixed_types.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_anchors.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/arc_anchors.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_anchors.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/arc_anchors.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_anchors.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_text_and_lines.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/arc_text_and_lines.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_text_and_lines.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/arc_text_and_lines.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_text_and_lines.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_with_buttons_rotated.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/arc_with_buttons_rotated.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_with_buttons_rotated.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/arc_with_buttons_rotated.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_with_buttons_rotated.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_with_buttons_unrotated.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/arc_with_buttons_unrotated.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_with_buttons_unrotated.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/arc_with_buttons_unrotated.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/arc_with_buttons_unrotated.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/box_with_corners_and_border.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/box_with_corners_and_border.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/box_with_corners_and_border.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/box_with_corners_and_border.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/box_with_corners_and_border.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/box_with_corners_and_border_rtlaware.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/box_with_corners_and_border_rtlaware.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/box_with_corners_and_border_rtlaware.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/box_with_corners_and_border_rtlaware.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/box_with_corners_and_border_rtlaware.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/box_with_fixed_size.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/box_with_fixed_size.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/box_with_fixed_size.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/box_with_fixed_size.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/box_with_fixed_size.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/broken_drawable.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/broken_drawable.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/broken_drawable.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/broken_drawable.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/broken_drawable.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/column_with_alignment.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/column_with_alignment.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/column_with_alignment.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/column_with_alignment.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/column_with_alignment.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/column_with_alignment_rtlaware.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/column_with_alignment_rtlaware.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/column_with_alignment_rtlaware.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/column_with_alignment_rtlaware.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/column_with_alignment_rtlaware.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/column_with_height.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/column_with_height.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/column_with_height.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/column_with_height.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/column_with_height.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_box_horizontal.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/expanded_box_horizontal.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_box_horizontal.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/expanded_box_horizontal.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_box_horizontal.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_box_horizontal_right_align.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/expanded_box_horizontal_right_align.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_box_horizontal_right_align.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/expanded_box_horizontal_right_align.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_box_horizontal_right_align.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_box_vertical.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/expanded_box_vertical.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_box_vertical.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/expanded_box_vertical.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_box_vertical.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_children_in_row.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/expanded_children_in_row.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_children_in_row.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/expanded_children_in_row.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/expanded_children_in_row.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/font_weights_in_arc.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/font_weights_in_arc.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/font_weights_in_arc.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/font_weights_in_arc.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/font_weights_in_arc.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/font_weights_in_spannable.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/font_weights_in_spannable.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/font_weights_in_spannable.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/font_weights_in_spannable.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/font_weights_in_spannable.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/image_expand_modes.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/image_expand_modes.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/image_expand_modes.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/image_expand_modes.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/image_expand_modes.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/image_expanded_to_parent.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/image_expanded_to_parent.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/image_expanded_to_parent.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/image_expanded_to_parent.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/image_expanded_to_parent.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/image_oversized_in_box.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/image_oversized_in_box.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/image_oversized_in_box.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/image_oversized_in_box.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/image_oversized_in_box.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/image_oversized_in_box_proportional.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/image_oversized_in_box_proportional.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/image_oversized_in_box_proportional.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/image_oversized_in_box_proportional.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/image_oversized_in_box_proportional.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/image_proportional_resize.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/image_proportional_resize.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/image_proportional_resize.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/image_proportional_resize.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/image_proportional_resize.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/image_with_dimensions.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/image_with_dimensions.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/image_with_dimensions.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/image_with_dimensions.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/image_with_dimensions.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/image_with_inline_data.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/image_with_inline_data.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/image_with_inline_data.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/image_with_inline_data.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/image_with_inline_data.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/image_with_padding.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/image_with_padding.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/image_with_padding.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/image_with_padding.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/image_with_padding.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/line_in_arc.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/line_in_arc.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/line_in_arc.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/line_in_arc.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/line_in_arc.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/line_multi_height.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/line_multi_height.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/line_multi_height.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/line_multi_height.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/line_multi_height.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/long_text.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/long_text.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/long_text.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/long_text.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/long_text.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/multi_line_text_alignment.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/multi_line_text_alignment.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/multi_line_text_alignment.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/multi_line_text_alignment.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/multi_line_text_alignment.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/row_column_space_test.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/row_column_space_test.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/row_column_space_test.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/row_column_space_test.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/row_column_space_test.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/row_with_alignment.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/row_with_alignment.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/row_with_alignment.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/row_with_alignment.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/row_with_alignment.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/row_with_width.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/row_with_width.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/row_with_width.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/row_with_width.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/row_with_width.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/simple_text.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/simple_text.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/simple_text.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/simple_text.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/simple_text.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/single_line_text_alignment.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/single_line_text_alignment.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/single_line_text_alignment.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/single_line_text_alignment.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/single_line_text_alignment.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/spacer_horizontal.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/spacer_horizontal.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/spacer_horizontal.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/spacer_horizontal.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/spacer_horizontal.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/spacer_in_arc.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/spacer_in_arc.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/spacer_in_arc.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/spacer_in_arc.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/spacer_in_arc.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/spacer_vertical.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/spacer_vertical.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/spacer_vertical.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/spacer_vertical.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/spacer_vertical.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_image.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/spannable_image.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_image.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/spannable_image.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_image.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_image_with_clickable.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/spannable_image_with_clickable.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_image_with_clickable.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/spannable_image_with_clickable.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_image_with_clickable.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_image_wrapped.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/spannable_image_wrapped.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_image_wrapped.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/spannable_image_wrapped.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_image_wrapped.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_text.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/spannable_text.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_text.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/spannable_text.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/spannable_text.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/text_and_image_in_box.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/text_and_image_in_box.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/text_and_image_in_box.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/text_and_image_in_box.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/text_and_image_in_box.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/text_default_size.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/text_default_size.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/text_default_size.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/text_default_size.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/text_default_size.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/text_in_column.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/text_in_column.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/text_in_column.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/text_in_column.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/text_in_column.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/text_in_row.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/text_in_row.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/text_in_row.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/text_in_row.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/text_in_row.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_font_weights.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/text_with_font_weights.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_font_weights.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/text_with_font_weights.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_font_weights.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_font_weights_italic.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/text_with_font_weights_italic.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_font_weights_italic.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/text_with_font_weights_italic.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_font_weights_italic.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_spacing.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/text_with_spacing.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_spacing.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/text_with_spacing.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_spacing.textproto

wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_style_no_color.textproto

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/raw/text_with_style_no_color.textproto b/wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_style_no_color.textproto
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/raw/text_with_style_no_color.textproto
rename to wear/tiles/tiles-renderer/src/androidTest/res/raw/text_with_style_no_color.textproto

wear/tiles/tiles-renderer/src/androidTest/res/values/ic_channel_background.xml

diff --git a/wear/wear-tiles-renderer/src/androidTest/res/values/ic_channel_background.xml b/wear/tiles/tiles-renderer/src/androidTest/res/values/ic_channel_background.xml
similarity index 100%
rename from wear/wear-tiles-renderer/src/androidTest/res/values/ic_channel_background.xml
rename to wear/tiles/tiles-renderer/src/androidTest/res/values/ic_channel_background.xml

wear/tiles/tiles-renderer/src/main/AndroidManifest.xml

diff --git a/wear/wear-tiles-renderer/src/main/AndroidManifest.xml b/wear/tiles/tiles-renderer/src/main/AndroidManifest.xml
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/AndroidManifest.xml
rename to wear/tiles/tiles-renderer/src/main/AndroidManifest.xml

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/connection/TilesConnection.kt

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/connection/TilesConnection.kt b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/connection/TilesConnection.kt
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/connection/TilesConnection.kt
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/connection/TilesConnection.kt

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/connection/TilesConnectionBinder.kt

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/connection/TilesConnectionBinder.kt b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/connection/TilesConnectionBinder.kt
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/connection/TilesConnectionBinder.kt
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/connection/TilesConnectionBinder.kt

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/manager/TileManager.kt

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/manager/TileManager.kt b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/manager/TileManager.kt
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/manager/TileManager.kt
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/manager/TileManager.kt

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/manager/UpdateScheduler.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/manager/UpdateScheduler.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/manager/UpdateScheduler.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/manager/UpdateScheduler.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/manager/UpdateScheduler.java

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/AndroidResourceAccessor.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/AndroidResourceAccessor.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/AndroidResourceAccessor.java
similarity index 93%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/AndroidResourceAccessor.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/AndroidResourceAccessor.java
index a9e6c2a..8b02a0b 100644
--- a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/AndroidResourceAccessor.java
+++ b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/AndroidResourceAccessor.java
@@ -16,6 +16,7 @@
 
 package androidx.wear.tiles.renderer;
 
+import android.annotation.SuppressLint;
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.graphics.drawable.Drawable;
@@ -49,6 +50,7 @@
 
     @Override
     @NonNull
+    @SuppressLint("RestrictedApi") // TODO(b/183006740): Remove when prefix check is fixed.
     public ListenableFuture<Drawable> getDrawable(@NonNull AndroidImageResourceByResId resource) {
         ResolvableFuture<Drawable> future = ResolvableFuture.create();
         try {

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/InlineResourceAccessor.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/InlineResourceAccessor.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/InlineResourceAccessor.java
similarity index 96%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/InlineResourceAccessor.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/InlineResourceAccessor.java
index c8a1f63..fc8f2d5 100644
--- a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/InlineResourceAccessor.java
+++ b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/InlineResourceAccessor.java
@@ -16,6 +16,7 @@
 
 package androidx.wear.tiles.renderer;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -64,6 +65,7 @@
 
     @Override
     @NonNull
+    @SuppressLint("RestrictedApi") // TODO(b/183006740): Remove when prefix check is fixed.
     public ListenableFuture<Drawable> getDrawable(@NonNull InlineImageResource inlineImage) {
         Config config = imageFormatToBitmapConfig(inlineImage.getFormat());
         ResolvableFuture<Drawable> future = ResolvableFuture.create();

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/LetterSpacingSpan.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/LetterSpacingSpan.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/LetterSpacingSpan.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/LetterSpacingSpan.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/LetterSpacingSpan.java

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/RatioViewWrapper.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/RatioViewWrapper.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/RatioViewWrapper.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/RatioViewWrapper.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/RatioViewWrapper.java

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/ResourceAccessors.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/ResourceAccessors.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/ResourceAccessors.java
similarity index 98%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/ResourceAccessors.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/ResourceAccessors.java
index 4a297d3..2f8ee24 100644
--- a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/ResourceAccessors.java
+++ b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/ResourceAccessors.java
@@ -83,6 +83,7 @@
 
     /** Get the drawable corresponding to the given resource ID. */
     @NonNull
+    @SuppressLint("RestrictedApi") // TODO(b/183006740): Remove when prefix check is fixed.
     public ListenableFuture<Drawable> getDrawable(@NonNull String protoResourceId) {
         ResolvableFuture<Drawable> errorFuture = ResolvableFuture.create();
         ResourceProto.ImageResource imageResource =

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/StandardResourceAccessors.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/StandardResourceAccessors.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/StandardResourceAccessors.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/StandardResourceAccessors.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/StandardResourceAccessors.java

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/TileRenderer.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/TileRenderer.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/TileRenderer.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/TileRenderer.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/TileRenderer.java

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearArcLayout.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearArcLayout.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearArcLayout.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearArcLayout.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearArcLayout.java

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedLineView.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedLineView.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedLineView.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedLineView.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedLineView.java

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedSpacer.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedSpacer.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedSpacer.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedSpacer.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedSpacer.java

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedTextView.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedTextView.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedTextView.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedTextView.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/WearCurvedTextView.java

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/timeline/TilesTimelineCache.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/timeline/TilesTimelineCache.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/timeline/TilesTimelineCache.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/timeline/TilesTimelineCache.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/timeline/TilesTimelineCache.java

wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/timeline/TilesTimelineManager.java

diff --git a/wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/timeline/TilesTimelineManager.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/timeline/TilesTimelineManager.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/java/androidx/wear/tiles/timeline/TilesTimelineManager.java
rename to wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/timeline/TilesTimelineManager.java

wear/tiles/tiles-renderer/src/main/res/values-sw210dp-round/styles.xml

diff --git a/wear/wear-tiles-renderer/src/main/res/values-sw210dp-round/styles.xml b/wear/tiles/tiles-renderer/src/main/res/values-sw210dp-round/styles.xml
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/res/values-sw210dp-round/styles.xml
rename to wear/tiles/tiles-renderer/src/main/res/values-sw210dp-round/styles.xml

wear/tiles/tiles-renderer/src/main/res/values/attrs.xml

diff --git a/wear/wear-tiles-renderer/src/main/res/values/attrs.xml b/wear/tiles/tiles-renderer/src/main/res/values/attrs.xml
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/res/values/attrs.xml
rename to wear/tiles/tiles-renderer/src/main/res/values/attrs.xml

wear/tiles/tiles-renderer/src/main/res/values/styles.xml

diff --git a/wear/wear-tiles-renderer/src/main/res/values/styles.xml b/wear/tiles/tiles-renderer/src/main/res/values/styles.xml
similarity index 100%
rename from wear/wear-tiles-renderer/src/main/res/values/styles.xml
rename to wear/tiles/tiles-renderer/src/main/res/values/styles.xml

wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/TilesTestRunner.kt

diff --git a/wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/TilesTestRunner.kt b/wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/TilesTestRunner.kt
similarity index 100%
rename from wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/TilesTestRunner.kt
rename to wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/TilesTestRunner.kt

wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/connection/TilesConnectionBinderTest.kt

diff --git a/wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/connection/TilesConnectionBinderTest.kt b/wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/connection/TilesConnectionBinderTest.kt
similarity index 100%
rename from wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/connection/TilesConnectionBinderTest.kt
rename to wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/connection/TilesConnectionBinderTest.kt

wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/connection/TilesConnectionTest.kt

diff --git a/wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/connection/TilesConnectionTest.kt b/wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/connection/TilesConnectionTest.kt
similarity index 100%
rename from wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/connection/TilesConnectionTest.kt
rename to wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/connection/TilesConnectionTest.kt

wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/manager/UpdateSchedulerTest.java

diff --git a/wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/manager/UpdateSchedulerTest.java b/wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/manager/UpdateSchedulerTest.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/manager/UpdateSchedulerTest.java
rename to wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/manager/UpdateSchedulerTest.java

wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/timeline/TilesTimelineCacheTest.java

diff --git a/wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/timeline/TilesTimelineCacheTest.java b/wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/timeline/TilesTimelineCacheTest.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/timeline/TilesTimelineCacheTest.java
rename to wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/timeline/TilesTimelineCacheTest.java

wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/timeline/TilesTimelineManagerTest.java

diff --git a/wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/timeline/TilesTimelineManagerTest.java b/wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/timeline/TilesTimelineManagerTest.java
similarity index 100%
rename from wear/wear-tiles-renderer/src/test/java/androidx/wear/tiles/timeline/TilesTimelineManagerTest.java
rename to wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/timeline/TilesTimelineManagerTest.java

wear/tiles/tiles-renderer/src/test/resources/robolectric.properties

diff --git a/wear/wear-tiles-renderer/src/test/resources/robolectric.properties b/wear/tiles/tiles-renderer/src/test/resources/robolectric.properties
similarity index 100%
rename from wear/wear-tiles-renderer/src/test/resources/robolectric.properties
rename to wear/tiles/tiles-renderer/src/test/resources/robolectric.properties

wear/tiles/tiles/api/current.txt

diff --git a/wear/wear-tiles/api/current.txt b/wear/tiles/tiles/api/current.txt
similarity index 100%
rename from wear/wear-tiles/api/current.txt
rename to wear/tiles/tiles/api/current.txt

wear/tiles/tiles/api/public_plus_experimental_current.txt

diff --git a/wear/wear-tiles/api/public_plus_experimental_current.txt b/wear/tiles/tiles/api/public_plus_experimental_current.txt
similarity index 100%
rename from wear/wear-tiles/api/public_plus_experimental_current.txt
rename to wear/tiles/tiles/api/public_plus_experimental_current.txt

wear/tiles/tiles/api/res-current.txt

diff --git a/wear/wear-tiles/api/res-current.txt b/wear/tiles/tiles/api/res-current.txt
similarity index 100%
rename from wear/wear-tiles/api/res-current.txt
rename to wear/tiles/tiles/api/res-current.txt

wear/tiles/tiles/api/restricted_current.txt

diff --git a/wear/wear-tiles/api/current.txt b/wear/tiles/tiles/api/restricted_current.txt
similarity index 100%
copy from wear/wear-tiles/api/current.txt
copy to wear/tiles/tiles/api/restricted_current.txt

wear/tiles/tiles/build.gradle

diff --git a/wear/wear-tiles/build.gradle b/wear/tiles/tiles/build.gradle
similarity index 92%
rename from wear/wear-tiles/build.gradle
rename to wear/tiles/tiles/build.gradle
index 1ef127c..6023a84 100644
--- a/wear/wear-tiles/build.gradle
+++ b/wear/tiles/tiles/build.gradle
@@ -30,7 +30,7 @@
     api(GUAVA_LISTENABLE_FUTURE)
 
     implementation 'androidx.annotation:annotation:1.2.0-alpha01'
-    implementation(project(path: ":wear:wear-tiles-proto", configuration: "shadow"))
+    implementation(project(path: ":wear:tiles:tiles-proto", configuration: "shadow"))
 
     testImplementation(ANDROIDX_TEST_EXT_JUNIT)
     testImplementation(ANDROIDX_TEST_EXT_TRUTH)
@@ -56,7 +56,7 @@
 androidx {
     name = "Android Wear Tiles"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR
+    mavenGroup = LibraryGroups.WEAR_TILES
     mavenVersion = LibraryVersions.WEAR_TILES
     inceptionYear = "2020"
     description = "Android Wear Tiles"

wear/tiles/tiles/lint-baseline.xml

diff --git a/wear/wear-tiles/lint-baseline.xml b/wear/tiles/tiles/lint-baseline.xml
similarity index 100%
rename from wear/wear-tiles/lint-baseline.xml
rename to wear/tiles/tiles/lint-baseline.xml

wear/tiles/tiles/src/main/AndroidManifest.xml

diff --git a/wear/wear-tiles/src/main/AndroidManifest.xml b/wear/tiles/tiles/src/main/AndroidManifest.xml
similarity index 100%
rename from wear/wear-tiles/src/main/AndroidManifest.xml
rename to wear/tiles/tiles/src/main/AndroidManifest.xml

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/ResourcesCallback.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/ResourcesCallback.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/ResourcesCallback.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/ResourcesCallback.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/ResourcesCallback.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/ResourcesData.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/ResourcesData.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/ResourcesData.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/ResourcesData.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/ResourcesData.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/ResourcesRequestData.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/ResourcesRequestData.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/ResourcesRequestData.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/ResourcesRequestData.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/ResourcesRequestData.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileAddEventData.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileAddEventData.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileAddEventData.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileAddEventData.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileAddEventData.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileCallback.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileCallback.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileCallback.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileCallback.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileCallback.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileData.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileData.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileData.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileData.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileData.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileEnterEventData.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileEnterEventData.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileEnterEventData.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileEnterEventData.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileEnterEventData.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileLeaveEventData.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileLeaveEventData.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileLeaveEventData.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileLeaveEventData.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileLeaveEventData.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileProvider.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileProvider.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileProvider.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileProvider.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileProvider.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileRemoveEventData.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileRemoveEventData.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileRemoveEventData.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileRemoveEventData.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileRemoveEventData.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileRequestData.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileRequestData.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileRequestData.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileRequestData.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileRequestData.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileUpdateRequestData.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileUpdateRequestData.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileUpdateRequestData.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileUpdateRequestData.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileUpdateRequestData.aidl

wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileUpdateRequesterService.aidl

diff --git a/wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileUpdateRequesterService.aidl b/wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileUpdateRequesterService.aidl
similarity index 100%
rename from wear/wear-tiles/src/main/aidl/androidx/wear/tiles/TileUpdateRequesterService.aidl
rename to wear/tiles/tiles/src/main/aidl/androidx/wear/tiles/TileUpdateRequesterService.aidl

wear/tiles/tiles/src/main/java/androidx/wear/tiles/CompositeTileUpdateRequester.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/CompositeTileUpdateRequester.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/CompositeTileUpdateRequester.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/CompositeTileUpdateRequester.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/CompositeTileUpdateRequester.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/ProtoParcelable.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/ProtoParcelable.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/ProtoParcelable.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/ProtoParcelable.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/ProtoParcelable.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/ResourcesData.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/ResourcesData.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/ResourcesData.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/ResourcesData.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/ResourcesData.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/ResourcesRequestData.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/ResourcesRequestData.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/ResourcesRequestData.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/ResourcesRequestData.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/ResourcesRequestData.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/SysUiTileUpdateRequester.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/SysUiTileUpdateRequester.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/SysUiTileUpdateRequester.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/SysUiTileUpdateRequester.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/SysUiTileUpdateRequester.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileAddEventData.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/TileAddEventData.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileAddEventData.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/TileAddEventData.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileAddEventData.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileData.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/TileData.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileData.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/TileData.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileData.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileEnterEventData.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/TileEnterEventData.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileEnterEventData.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/TileEnterEventData.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileEnterEventData.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileLeaveEventData.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/TileLeaveEventData.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileLeaveEventData.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/TileLeaveEventData.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileLeaveEventData.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileProviderService.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/TileProviderService.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileProviderService.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/TileProviderService.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileProviderService.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileRemoveEventData.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/TileRemoveEventData.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileRemoveEventData.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/TileRemoveEventData.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileRemoveEventData.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileRequestData.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/TileRequestData.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileRequestData.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/TileRequestData.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileRequestData.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileUpdateRequestData.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/TileUpdateRequestData.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileUpdateRequestData.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/TileUpdateRequestData.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileUpdateRequestData.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileUpdateRequester.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/TileUpdateRequester.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileUpdateRequester.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/TileUpdateRequester.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/TileUpdateRequester.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/ViewerTileUpdateRequester.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/ViewerTileUpdateRequester.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/ViewerTileUpdateRequester.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/ViewerTileUpdateRequester.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/ViewerTileUpdateRequester.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ActionBuilders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/ActionBuilders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ActionBuilders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/ActionBuilders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ActionBuilders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ColorBuilders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/ColorBuilders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ColorBuilders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/ColorBuilders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ColorBuilders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/DimensionBuilders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/DimensionBuilders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/DimensionBuilders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/DimensionBuilders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/DimensionBuilders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/LayoutElementBuilders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/LayoutElementBuilders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/LayoutElementBuilders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/LayoutElementBuilders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/LayoutElementBuilders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ModifiersBuilders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/ModifiersBuilders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ModifiersBuilders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/ModifiersBuilders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ModifiersBuilders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ResourceBuilders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/ResourceBuilders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ResourceBuilders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/ResourceBuilders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ResourceBuilders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/StateBuilders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/StateBuilders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/StateBuilders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/StateBuilders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/StateBuilders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/TileBuilders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/TileBuilders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/TileBuilders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/TileBuilders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/TileBuilders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/TimelineBuilders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/TimelineBuilders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/TimelineBuilders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/TimelineBuilders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/TimelineBuilders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/package-info.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/package-info.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/package-info.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/builders/package-info.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/package-info.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/package-info.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/package-info.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/package-info.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/package-info.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/package-info.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/DeviceParametersReaders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/readers/DeviceParametersReaders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/DeviceParametersReaders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/readers/DeviceParametersReaders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/DeviceParametersReaders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/EventReaders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/readers/EventReaders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/EventReaders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/readers/EventReaders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/EventReaders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/RequestReaders.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/readers/RequestReaders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/RequestReaders.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/readers/RequestReaders.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/RequestReaders.java

wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/package-info.java

diff --git a/wear/wear-tiles/src/main/java/androidx/wear/tiles/readers/package-info.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/package-info.java
similarity index 100%
rename from wear/wear-tiles/src/main/java/androidx/wear/tiles/readers/package-info.java
rename to wear/tiles/tiles/src/main/java/androidx/wear/tiles/readers/package-info.java

wear/tiles/tiles/src/test/java/androidx/wear/tiles/CompositeTileUpdateRequesterTest.java

diff --git a/wear/wear-tiles/src/test/java/androidx/wear/tiles/CompositeTileUpdateRequesterTest.java b/wear/tiles/tiles/src/test/java/androidx/wear/tiles/CompositeTileUpdateRequesterTest.java
similarity index 100%
rename from wear/wear-tiles/src/test/java/androidx/wear/tiles/CompositeTileUpdateRequesterTest.java
rename to wear/tiles/tiles/src/test/java/androidx/wear/tiles/CompositeTileUpdateRequesterTest.java

wear/tiles/tiles/src/test/java/androidx/wear/tiles/ProtoParcelableTest.java

diff --git a/wear/wear-tiles/src/test/java/androidx/wear/tiles/ProtoParcelableTest.java b/wear/tiles/tiles/src/test/java/androidx/wear/tiles/ProtoParcelableTest.java
similarity index 100%
rename from wear/wear-tiles/src/test/java/androidx/wear/tiles/ProtoParcelableTest.java
rename to wear/tiles/tiles/src/test/java/androidx/wear/tiles/ProtoParcelableTest.java

wear/tiles/tiles/src/test/java/androidx/wear/tiles/ResourcesDataTest.java

diff --git a/wear/wear-tiles/src/test/java/androidx/wear/tiles/ResourcesDataTest.java b/wear/tiles/tiles/src/test/java/androidx/wear/tiles/ResourcesDataTest.java
similarity index 100%
rename from wear/wear-tiles/src/test/java/androidx/wear/tiles/ResourcesDataTest.java
rename to wear/tiles/tiles/src/test/java/androidx/wear/tiles/ResourcesDataTest.java

wear/tiles/tiles/src/test/java/androidx/wear/tiles/ResourcesRequestDataTest.java

diff --git a/wear/wear-tiles/src/test/java/androidx/wear/tiles/ResourcesRequestDataTest.java b/wear/tiles/tiles/src/test/java/androidx/wear/tiles/ResourcesRequestDataTest.java
similarity index 100%
rename from wear/wear-tiles/src/test/java/androidx/wear/tiles/ResourcesRequestDataTest.java
rename to wear/tiles/tiles/src/test/java/androidx/wear/tiles/ResourcesRequestDataTest.java

wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileDataTest.java

diff --git a/wear/wear-tiles/src/test/java/androidx/wear/tiles/TileDataTest.java b/wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileDataTest.java
similarity index 100%
rename from wear/wear-tiles/src/test/java/androidx/wear/tiles/TileDataTest.java
rename to wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileDataTest.java

wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileProviderServiceTest.java

diff --git a/wear/wear-tiles/src/test/java/androidx/wear/tiles/TileProviderServiceTest.java b/wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileProviderServiceTest.java
similarity index 100%
rename from wear/wear-tiles/src/test/java/androidx/wear/tiles/TileProviderServiceTest.java
rename to wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileProviderServiceTest.java

wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileRequestDataTest.java

diff --git a/wear/wear-tiles/src/test/java/androidx/wear/tiles/TileRequestDataTest.java b/wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileRequestDataTest.java
similarity index 100%
rename from wear/wear-tiles/src/test/java/androidx/wear/tiles/TileRequestDataTest.java
rename to wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileRequestDataTest.java

wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileUpdateRequestDataTest.java

diff --git a/wear/wear-tiles/src/test/java/androidx/wear/tiles/TileUpdateRequestDataTest.java b/wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileUpdateRequestDataTest.java
similarity index 100%
rename from wear/wear-tiles/src/test/java/androidx/wear/tiles/TileUpdateRequestDataTest.java
rename to wear/tiles/tiles/src/test/java/androidx/wear/tiles/TileUpdateRequestDataTest.java

wear/tiles/tiles/src/test/resources/robolectric.properties

diff --git a/wear/wear-tiles/src/test/resources/robolectric.properties b/wear/tiles/tiles/src/test/resources/robolectric.properties
similarity index 100%
rename from wear/wear-tiles/src/test/resources/robolectric.properties
rename to wear/tiles/tiles/src/test/resources/robolectric.properties

wear/wear-complications-data/api/current.txt

diff --git a/wear/wear-complications-data/api/current.txt b/wear/wear-complications-data/api/current.txt
index 304c950..81e1229 100644
--- a/wear/wear-complications-data/api/current.txt
+++ b/wear/wear-complications-data/api/current.txt
@@ -185,7 +185,6 @@
     field public static final int DAY_AND_DATE = 16; // 0x10
     field public static final int DAY_OF_WEEK = 13; // 0xd
     field public static final int FAVORITE_CONTACT = 14; // 0xe
-    field public static final int GOOGLE_PAY = 8; // 0x8
     field public static final int MOST_RECENT_APP = 15; // 0xf
     field public static final int NEXT_EVENT = 9; // 0x9
     field public static final int NO_PROVIDER = -1; // 0xffffffff

wear/wear-complications-data/api/public_plus_experimental_current.txt

diff --git a/wear/wear-complications-data/api/public_plus_experimental_current.txt b/wear/wear-complications-data/api/public_plus_experimental_current.txt
index 937238d..8829abf 100644
--- a/wear/wear-complications-data/api/public_plus_experimental_current.txt
+++ b/wear/wear-complications-data/api/public_plus_experimental_current.txt
@@ -185,7 +185,6 @@
     field public static final int DAY_AND_DATE = 16; // 0x10
     field public static final int DAY_OF_WEEK = 13; // 0xd
     field public static final int FAVORITE_CONTACT = 14; // 0xe
-    field public static final int GOOGLE_PAY = 8; // 0x8
     field public static final int MOST_RECENT_APP = 15; // 0xf
     field public static final int NEXT_EVENT = 9; // 0x9
     field public static final int NO_PROVIDER = -1; // 0xffffffff
@@ -244,7 +243,7 @@
   }
 
   public final class DataKt {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.complications.data.ComplicationData asApiComplicationData(android.support.wearable.complications.ComplicationData);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.complications.data.ComplicationData toApiComplicationData(android.support.wearable.complications.ComplicationData);
   }
 
   public final class EmptyComplicationData extends androidx.wear.complications.data.ComplicationData {

wear/wear-complications-data/api/restricted_current.txt

diff --git a/wear/wear-complications-data/api/restricted_current.txt b/wear/wear-complications-data/api/restricted_current.txt
index c9d49f8..2c16c7d 100644
--- a/wear/wear-complications-data/api/restricted_current.txt
+++ b/wear/wear-complications-data/api/restricted_current.txt
@@ -230,7 +230,6 @@
     field public static final int DAY_AND_DATE = 16; // 0x10
     field public static final int DAY_OF_WEEK = 13; // 0xd
     field public static final int FAVORITE_CONTACT = 14; // 0xe
-    field public static final int GOOGLE_PAY = 8; // 0x8
     field public static final int MOST_RECENT_APP = 15; // 0xf
     field public static final int NEXT_EVENT = 9; // 0x9
     field public static final int NO_PROVIDER = -1; // 0xffffffff
@@ -244,7 +243,7 @@
     field public static final int WORLD_CLOCK = 5; // 0x5
   }
 
-  @IntDef({androidx.wear.complications.SystemProviders.NO_PROVIDER, androidx.wear.complications.SystemProviders.WATCH_BATTERY, androidx.wear.complications.SystemProviders.DATE, androidx.wear.complications.SystemProviders.TIME_AND_DATE, androidx.wear.complications.SystemProviders.STEP_COUNT, androidx.wear.complications.SystemProviders.WORLD_CLOCK, androidx.wear.complications.SystemProviders.APP_SHORTCUT, androidx.wear.complications.SystemProviders.UNREAD_NOTIFICATION_COUNT, androidx.wear.complications.SystemProviders.GOOGLE_PAY, androidx.wear.complications.SystemProviders.NEXT_EVENT, androidx.wear.complications.SystemProviders.RETAIL_STEP_COUNT, androidx.wear.complications.SystemProviders.RETAIL_CHAT, androidx.wear.complications.SystemProviders.SUNRISE_SUNSET, androidx.wear.complications.SystemProviders.DAY_OF_WEEK, androidx.wear.complications.SystemProviders.FAVORITE_CONTACT, androidx.wear.complications.SystemProviders.MOST_RECENT_APP, androidx.wear.complications.SystemProviders.DAY_AND_DATE}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface SystemProviders.ProviderId {
+  @IntDef({androidx.wear.complications.SystemProviders.NO_PROVIDER, androidx.wear.complications.SystemProviders.WATCH_BATTERY, androidx.wear.complications.SystemProviders.DATE, androidx.wear.complications.SystemProviders.TIME_AND_DATE, androidx.wear.complications.SystemProviders.STEP_COUNT, androidx.wear.complications.SystemProviders.WORLD_CLOCK, androidx.wear.complications.SystemProviders.APP_SHORTCUT, androidx.wear.complications.SystemProviders.UNREAD_NOTIFICATION_COUNT, androidx.wear.complications.SystemProviders.NEXT_EVENT, androidx.wear.complications.SystemProviders.RETAIL_STEP_COUNT, androidx.wear.complications.SystemProviders.RETAIL_CHAT, androidx.wear.complications.SystemProviders.SUNRISE_SUNSET, androidx.wear.complications.SystemProviders.DAY_OF_WEEK, androidx.wear.complications.SystemProviders.FAVORITE_CONTACT, androidx.wear.complications.SystemProviders.MOST_RECENT_APP, androidx.wear.complications.SystemProviders.DAY_AND_DATE}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface SystemProviders.ProviderId {
   }
 
 }
@@ -260,11 +259,11 @@
   }
 
   public interface ComplicationText {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationText asWireComplicationText();
     method public long getNextChangeTime(long fromDateTimeMillis);
     method public CharSequence getTextAt(android.content.res.Resources resources, long dateTimeMillis);
     method public boolean isAlwaysEmpty();
     method public boolean returnsSameText(long firstDateTimeMillis, long secondDateTimeMillis);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationText toWireComplicationText();
   }
 
   public enum ComplicationType {
@@ -302,7 +301,7 @@
   }
 
   public final class DataKt {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.complications.data.ComplicationData asApiComplicationData(android.support.wearable.complications.ComplicationData);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.complications.data.ComplicationData toApiComplicationData(android.support.wearable.complications.ComplicationData);
   }
 
   public final class EmptyComplicationData extends androidx.wear.complications.data.ComplicationData {
@@ -536,6 +535,7 @@
   }
 
   public final class TextKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.complications.data.ComplicationText toApiComplicationText(android.support.wearable.complications.TimeDependentText);
   }
 
   public final class TimeDifferenceComplicationText implements androidx.wear.complications.data.ComplicationText {
@@ -595,8 +595,8 @@
   }
 
   public final class TypeKt {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.complications.data.ComplicationType![] asApiComplicationTypes(int[]);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static int[] asWireTypes(java.util.Collection<? extends androidx.wear.complications.data.ComplicationType>);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.complications.data.ComplicationType![] toApiComplicationTypes(int[]);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static int[] toWireTypes(java.util.Collection<? extends androidx.wear.complications.data.ComplicationType>);
   }
 
 }

wear/wear-complications-data/src/main/java/androidx/wear/complications/ComplicationHelperActivity.java

diff --git a/wear/wear-complications-data/src/main/java/androidx/wear/complications/ComplicationHelperActivity.java b/wear/wear-complications-data/src/main/java/androidx/wear/complications/ComplicationHelperActivity.java
index c74a757..a0a7b71 100644
--- a/wear/wear-complications-data/src/main/java/androidx/wear/complications/ComplicationHelperActivity.java
+++ b/wear/wear-complications-data/src/main/java/androidx/wear/complications/ComplicationHelperActivity.java
@@ -231,7 +231,7 @@
         int[] wireSupportedTypes = new int[supportedTypes.size()];
         int i = 0;
         for (ComplicationType supportedType : supportedTypes) {
-            wireSupportedTypes[i++] = supportedType.asWireComplicationType();
+            wireSupportedTypes[i++] = supportedType.toWireComplicationType();
         }
         intent.putExtra(ProviderChooserIntent.EXTRA_SUPPORTED_TYPES, wireSupportedTypes);
         return intent;

wear/wear-complications-data/src/main/java/androidx/wear/complications/ProviderInfoRetriever.kt

diff --git a/wear/wear-complications-data/src/main/java/androidx/wear/complications/ProviderInfoRetriever.kt b/wear/wear-complications-data/src/main/java/androidx/wear/complications/ProviderInfoRetriever.kt
index 0ab5a45..70dea0a 100644
--- a/wear/wear-complications-data/src/main/java/androidx/wear/complications/ProviderInfoRetriever.kt
+++ b/wear/wear-complications-data/src/main/java/androidx/wear/complications/ProviderInfoRetriever.kt
@@ -30,7 +30,7 @@
 import androidx.annotation.VisibleForTesting
 import androidx.wear.complications.data.ComplicationData
 import androidx.wear.complications.data.ComplicationType
-import androidx.wear.complications.data.asApiComplicationData
+import androidx.wear.complications.data.toApiComplicationData
 import androidx.wear.utility.TraceEvent
 import kotlinx.coroutines.CompletableDeferred
 
@@ -152,13 +152,13 @@
         service.asBinder().linkToDeath(deathObserver, 0)
         if (!service.requestPreviewComplicationData(
                 providerComponent,
-                complicationType.asWireComplicationType(),
+                complicationType.toWireComplicationType(),
                 object : IPreviewComplicationDataCallback.Stub() {
                     override fun updateComplicationData(
                         data: android.support.wearable.complications.ComplicationData?
                     ) {
                         service.asBinder().unlinkToDeath(deathObserver, 0)
-                        result.complete(data?.asApiComplicationData())
+                        result.complete(data?.toApiComplicationData())
                     }
                 }
             )

wear/wear-complications-data/src/main/java/androidx/wear/complications/SystemProviders.java

diff --git a/wear/wear-complications-data/src/main/java/androidx/wear/complications/SystemProviders.java b/wear/wear-complications-data/src/main/java/androidx/wear/complications/SystemProviders.java
index 0c7ec12..aea58a8 100644
--- a/wear/wear-complications-data/src/main/java/androidx/wear/complications/SystemProviders.java
+++ b/wear/wear-complications-data/src/main/java/androidx/wear/complications/SystemProviders.java
@@ -46,7 +46,6 @@
         WORLD_CLOCK,
         APP_SHORTCUT,
         UNREAD_NOTIFICATION_COUNT,
-        GOOGLE_PAY,
         NEXT_EVENT,
         RETAIL_STEP_COUNT,
         RETAIL_CHAT,
@@ -140,18 +139,6 @@
     public static final int UNREAD_NOTIFICATION_COUNT = 7;
 
     /**
-     * Id for the Google Pay complication provider.
-     *
-     * <p>This is a safe provider (because it only launches the Google Pay app), so if a watch face
-     * uses this as a default it will be able to receive data from it even before the
-     * RECEIVE_COMPLICATION_DATA permission has been granted.
-     *
-     * <p>This provider supports only {@link ComplicationData#TYPE_SMALL_IMAGE TYPE_SMALL_IMAGE}.
-     */
-    @SuppressWarnings("MentionsGoogle") // This is not an api service.
-    public static final int GOOGLE_PAY = 8;
-
-    /**
      * Id for the 'next event' complication provider.
      *
      * <p>This is not a safe provider, so if a watch face uses this as a default it will receive

wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Data.kt

diff --git a/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Data.kt b/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Data.kt
index b701dbe..14a7de5 100644
--- a/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Data.kt
+++ b/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Data.kt
@@ -54,7 +54,7 @@
     internal fun createWireComplicationDataBuilder(): WireComplicationDataBuilder =
         cachedWireComplicationData?.let {
             WireComplicationDataBuilder(it)
-        } ?: WireComplicationDataBuilder(type.asWireComplicationType())
+        } ?: WireComplicationDataBuilder(type.toWireComplicationType())
 }
 
 /**
@@ -200,9 +200,9 @@
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     override fun asWireComplicationData(): WireComplicationData =
         createWireComplicationDataBuilder().apply {
-            setShortText(text.asWireComplicationText())
-            setShortTitle(title?.asWireComplicationText())
-            setContentDescription(contentDescription?.asWireComplicationText())
+            setShortText(text.toWireComplicationText())
+            setShortTitle(title?.toWireComplicationText())
+            setContentDescription(contentDescription?.toWireComplicationText())
             monochromaticImage?.addToWireComplicationData(this)
             setTapAction(tapAction)
             setValidTimeRange(validTimeRange, this)
@@ -308,12 +308,12 @@
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     override fun asWireComplicationData(): WireComplicationData =
         createWireComplicationDataBuilder().apply {
-            setLongText(text.asWireComplicationText())
-            setLongTitle(title?.asWireComplicationText())
+            setLongText(text.toWireComplicationText())
+            setLongTitle(title?.toWireComplicationText())
             monochromaticImage?.addToWireComplicationData(this)
             smallImage?.addToWireComplicationData(this)
             setTapAction(tapAction)
-            setContentDescription(contentDescription?.asWireComplicationText())
+            setContentDescription(contentDescription?.toWireComplicationText())
             setValidTimeRange(validTimeRange, this)
         }.build().also { cachedWireComplicationData = it }
 
@@ -429,10 +429,10 @@
             setRangedMinValue(min)
             setRangedMaxValue(max)
             monochromaticImage?.addToWireComplicationData(this)
-            setShortText(text?.asWireComplicationText())
-            setShortTitle(title?.asWireComplicationText())
+            setShortText(text?.toWireComplicationText())
+            setShortTitle(title?.toWireComplicationText())
             setTapAction(tapAction)
-            setContentDescription(contentDescription?.asWireComplicationText())
+            setContentDescription(contentDescription?.toWireComplicationText())
             setValidTimeRange(validTimeRange, this)
         }.build().also { cachedWireComplicationData = it }
 
@@ -512,7 +512,7 @@
     override fun asWireComplicationData(): WireComplicationData =
         createWireComplicationDataBuilder().apply {
             monochromaticImage.addToWireComplicationData(this)
-            setContentDescription(contentDescription?.asWireComplicationText())
+            setContentDescription(contentDescription?.toWireComplicationText())
             setTapAction(tapAction)
             setValidTimeRange(validTimeRange, this)
         }.build().also { cachedWireComplicationData = it }
@@ -593,7 +593,7 @@
     override fun asWireComplicationData(): WireComplicationData =
         createWireComplicationDataBuilder().apply {
             smallImage.addToWireComplicationData(this)
-            setContentDescription(contentDescription?.asWireComplicationText())
+            setContentDescription(contentDescription?.toWireComplicationText())
             setTapAction(tapAction)
             setValidTimeRange(validTimeRange, this)
         }.build().also { cachedWireComplicationData = it }
@@ -680,7 +680,7 @@
     override fun asWireComplicationData(): WireComplicationData =
         createWireComplicationDataBuilder().apply {
             setLargeImage(photoImage)
-            setContentDescription(contentDescription?.asWireComplicationText())
+            setContentDescription(contentDescription?.toWireComplicationText())
             setValidTimeRange(validTimeRange, this)
         }.build().also { cachedWireComplicationData = it }
 
@@ -757,8 +757,8 @@
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     override fun asWireComplicationData(): WireComplicationData =
         createWireComplicationDataBuilder().apply {
-            setShortText(text?.asWireComplicationText())
-            setShortTitle(title?.asWireComplicationText())
+            setShortText(text?.toWireComplicationText())
+            setShortTitle(title?.toWireComplicationText())
             monochromaticImage?.addToWireComplicationData(this)
         }.build().also { cachedWireComplicationData = it }
 
@@ -771,38 +771,38 @@
 }
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public fun WireComplicationData.asApiComplicationData(): ComplicationData {
+public fun WireComplicationData.toApiComplicationData(): ComplicationData {
     val wireComplicationData = this
     return when (type) {
-        NoDataComplicationData.TYPE.asWireComplicationType() -> NoDataComplicationData()
+        NoDataComplicationData.TYPE.toWireComplicationType() -> NoDataComplicationData()
 
-        EmptyComplicationData.TYPE.asWireComplicationType() -> EmptyComplicationData()
+        EmptyComplicationData.TYPE.toWireComplicationType() -> EmptyComplicationData()
 
-        NotConfiguredComplicationData.TYPE.asWireComplicationType() ->
+        NotConfiguredComplicationData.TYPE.toWireComplicationType() ->
             NotConfiguredComplicationData()
 
-        ShortTextComplicationData.TYPE.asWireComplicationType() ->
-            ShortTextComplicationData.Builder(shortText!!.asApiComplicationText()).apply {
+        ShortTextComplicationData.TYPE.toWireComplicationType() ->
+            ShortTextComplicationData.Builder(shortText!!.toApiComplicationText()).apply {
                 setTapAction(tapAction)
                 setValidTimeRange(parseTimeRange())
-                setTitle(shortTitle?.asApiComplicationText())
+                setTitle(shortTitle?.toApiComplicationText())
                 setMonochromaticImage(parseIcon())
-                setContentDescription(contentDescription?.asApiComplicationText())
+                setContentDescription(contentDescription?.toApiComplicationText())
                 setCachedWireComplicationData(wireComplicationData)
             }.build()
 
-        LongTextComplicationData.TYPE.asWireComplicationType() ->
-            LongTextComplicationData.Builder(longText!!.asApiComplicationText()).apply {
+        LongTextComplicationData.TYPE.toWireComplicationType() ->
+            LongTextComplicationData.Builder(longText!!.toApiComplicationText()).apply {
                 setTapAction(tapAction)
                 setValidTimeRange(parseTimeRange())
-                setTitle(longTitle?.asApiComplicationText())
+                setTitle(longTitle?.toApiComplicationText())
                 setMonochromaticImage(parseIcon())
                 setSmallImage(parseSmallImage())
-                setContentDescription(contentDescription?.asApiComplicationText())
+                setContentDescription(contentDescription?.toApiComplicationText())
                 setCachedWireComplicationData(wireComplicationData)
             }.build()
 
-        RangedValueComplicationData.TYPE.asWireComplicationType() ->
+        RangedValueComplicationData.TYPE.toWireComplicationType() ->
             RangedValueComplicationData.Builder(
                 value = rangedValue, min = rangedMinValue,
                 max = rangedMaxValue
@@ -810,40 +810,40 @@
                 setTapAction(tapAction)
                 setValidTimeRange(parseTimeRange())
                 setMonochromaticImage(parseIcon())
-                setTitle(shortTitle?.asApiComplicationText())
-                setText(shortText?.asApiComplicationText())
-                setContentDescription(contentDescription?.asApiComplicationText())
+                setTitle(shortTitle?.toApiComplicationText())
+                setText(shortText?.toApiComplicationText())
+                setContentDescription(contentDescription?.toApiComplicationText())
                 setCachedWireComplicationData(wireComplicationData)
             }.build()
 
-        MonochromaticImageComplicationData.TYPE.asWireComplicationType() ->
+        MonochromaticImageComplicationData.TYPE.toWireComplicationType() ->
             MonochromaticImageComplicationData.Builder(parseIcon()!!).apply {
                 setTapAction(tapAction)
                 setValidTimeRange(parseTimeRange())
-                setContentDescription(contentDescription?.asApiComplicationText())
+                setContentDescription(contentDescription?.toApiComplicationText())
                 setCachedWireComplicationData(wireComplicationData)
             }.build()
 
-        SmallImageComplicationData.TYPE.asWireComplicationType() ->
+        SmallImageComplicationData.TYPE.toWireComplicationType() ->
             SmallImageComplicationData.Builder(parseSmallImage()!!).apply {
                 setTapAction(tapAction)
                 setValidTimeRange(parseTimeRange())
-                setContentDescription(contentDescription?.asApiComplicationText())
+                setContentDescription(contentDescription?.toApiComplicationText())
                 setCachedWireComplicationData(wireComplicationData)
             }.build()
 
-        PhotoImageComplicationData.TYPE.asWireComplicationType() ->
+        PhotoImageComplicationData.TYPE.toWireComplicationType() ->
             PhotoImageComplicationData.Builder(largeImage!!).apply {
                 setValidTimeRange(parseTimeRange())
-                setContentDescription(contentDescription?.asApiComplicationText())
+                setContentDescription(contentDescription?.toApiComplicationText())
                 setCachedWireComplicationData(wireComplicationData)
             }.build()
 
-        NoPermissionComplicationData.TYPE.asWireComplicationType() ->
+        NoPermissionComplicationData.TYPE.toWireComplicationType() ->
             NoPermissionComplicationData.Builder().apply {
                 setMonochromaticImage(parseIcon())
-                setTitle(shortTitle?.asApiComplicationText())
-                setText(shortText?.asApiComplicationText())
+                setTitle(shortTitle?.toApiComplicationText())
+                setText(shortText?.toApiComplicationText())
                 setCachedWireComplicationData(wireComplicationData)
             }.build()
 
@@ -879,7 +879,7 @@
 
 /** Some of the types, do not have any fields. This method provides a shorthard for that case. */
 internal fun asPlainWireComplicationData(type: ComplicationType) =
-    WireComplicationDataBuilder(type.asWireComplicationType()).build()
+    WireComplicationDataBuilder(type.toWireComplicationType()).build()
 
 internal fun setValidTimeRange(validTimeRange: TimeRange?, data: WireComplicationDataBuilder) {
     validTimeRange?.let {

wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Text.kt

diff --git a/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Text.kt b/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Text.kt
index c05db28..fd88d45 100644
--- a/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Text.kt
+++ b/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Text.kt
@@ -30,6 +30,8 @@
 private typealias WireComplicationTextTimeFormatBuilder =
     android.support.wearable.complications.ComplicationText.TimeFormatBuilder
 
+private typealias WireTimeDependentText = android.support.wearable.complications.TimeDependentText
+
 /**
  * The text within a complication.
  *
@@ -69,7 +71,7 @@
      * @hide
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-    public fun asWireComplicationText(): WireComplicationText
+    public fun toWireComplicationText(): WireComplicationText
 }
 
 /** A [ComplicationText] that contains plain text. */
@@ -351,13 +353,42 @@
 
     /** @hide */
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-    override fun asWireComplicationText() = delegate
+    override fun toWireComplicationText() = delegate
 }
 
 /** Converts a [WireComplicationText] into an equivalent [ComplicationText] instead. */
-internal fun WireComplicationText.asApiComplicationText(): ComplicationText =
+internal fun WireComplicationText.toApiComplicationText(): ComplicationText =
     DelegatingComplicationText(this)
 
 /** Converts a [TimeZone] into an equivalent [java.util.TimeZone]. */
 internal fun TimeZone.asJavaTimeZone(): java.util.TimeZone =
     java.util.TimeZone.getTimeZone(this.id)
+
+/** [ComplicationText] implementation that delegates to a [WireTimeDependentText] instance. */
+private class DelegatingTimeDependentText(
+    private val delegate: WireTimeDependentText
+) : ComplicationText {
+    override fun getTextAt(resources: Resources, dateTimeMillis: Long) =
+        delegate.getTextAt(resources, dateTimeMillis)
+
+    override fun returnsSameText(firstDateTimeMillis: Long, secondDateTimeMillis: Long) =
+        delegate.returnsSameText(firstDateTimeMillis, secondDateTimeMillis)
+
+    override fun getNextChangeTime(fromDateTimeMillis: Long) =
+        delegate.getNextChangeTime(fromDateTimeMillis)
+
+    override fun isAlwaysEmpty() = false
+
+    /** @hide */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    override fun toWireComplicationText(): WireComplicationText {
+        throw UnsupportedOperationException(
+            "DelegatingTimeDependentText doesn't support asWireComplicationText"
+        )
+    }
+}
+
+/** @hide */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public fun WireTimeDependentText.toApiComplicationText(): ComplicationText =
+    DelegatingTimeDependentText(this)

wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Type.kt

diff --git a/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Type.kt b/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Type.kt
index 4c9eb33..97d4dfc 100644
--- a/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Type.kt
+++ b/wear/wear-complications-data/src/main/java/androidx/wear/complications/data/Type.kt
@@ -39,7 +39,7 @@
      * @hide
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
-    public fun asWireComplicationType(): Int = wireType
+    public fun toWireComplicationType(): Int = wireType
 
     /** @hide */
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@@ -80,7 +80,7 @@
          */
         @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
         @JvmStatic
-        public fun toWireTypes(types: Collection<ComplicationType>): IntArray = types.asWireTypes()
+        public fun toWireTypes(types: Collection<ComplicationType>): IntArray = types.toWireTypes()
 
         /**
          * Converts an array of integer values used for serialization into the corresponding array
@@ -95,7 +95,7 @@
         @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
         @JvmStatic
         public fun fromWireTypes(types: IntArray): Array<ComplicationType> =
-            types.asApiComplicationTypes()
+            types.toApiComplicationTypes()
 
         /**
          * Converts an array of integer values used for serialization into the corresponding list
@@ -119,8 +119,8 @@
  * @hide
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public fun Collection<ComplicationType>.asWireTypes(): IntArray =
-    this.map { it.asWireComplicationType() }.toIntArray()
+public fun Collection<ComplicationType>.toWireTypes(): IntArray =
+    this.map { it.toWireComplicationType() }.toIntArray()
 
 /**
  * Converts an array of integer values uses for serialization into the corresponding array
@@ -131,5 +131,5 @@
  * @hide
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public fun IntArray.asApiComplicationTypes(): Array<ComplicationType> =
+public fun IntArray.toApiComplicationTypes(): Array<ComplicationType> =
     this.map { ComplicationType.fromWireType(it) }.toTypedArray()

wear/wear-complications-data/src/test/java/androidx/wear/complications/ProviderInfoRetrieverTest.kt

diff --git a/wear/wear-complications-data/src/test/java/androidx/wear/complications/ProviderInfoRetrieverTest.kt b/wear/wear-complications-data/src/test/java/androidx/wear/complications/ProviderInfoRetrieverTest.kt
index d0da8608..6c7fac6 100644
--- a/wear/wear-complications-data/src/test/java/androidx/wear/complications/ProviderInfoRetrieverTest.kt
+++ b/wear/wear-complications-data/src/test/java/androidx/wear/complications/ProviderInfoRetrieverTest.kt
@@ -75,7 +75,7 @@
                 true
             }.`when`(mockService).requestPreviewComplicationData(
                 eq(component),
-                eq(type.asWireComplicationType()),
+                eq(type.toWireComplicationType()),
                 any()
             )
 
@@ -104,7 +104,7 @@
                 true
             }.`when`(mockService).requestPreviewComplicationData(
                 eq(component),
-                eq(type.asWireComplicationType()),
+                eq(type.toWireComplicationType()),
                 any()
             )
 
@@ -137,7 +137,7 @@
                 false
             }.`when`(mockService).requestPreviewComplicationData(
                 eq(component),
-                eq(type.asWireComplicationType()),
+                eq(type.toWireComplicationType()),
                 any()
             )
 

wear/wear-complications-data/src/test/java/androidx/wear/complications/data/DataTest.kt

diff --git a/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/DataTest.kt b/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/DataTest.kt
index 9d93102..7495485 100644
--- a/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/DataTest.kt
+++ b/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/DataTest.kt
@@ -177,7 +177,7 @@
     private fun testRoundTripConversions(data: ComplicationData) {
         ParcelableSubject.assertThat(data.asWireComplicationData())
             .hasSameSerializationAs(
-                data.asWireComplicationData().asApiComplicationData().asWireComplicationData()
+                data.asWireComplicationData().toApiComplicationData().asWireComplicationData()
             )
     }
 }
@@ -294,7 +294,7 @@
     }
 
     private fun assertRoundtrip(wireData: WireComplicationData, type: ComplicationType) {
-        val data = wireData.asApiComplicationData()
+        val data = wireData.toApiComplicationData()
         assertThat(data.type).isEqualTo(type)
         ParcelableSubject.assertThat(data.asWireComplicationData()).hasSameSerializationAs(wireData)
     }

wear/wear-complications-data/src/test/java/androidx/wear/complications/data/TextTest.kt

diff --git a/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/TextTest.kt b/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/TextTest.kt
index aa1c765..7d3843c 100644
--- a/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/TextTest.kt
+++ b/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/TextTest.kt
@@ -38,9 +38,9 @@
     @Test
     public fun plainText() {
         val text = PlainComplicationText.Builder("abc").build()
-        ParcelableSubject.assertThat(text.asWireComplicationText())
+        ParcelableSubject.assertThat(text.toWireComplicationText())
             .hasSameSerializationAs(WireComplicationText.plainText("abc"))
-        ParcelableSubject.assertThat(text.asWireComplicationText())
+        ParcelableSubject.assertThat(text.toWireComplicationText())
             .hasDifferentSerializationAs(WireComplicationText.plainText("abc1"))
     }
 
@@ -56,7 +56,7 @@
             .setMinimumUnit(TimeUnit.SECONDS)
             .build()
 
-        ParcelableSubject.assertThat(text.asWireComplicationText())
+        ParcelableSubject.assertThat(text.toWireComplicationText())
             .hasSameSerializationAs(
                 WireTimeDifferenceBuilder()
                     .setStyle(WireComplicationText.DIFFERENCE_STYLE_STOPWATCH)
@@ -85,7 +85,7 @@
             .setMinimumUnit(TimeUnit.SECONDS)
             .build()
 
-        ParcelableSubject.assertThat(text.asWireComplicationText())
+        ParcelableSubject.assertThat(text.toWireComplicationText())
             .hasSameSerializationAs(
                 WireTimeDifferenceBuilder()
                     .setStyle(WireComplicationText.DIFFERENCE_STYLE_STOPWATCH)
@@ -110,7 +110,7 @@
             .setTimeZone(TimeZone.getTimeZone("Europe/London"))
             .build()
 
-        ParcelableSubject.assertThat(text.asWireComplicationText())
+        ParcelableSubject.assertThat(text.toWireComplicationText())
             .hasSameSerializationAs(
                 WireTimeFormatBuilder()
                     .setFormat("h:m")
@@ -129,7 +129,7 @@
     @Test
     public fun plainText() {
         val wireText = WireComplicationText.plainText("abc")
-        val text = wireText.asApiComplicationText()
+        val text = wireText.toApiComplicationText()
 
         assertThat(text.getTextAt(getResource(), 0)).isEqualTo("abc")
         assertThat(text.getNextChangeTime(0)).isEqualTo(Long.MAX_VALUE)
@@ -148,7 +148,7 @@
             .setReferencePeriodEndMillis(startPointMillis)
             .build()
 
-        val text = wireText.asApiComplicationText()
+        val text = wireText.toApiComplicationText()
 
         val twoMinutesThreeSecondAfter = startPointMillis + 2.minutes + 3.seconds
         assertThat(
@@ -173,7 +173,7 @@
             .setTimeZone(java.util.TimeZone.getTimeZone("Europe/London"))
             .build()
 
-        val text = wireText.asApiComplicationText()
+        val text = wireText.toApiComplicationText()
 
         assertThat(text.getTextAt(getResource(), dateTimeMillis).toString())
             .isEqualTo("10:15 in London")

wear/wear-complications-data/src/test/java/androidx/wear/complications/data/TypeTest.kt

diff --git a/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/TypeTest.kt b/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/TypeTest.kt
index 76e215b..75c5f30 100644
--- a/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/TypeTest.kt
+++ b/wear/wear-complications-data/src/test/java/androidx/wear/complications/data/TypeTest.kt
@@ -47,7 +47,7 @@
     }
 
     private fun assertThatIsWireType(type: ComplicationType, wireType: Int) {
-        assertThat(type.asWireComplicationType()).isEqualTo(wireType)
+        assertThat(type.toWireComplicationType()).isEqualTo(wireType)
     }
 
     @Test

wear/wear-complications-provider/api/current.txt

diff --git a/wear/wear-complications-provider/api/current.txt b/wear/wear-complications-provider/api/current.txt
index 0b2e291..5a2cfe4 100644
--- a/wear/wear-complications-provider/api/current.txt
+++ b/wear/wear-complications-provider/api/current.txt
@@ -7,7 +7,7 @@
     method public android.os.IBinder? onBind(android.content.Intent);
     method @UiThread public void onComplicationActivated(int, int);
     method @UiThread public void onComplicationDeactivated(int);
-    method @UiThread public abstract void onComplicationUpdate(int, androidx.wear.complications.data.ComplicationType, androidx.wear.complications.ComplicationProviderService.ComplicationUpdateCallback);
+    method @UiThread public abstract void onComplicationUpdate(int, androidx.wear.complications.data.ComplicationType, androidx.wear.complications.ComplicationProviderService.ComplicationUpdateListener);
     field public static final String ACTION_COMPLICATION_UPDATE_REQUEST = "android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST";
     field public static final String CATEGORY_PROVIDER_CONFIG = "android.support.wearable.complications.category.PROVIDER_CONFIG";
     field public static final String EXTRA_CONFIG_COMPLICATION_ID = "android.support.wearable.complications.EXTRA_CONFIG_COMPLICATION_ID";
@@ -19,7 +19,7 @@
     field public static final String METADATA_KEY_UPDATE_PERIOD_SECONDS = "android.support.wearable.complications.UPDATE_PERIOD_SECONDS";
   }
 
-  public static interface ComplicationProviderService.ComplicationUpdateCallback {
+  public static interface ComplicationProviderService.ComplicationUpdateListener {
     method public void onUpdateComplication(androidx.wear.complications.data.ComplicationData?) throws android.os.RemoteException;
   }
 

wear/wear-complications-provider/api/public_plus_experimental_current.txt

diff --git a/wear/wear-complications-provider/api/public_plus_experimental_current.txt b/wear/wear-complications-provider/api/public_plus_experimental_current.txt
index 0b2e291..5a2cfe4 100644
--- a/wear/wear-complications-provider/api/public_plus_experimental_current.txt
+++ b/wear/wear-complications-provider/api/public_plus_experimental_current.txt
@@ -7,7 +7,7 @@
     method public android.os.IBinder? onBind(android.content.Intent);
     method @UiThread public void onComplicationActivated(int, int);
     method @UiThread public void onComplicationDeactivated(int);
-    method @UiThread public abstract void onComplicationUpdate(int, androidx.wear.complications.data.ComplicationType, androidx.wear.complications.ComplicationProviderService.ComplicationUpdateCallback);
+    method @UiThread public abstract void onComplicationUpdate(int, androidx.wear.complications.data.ComplicationType, androidx.wear.complications.ComplicationProviderService.ComplicationUpdateListener);
     field public static final String ACTION_COMPLICATION_UPDATE_REQUEST = "android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST";
     field public static final String CATEGORY_PROVIDER_CONFIG = "android.support.wearable.complications.category.PROVIDER_CONFIG";
     field public static final String EXTRA_CONFIG_COMPLICATION_ID = "android.support.wearable.complications.EXTRA_CONFIG_COMPLICATION_ID";
@@ -19,7 +19,7 @@
     field public static final String METADATA_KEY_UPDATE_PERIOD_SECONDS = "android.support.wearable.complications.UPDATE_PERIOD_SECONDS";
   }
 
-  public static interface ComplicationProviderService.ComplicationUpdateCallback {
+  public static interface ComplicationProviderService.ComplicationUpdateListener {
     method public void onUpdateComplication(androidx.wear.complications.data.ComplicationData?) throws android.os.RemoteException;
   }
 

wear/wear-complications-provider/api/restricted_current.txt

diff --git a/wear/wear-complications-provider/api/restricted_current.txt b/wear/wear-complications-provider/api/restricted_current.txt
index f0223ea..83d6e4b 100644
--- a/wear/wear-complications-provider/api/restricted_current.txt
+++ b/wear/wear-complications-provider/api/restricted_current.txt
@@ -7,7 +7,7 @@
     method public android.os.IBinder? onBind(android.content.Intent);
     method @UiThread public void onComplicationActivated(int, int);
     method @UiThread public void onComplicationDeactivated(int);
-    method @UiThread public abstract void onComplicationUpdate(int, androidx.wear.complications.data.ComplicationType, androidx.wear.complications.ComplicationProviderService.ComplicationUpdateCallback);
+    method @UiThread public abstract void onComplicationUpdate(int, androidx.wear.complications.data.ComplicationType, androidx.wear.complications.ComplicationProviderService.ComplicationUpdateListener);
     field public static final String ACTION_COMPLICATION_UPDATE_REQUEST = "android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST";
     field public static final String CATEGORY_PROVIDER_CONFIG = "android.support.wearable.complications.category.PROVIDER_CONFIG";
     field public static final String EXTRA_CONFIG_COMPLICATION_ID = "android.support.wearable.complications.EXTRA_CONFIG_COMPLICATION_ID";
@@ -19,7 +19,7 @@
     field public static final String METADATA_KEY_UPDATE_PERIOD_SECONDS = "android.support.wearable.complications.UPDATE_PERIOD_SECONDS";
   }
 
-  public static interface ComplicationProviderService.ComplicationUpdateCallback {
+  public static interface ComplicationProviderService.ComplicationUpdateListener {
     method public void onUpdateComplication(androidx.wear.complications.data.ComplicationData?) throws android.os.RemoteException;
   }
 

wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/AsynchronousProviderService.kt

diff --git a/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/AsynchronousProviderService.kt b/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/AsynchronousProviderService.kt
index 3e92082..7eb4ca5 100644
--- a/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/AsynchronousProviderService.kt
+++ b/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/AsynchronousProviderService.kt
@@ -16,6 +16,10 @@
 
 package androidx.wear.complications.provider.samples
 
+import android.graphics.Color
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.style.ForegroundColorSpan
 import androidx.wear.complications.ComplicationProviderService
 import androidx.wear.complications.data.ComplicationType
 import androidx.wear.complications.data.LongTextComplicationData
@@ -29,17 +33,27 @@
     override fun onComplicationUpdate(
         complicationId: Int,
         type: ComplicationType,
-        callback: ComplicationUpdateCallback
+        listener: ComplicationUpdateListener
     ) {
         executor.execute {
-            callback.onUpdateComplication(
+            listener.onUpdateComplication(
                 when (type) {
                     ComplicationType.SHORT_TEXT ->
                         ShortTextComplicationData.Builder(plainText("# $complicationId")).build()
 
                     ComplicationType.LONG_TEXT ->
-                        LongTextComplicationData.Builder(plainText("hello $complicationId"))
-                            .build()
+                        LongTextComplicationData.Builder(
+                            plainText(
+                                SpannableString("hello $complicationId").apply {
+                                    setSpan(
+                                        ForegroundColorSpan(Color.RED),
+                                        0,
+                                        5,
+                                        Spanned.SPAN_INCLUSIVE_INCLUSIVE
+                                    )
+                                }
+                            )
+                        ).build()
 
                     else -> null
                 }
@@ -52,7 +66,18 @@
             ShortTextComplicationData.Builder(plainText("# 123")).build()
 
         ComplicationType.LONG_TEXT ->
-            LongTextComplicationData.Builder(plainText("hello 123")).build()
+            LongTextComplicationData.Builder(
+                plainText(
+                    SpannableString("hello 123").apply {
+                        setSpan(
+                            ForegroundColorSpan(Color.RED),
+                            0,
+                            5,
+                            Spanned.SPAN_INCLUSIVE_INCLUSIVE
+                        )
+                    }
+                )
+            ).build()
 
         else
         -> null

wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/BackgroundProviderService.kt

diff --git a/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/BackgroundProviderService.kt b/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/BackgroundProviderService.kt
index 1c30820..3e7488145c 100644
--- a/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/BackgroundProviderService.kt
+++ b/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/BackgroundProviderService.kt
@@ -58,9 +58,9 @@
     override fun onComplicationUpdate(
         complicationId: Int,
         type: ComplicationType,
-        callback: ComplicationUpdateCallback
+        listener: ComplicationUpdateListener
     ) {
-        callback.onUpdateComplication(
+        listener.onUpdateComplication(
             when (type) {
                 ComplicationType.SHORT_TEXT ->
                     ShortTextComplicationData.Builder(plainText("# $counter")).build()

wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/PlainComplicationText.kt

diff --git a/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/PlainComplicationText.kt b/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/PlainComplicationText.kt
index 9537923..c34a45b 100644
--- a/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/PlainComplicationText.kt
+++ b/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/PlainComplicationText.kt
@@ -18,5 +18,5 @@
 
 import androidx.wear.complications.data.PlainComplicationText
 
-internal fun plainText(text: String) =
+internal fun plainText(text: CharSequence) =
     PlainComplicationText.Builder(text).build()
\ No newline at end of file

wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/SynchronousProviderService.kt

diff --git a/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/SynchronousProviderService.kt b/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/SynchronousProviderService.kt
index a86413c..c1ebad7 100644
--- a/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/SynchronousProviderService.kt
+++ b/wear/wear-complications-provider/samples/src/main/java/androidx/wear/complications/provider/samples/SynchronousProviderService.kt
@@ -27,9 +27,9 @@
     override fun onComplicationUpdate(
         complicationId: Int,
         type: ComplicationType,
-        callback: ComplicationUpdateCallback
+        listener: ComplicationUpdateListener
     ) {
-        callback.onUpdateComplication(
+        listener.onUpdateComplication(
             when (type) {
                 ComplicationType.SHORT_TEXT ->
                     ShortTextComplicationData.Builder(plainText("# $complicationId")).build()

wear/wear-complications-provider/src/main/java/androidx/wear/complications/ComplicationProviderService.java

diff --git a/wear/wear-complications-provider/src/main/java/androidx/wear/complications/ComplicationProviderService.java b/wear/wear-complications-provider/src/main/java/androidx/wear/complications/ComplicationProviderService.java
index bebf44e..32e1fe3 100644
--- a/wear/wear-complications-provider/src/main/java/androidx/wear/complications/ComplicationProviderService.java
+++ b/wear/wear-complications-provider/src/main/java/androidx/wear/complications/ComplicationProviderService.java
@@ -314,7 +314,7 @@
     public abstract void onComplicationUpdate(
             int complicationId,
             @NonNull ComplicationType type,
-            @NonNull ComplicationUpdateCallback resultCallback);
+            @NonNull ComplicationUpdateListener resultCallback);
 
     /**
      * A request for representative preview data for the complication, for use in the editor UI.
@@ -331,7 +331,7 @@
     public abstract ComplicationData getPreviewData(@NonNull ComplicationType type);
 
     /** Callback for {@link #onComplicationUpdate}. */
-    public interface ComplicationUpdateCallback {
+    public interface ComplicationUpdateListener {
         /**
          * Sends the complicationData to the system. If null is passed then any
          * previous complication data will not be overwritten. Can be called on any thread. Should

wear/wear-complications-provider/src/test/java/androidx/wear/complications/ComplicationProviderServiceTest.java

diff --git a/wear/wear-complications-provider/src/test/java/androidx/wear/complications/ComplicationProviderServiceTest.java b/wear/wear-complications-provider/src/test/java/androidx/wear/complications/ComplicationProviderServiceTest.java
index 3a9ddee..3ddb44d 100644
--- a/wear/wear-complications-provider/src/test/java/androidx/wear/complications/ComplicationProviderServiceTest.java
+++ b/wear/wear-complications-provider/src/test/java/androidx/wear/complications/ComplicationProviderServiceTest.java
@@ -71,7 +71,7 @@
         public void onComplicationUpdate(
                 int complicationId,
                 @NonNull ComplicationType type,
-                @NonNull ComplicationUpdateCallback callback) {
+                @NonNull ComplicationUpdateListener callback) {
             try {
                 callback.onUpdateComplication(
                         new LongTextComplicationData.Builder(
@@ -101,7 +101,7 @@
         public void onComplicationUpdate(
                 int complicationId,
                 @NonNull ComplicationType type,
-                @NonNull ComplicationUpdateCallback callback) {
+                @NonNull ComplicationUpdateListener callback) {
             try {
                 // Null means no update required.
                 callback.onUpdateComplication(null);
@@ -135,7 +135,7 @@
     public void testOnComplicationUpdate() throws Exception {
         int id = 123;
         mComplicationProvider.onUpdate(
-                id, ComplicationType.LONG_TEXT.asWireComplicationType(), mLocalManager);
+                id, ComplicationType.LONG_TEXT.toWireComplicationType(), mLocalManager);
         ShadowLooper.runUiThreadTasks();
 
         ArgumentCaptor<android.support.wearable.complications.ComplicationData> data =
@@ -151,7 +151,7 @@
     public void testOnComplicationUpdateNoUpdateRequired() throws Exception {
         int id = 123;
         mNoUpdateComplicationProvider.onUpdate(
-                id, ComplicationType.LONG_TEXT.asWireComplicationType(), mLocalManager);
+                id, ComplicationType.LONG_TEXT.toWireComplicationType(), mLocalManager);
         ShadowLooper.runUiThreadTasks();
 
         ArgumentCaptor<android.support.wearable.complications.ComplicationData> data =
@@ -164,7 +164,7 @@
     @Test
     public void testGetComplicationPreviewData() throws Exception {
         assertThat(mComplicationProvider.getComplicationPreviewData(
-                ComplicationType.LONG_TEXT.asWireComplicationType()
+                ComplicationType.LONG_TEXT.toWireComplicationType()
         ).getLongText().getTextAt(null, 0)).isEqualTo("hello preview");
     }
 
@@ -172,7 +172,7 @@
     public void testGetComplicationPreviewDataReturnsNull() throws Exception {
         // The ComplicationProvider doesn't support PHOTO_IMAGE so null should be returned.
         assertNull(mComplicationProvider.getComplicationPreviewData(
-                ComplicationType.PHOTO_IMAGE.asWireComplicationType())
+                ComplicationType.PHOTO_IMAGE.toWireComplicationType())
         );
     }
 }

wear/wear-phone-interactions/api/current.txt

diff --git a/wear/wear-phone-interactions/api/current.txt b/wear/wear-phone-interactions/api/current.txt
index 0863cad..310f3a1 100644
--- a/wear/wear-phone-interactions/api/current.txt
+++ b/wear/wear-phone-interactions/api/current.txt
@@ -66,9 +66,9 @@
     method protected void finalize();
     method @UiThread public void sendAuthorizationRequest(androidx.wear.phone.interactions.authentication.OAuthRequest request, androidx.wear.phone.interactions.authentication.RemoteAuthClient.Callback clientCallback);
     field public static final androidx.wear.phone.interactions.authentication.RemoteAuthClient.Companion Companion;
-    field public static final int ERROR_PHONE_UNAVAILABLE = 2; // 0x2
-    field public static final int ERROR_UNSUPPORTED = 1; // 0x1
-    field public static final int NO_ERROR = 0; // 0x0
+    field public static final int ERROR_PHONE_UNAVAILABLE = 1; // 0x1
+    field public static final int ERROR_UNSUPPORTED = 0; // 0x0
+    field public static final int NO_ERROR = -1; // 0xffffffff
   }
 
   public abstract static class RemoteAuthClient.Callback {

wear/wear-phone-interactions/api/public_plus_experimental_current.txt

diff --git a/wear/wear-phone-interactions/api/public_plus_experimental_current.txt b/wear/wear-phone-interactions/api/public_plus_experimental_current.txt
index 0863cad..310f3a1 100644
--- a/wear/wear-phone-interactions/api/public_plus_experimental_current.txt
+++ b/wear/wear-phone-interactions/api/public_plus_experimental_current.txt
@@ -66,9 +66,9 @@
     method protected void finalize();
     method @UiThread public void sendAuthorizationRequest(androidx.wear.phone.interactions.authentication.OAuthRequest request, androidx.wear.phone.interactions.authentication.RemoteAuthClient.Callback clientCallback);
     field public static final androidx.wear.phone.interactions.authentication.RemoteAuthClient.Companion Companion;
-    field public static final int ERROR_PHONE_UNAVAILABLE = 2; // 0x2
-    field public static final int ERROR_UNSUPPORTED = 1; // 0x1
-    field public static final int NO_ERROR = 0; // 0x0
+    field public static final int ERROR_PHONE_UNAVAILABLE = 1; // 0x1
+    field public static final int ERROR_UNSUPPORTED = 0; // 0x0
+    field public static final int NO_ERROR = -1; // 0xffffffff
   }
 
   public abstract static class RemoteAuthClient.Callback {

wear/wear-phone-interactions/api/restricted_current.txt

diff --git a/wear/wear-phone-interactions/api/restricted_current.txt b/wear/wear-phone-interactions/api/restricted_current.txt
index 0863cad..310f3a1 100644
--- a/wear/wear-phone-interactions/api/restricted_current.txt
+++ b/wear/wear-phone-interactions/api/restricted_current.txt
@@ -66,9 +66,9 @@
     method protected void finalize();
     method @UiThread public void sendAuthorizationRequest(androidx.wear.phone.interactions.authentication.OAuthRequest request, androidx.wear.phone.interactions.authentication.RemoteAuthClient.Callback clientCallback);
     field public static final androidx.wear.phone.interactions.authentication.RemoteAuthClient.Companion Companion;
-    field public static final int ERROR_PHONE_UNAVAILABLE = 2; // 0x2
-    field public static final int ERROR_UNSUPPORTED = 1; // 0x1
-    field public static final int NO_ERROR = 0; // 0x0
+    field public static final int ERROR_PHONE_UNAVAILABLE = 1; // 0x1
+    field public static final int ERROR_UNSUPPORTED = 0; // 0x0
+    field public static final int NO_ERROR = -1; // 0xffffffff
   }
 
   public abstract static class RemoteAuthClient.Callback {

wear/wear-phone-interactions/src/main/java/androidx/wear/phone/interactions/authentication/RemoteAuthClient.kt

diff --git a/wear/wear-phone-interactions/src/main/java/androidx/wear/phone/interactions/authentication/RemoteAuthClient.kt b/wear/wear-phone-interactions/src/main/java/androidx/wear/phone/interactions/authentication/RemoteAuthClient.kt
index e1c5d72..c547fc7 100644
--- a/wear/wear-phone-interactions/src/main/java/androidx/wear/phone/interactions/authentication/RemoteAuthClient.kt
+++ b/wear/wear-phone-interactions/src/main/java/androidx/wear/phone/interactions/authentication/RemoteAuthClient.kt
@@ -134,13 +134,13 @@
             "android.support.wearable.authentication.action.OAUTH"
 
         /** Indicates 3p authentication is finished without error  */
-        public const val NO_ERROR: Int = 0
+        public const val NO_ERROR: Int = -1
 
         /** Indicates 3p authentication isn't supported by Wear OS  */
-        public const val ERROR_UNSUPPORTED: Int = 1
+        public const val ERROR_UNSUPPORTED: Int = 0
 
         /** Indicates no phone is connected, or the phone connected doesn't support 3p auth */
-        public const val ERROR_PHONE_UNAVAILABLE: Int = 2
+        public const val ERROR_PHONE_UNAVAILABLE: Int = 1
 
         /** Errors returned in [.Callback.onAuthorizationError].  */
         @Retention(AnnotationRetention.SOURCE)
@@ -339,7 +339,7 @@
         }
 
         @SuppressLint("SyntheticAccessor")
-        internal fun onResult(response: OAuthResponse) {
+        private fun onResult(response: OAuthResponse) {
             @ErrorCode val error = response.getErrorCode()
             uiThreadExecutor.execute(
                 Runnable {

wear/wear-phone-interactions/src/main/java/androidx/wear/phone/interactions/authentication/RemoteAuthService.kt

diff --git a/wear/wear-phone-interactions/src/main/java/androidx/wear/phone/interactions/authentication/RemoteAuthService.kt b/wear/wear-phone-interactions/src/main/java/androidx/wear/phone/interactions/authentication/RemoteAuthService.kt
index 747bb43..dadd75b 100644
--- a/wear/wear-phone-interactions/src/main/java/androidx/wear/phone/interactions/authentication/RemoteAuthService.kt
+++ b/wear/wear-phone-interactions/src/main/java/androidx/wear/phone/interactions/authentication/RemoteAuthService.kt
@@ -27,6 +27,9 @@
 import android.os.RemoteException
 import android.support.wearable.authentication.IAuthenticationRequestCallback
 import android.support.wearable.authentication.IAuthenticationRequestService
+import androidx.wear.phone.interactions.authentication.RemoteAuthClient.Companion.KEY_ERROR_CODE
+import androidx.wear.phone.interactions.authentication.RemoteAuthClient.Companion.KEY_PACKAGE_NAME
+import androidx.wear.phone.interactions.authentication.RemoteAuthClient.Companion.KEY_RESPONSE_URL
 import java.security.SecureRandom
 
 /**
@@ -79,7 +82,7 @@
     public companion object {
         @JvmStatic
         private val callbacksByPackageNameAndRequestID:
-            MutableMap<Pair<String, Int>, RemoteAuthClient.RequestCallback> = HashMap()
+            MutableMap<Pair<String, Int>, IAuthenticationRequestCallback> = HashMap()
 
         /**
          * To be called by the child class to invoke the callback with Response
@@ -91,7 +94,9 @@
             packageNameAndRequestId: Pair<String, Int>
         ) {
             try {
-                callbacksByPackageNameAndRequestID[packageNameAndRequestId]?.onResult(response)
+                callbacksByPackageNameAndRequestID[packageNameAndRequestId]?.onResult(
+                    buildBundleFromResponse(response, packageNameAndRequestId.first)
+                )
                 callbacksByPackageNameAndRequestID.remove(packageNameAndRequestId)
             } catch (e: RemoteException) {
                 throw e.cause!!
@@ -99,8 +104,15 @@
         }
 
         internal fun getCallback(packageNameAndRequestId: Pair<String, Int>):
-            RemoteAuthClient.RequestCallback? =
+            IAuthenticationRequestCallback? =
                 callbacksByPackageNameAndRequestID[packageNameAndRequestId]
+
+        internal fun buildBundleFromResponse(response: OAuthResponse, packageName: String): Bundle =
+            Bundle().apply {
+                putParcelable(KEY_RESPONSE_URL, response.getResponseUrl())
+                putInt(KEY_ERROR_CODE, response.getErrorCode())
+                putString(KEY_PACKAGE_NAME, packageName)
+            }
     }
 
     private val secureRandom: SecureRandom = SecureRandom()
@@ -151,15 +163,15 @@
             request: Bundle,
             authenticationRequestCallback: IAuthenticationRequestCallback
         ) {
+            val packageName = request.getString(RemoteAuthClient.KEY_PACKAGE_NAME)
             if (remoteAuthRequestHandler.isAuthSupported()) {
-                val packageName = request.getString(RemoteAuthClient.KEY_PACKAGE_NAME)
                 if (!verifyPackageName(context, packageName)) {
                     throw SecurityException("Failed to verify the Requester's package name")
                 }
 
                 val packageNameAndRequestId = Pair(packageName!!, secureRandom.nextInt())
                 callbacksByPackageNameAndRequestID[packageNameAndRequestId] =
-                    authenticationRequestCallback as RemoteAuthClient.RequestCallback
+                    authenticationRequestCallback
 
                 val requestUrl: Uri? = request.getParcelable(RemoteAuthClient.KEY_REQUEST_URL)
                 remoteAuthRequestHandler.sendAuthRequest(
@@ -167,9 +179,8 @@
                     packageNameAndRequestId
                 )
             } else {
-                (authenticationRequestCallback as RemoteAuthClient.RequestCallback).onResult(
-                    OAuthResponse.Builder()
-                        .setErrorCode(RemoteAuthClient.ERROR_UNSUPPORTED).build()
+                authenticationRequestCallback.onResult(
+                    Bundle().apply { putInt(KEY_ERROR_CODE, RemoteAuthClient.ERROR_UNSUPPORTED) }
                 )
             }
         }

wear/wear-remote-interactions/src/main/java/androidx/wear/remote/interactions/WatchFaceConfigIntentHelper.kt

diff --git a/wear/wear-remote-interactions/src/main/java/androidx/wear/remote/interactions/WatchFaceConfigIntentHelper.kt b/wear/wear-remote-interactions/src/main/java/androidx/wear/remote/interactions/WatchFaceConfigIntentHelper.kt
index 0e319da..2d669ae 100644
--- a/wear/wear-remote-interactions/src/main/java/androidx/wear/remote/interactions/WatchFaceConfigIntentHelper.kt
+++ b/wear/wear-remote-interactions/src/main/java/androidx/wear/remote/interactions/WatchFaceConfigIntentHelper.kt
@@ -32,32 +32,32 @@
  * activity. The following meta-data will register the `com.example.watchface.CONFIG_DIGITAL`
  * action to be started when configuring a watch face on the wearable device:
  * ```
- * <meta-data
+ * <meta-data
  * android:name="com.google.android.wearable.watchface.wearableConfigurationAction"
- * android:value="com.example.watchface.CONFIG_DIGITAL" /&gt;
+ * android:value="com.example.watchface.CONFIG_DIGITAL" />
  * ```
  *
  *
  * To register a configuration activity to be started on a companion phone, add the following
  * alternative meta-data entry to the watch face component:
  * ```
- * &lt;meta-data
+ * <meta-data
  * android:name="com.google.android.wearable.watchface.companionConfigurationAction"
- * android:value="com.example.watchface.CONFIG_DIGITAL" /&gt;
+ * android:value="com.example.watchface.CONFIG_DIGITAL" />
  * ```
  *
  *
  * The activity should have an intent filter which lists the action specified in the meta-data
  * block above, in addition to the two categories present in the following example:
  * ```
- * &lt;activity android:name=".MyWatchFaceConfigActivity"&gt;
- * &lt;intent-filter&gt;
- * &lt;action android:name="com.example.watchface.CONFIG_DIGITAL" /&gt;
- * &lt;category android:name=
- * "com.google.android.wearable.watchface.category.WEARABLE_CONFIGURATION" /&gt;
- * &lt;category android:name="android.intent.category.DEFAULT" /&gt;
- * &lt;/intent-filter&gt;
- * &lt;/activity&gt;
+ * <activity android:name=".MyWatchFaceConfigActivity">
+ * <intent-filter>
+ * <action android:name="com.example.watchface.CONFIG_DIGITAL" />
+ * <category android:name=
+ * "com.google.android.wearable.watchface.category.WEARABLE_CONFIGURATION" />
+ * <category android:name="android.intent.category.DEFAULT" />
+ * </intent-filter>
+ * </activity>
  * ```
  *
  *

wear/wear-tiles/api/restricted_current.txt

diff --git a/wear/wear-tiles/api/restricted_current.txt b/wear/wear-tiles/api/restricted_current.txt
deleted file mode 100644
index ac77f97..0000000
--- a/wear/wear-tiles/api/restricted_current.txt
+++ /dev/null
@@ -1,937 +0,0 @@
-// Signature format: 4.0
-package androidx.wear.tiles {
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class ProtoParcelable implements android.os.Parcelable {
-    ctor protected ProtoParcelable(byte[], int);
-    method public int describeContents();
-    method public byte[] getContents();
-    method public int getVersion();
-    method public void writeToParcel(android.os.Parcel, int);
-  }
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ResourcesData extends androidx.wear.tiles.ProtoParcelable {
-    ctor public ResourcesData(byte[], int);
-    field public static final android.os.Parcelable.Creator<androidx.wear.tiles.ResourcesData!>! CREATOR;
-    field public static final int VERSION_PROTOBUF = 1; // 0x1
-  }
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ResourcesRequestData extends androidx.wear.tiles.ProtoParcelable {
-    ctor public ResourcesRequestData(byte[], int);
-    field public static final android.os.Parcelable.Creator<androidx.wear.tiles.ResourcesRequestData!>! CREATOR;
-    field public static final int VERSION_PROTOBUF = 1; // 0x1
-  }
-
-  public class SysUiTileUpdateRequester implements androidx.wear.tiles.TileUpdateRequester {
-    ctor public SysUiTileUpdateRequester(android.content.Context);
-    method public void requestUpdate(Class<? extends android.app.Service>);
-    field public static final String ACTION_BIND_UPDATE_REQUESTER = "androidx.wear.tiles.action.BIND_UPDATE_REQUESTER";
-  }
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TileAddEventData extends androidx.wear.tiles.ProtoParcelable {
-    ctor public TileAddEventData(byte[], int);
-    field public static final android.os.Parcelable.Creator<androidx.wear.tiles.TileAddEventData!>! CREATOR;
-    field public static final int VERSION_PROTOBUF = 1; // 0x1
-  }
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TileData extends androidx.wear.tiles.ProtoParcelable {
-    ctor public TileData(byte[], int);
-    field public static final android.os.Parcelable.Creator<androidx.wear.tiles.TileData!>! CREATOR;
-    field public static final int VERSION_PROTOBUF = 1; // 0x1
-  }
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TileEnterEventData extends androidx.wear.tiles.ProtoParcelable {
-    ctor public TileEnterEventData(byte[], int);
-    field public static final android.os.Parcelable.Creator<androidx.wear.tiles.TileEnterEventData!>! CREATOR;
-    field public static final int VERSION_PROTOBUF = 1; // 0x1
-  }
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TileLeaveEventData extends androidx.wear.tiles.ProtoParcelable {
-    ctor public TileLeaveEventData(byte[], int);
-    field public static final android.os.Parcelable.Creator<androidx.wear.tiles.TileLeaveEventData!>! CREATOR;
-    field public static final int VERSION_PROTOBUF = 1; // 0x1
-  }
-
-  public abstract class TileProviderService extends android.app.Service {
-    ctor public TileProviderService();
-    method public static androidx.wear.tiles.TileUpdateRequester getUpdater(android.content.Context);
-    method public android.os.IBinder? onBind(android.content.Intent);
-    method @MainThread protected abstract com.google.common.util.concurrent.ListenableFuture<androidx.wear.tiles.builders.ResourceBuilders.Resources!> onResourcesRequest(androidx.wear.tiles.readers.RequestReaders.ResourcesRequest);
-    method @MainThread protected void onTileAddEvent(androidx.wear.tiles.readers.EventReaders.TileAddEvent);
-    method @MainThread protected void onTileEnterEvent(androidx.wear.tiles.readers.EventReaders.TileEnterEvent);
-    method @MainThread protected void onTileLeaveEvent(androidx.wear.tiles.readers.EventReaders.TileLeaveEvent);
-    method @MainThread protected void onTileRemoveEvent(androidx.wear.tiles.readers.EventReaders.TileRemoveEvent);
-    method @MainThread protected abstract com.google.common.util.concurrent.ListenableFuture<androidx.wear.tiles.builders.TileBuilders.Tile!> onTileRequest(androidx.wear.tiles.readers.RequestReaders.TileRequest);
-    field public static final String ACTION_BIND_TILE_PROVIDER = "androidx.wear.tiles.action.BIND_TILE_PROVIDER";
-    field public static final String EXTRA_CLICKABLE_ID = "androidx.wear.tiles.extra.CLICKABLE_ID";
-    field public static final String METADATA_PREVIEW_KEY = "androidx.wear.tiles.PREVIEW";
-  }
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TileRemoveEventData extends androidx.wear.tiles.ProtoParcelable {
-    ctor public TileRemoveEventData(byte[], int);
-    field public static final android.os.Parcelable.Creator<androidx.wear.tiles.TileRemoveEventData!>! CREATOR;
-    field public static final int VERSION_PROTOBUF = 1; // 0x1
-  }
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TileRequestData extends androidx.wear.tiles.ProtoParcelable {
-    ctor public TileRequestData(byte[], int);
-    field public static final android.os.Parcelable.Creator<androidx.wear.tiles.TileRequestData!>! CREATOR;
-    field public static final int VERSION_PROTOBUF = 1; // 0x1
-  }
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TileUpdateRequestData extends androidx.wear.tiles.ProtoParcelable {
-    ctor public TileUpdateRequestData();
-    field public static final android.os.Parcelable.Creator<androidx.wear.tiles.TileUpdateRequestData!>! CREATOR;
-    field public static final int VERSION_PLACEHOLDER = 1; // 0x1
-  }
-
-  public interface TileUpdateRequester {
-    method public void requestUpdate(Class<? extends android.app.Service>);
-  }
-
-  public class ViewerTileUpdateRequester implements androidx.wear.tiles.TileUpdateRequester {
-    ctor public ViewerTileUpdateRequester(android.content.Context);
-    method public void requestUpdate(Class<? extends android.app.Service>);
-    field public static final String ACTION_REQUEST_TILE_UPDATE = "androidx.wear.tiles.action.REQUEST_TILE_UPDATE";
-  }
-
-}
-
-package androidx.wear.tiles.builders {
-
-  public final class ActionBuilders {
-  }
-
-  public static interface ActionBuilders.Action {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ActionProto.Action toActionProto();
-  }
-
-  public static interface ActionBuilders.Action.Builder {
-    method public androidx.wear.tiles.builders.ActionBuilders.Action build();
-  }
-
-  public static final class ActionBuilders.AndroidActivity {
-    method public static androidx.wear.tiles.builders.ActionBuilders.AndroidActivity.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ActionBuilders.AndroidActivity fromProto(androidx.wear.tiles.proto.ActionProto.AndroidActivity);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ActionProto.AndroidActivity toProto();
-  }
-
-  public static final class ActionBuilders.AndroidActivity.Builder {
-    method public androidx.wear.tiles.builders.ActionBuilders.AndroidActivity build();
-    method public androidx.wear.tiles.builders.ActionBuilders.AndroidActivity.Builder setClassName(String);
-    method public androidx.wear.tiles.builders.ActionBuilders.AndroidActivity.Builder setPackageName(String);
-  }
-
-  public static final class ActionBuilders.LaunchAction implements androidx.wear.tiles.builders.ActionBuilders.Action {
-    method public static androidx.wear.tiles.builders.ActionBuilders.LaunchAction.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ActionBuilders.LaunchAction fromProto(androidx.wear.tiles.proto.ActionProto.LaunchAction);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ActionProto.Action toActionProto();
-  }
-
-  public static final class ActionBuilders.LaunchAction.Builder implements androidx.wear.tiles.builders.ActionBuilders.Action.Builder {
-    method public androidx.wear.tiles.builders.ActionBuilders.LaunchAction build();
-    method public androidx.wear.tiles.builders.ActionBuilders.LaunchAction.Builder setAndroidActivity(androidx.wear.tiles.builders.ActionBuilders.AndroidActivity);
-    method public androidx.wear.tiles.builders.ActionBuilders.LaunchAction.Builder setAndroidActivity(androidx.wear.tiles.builders.ActionBuilders.AndroidActivity.Builder);
-  }
-
-  public static final class ActionBuilders.LoadAction implements androidx.wear.tiles.builders.ActionBuilders.Action {
-    method public static androidx.wear.tiles.builders.ActionBuilders.LoadAction.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ActionBuilders.LoadAction fromProto(androidx.wear.tiles.proto.ActionProto.LoadAction);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ActionProto.Action toActionProto();
-  }
-
-  public static final class ActionBuilders.LoadAction.Builder implements androidx.wear.tiles.builders.ActionBuilders.Action.Builder {
-    method public androidx.wear.tiles.builders.ActionBuilders.LoadAction build();
-    method public androidx.wear.tiles.builders.ActionBuilders.LoadAction.Builder setRequestState(androidx.wear.tiles.builders.StateBuilders.State);
-    method public androidx.wear.tiles.builders.ActionBuilders.LoadAction.Builder setRequestState(androidx.wear.tiles.builders.StateBuilders.State.Builder);
-  }
-
-  public final class ColorBuilders {
-    method public static androidx.wear.tiles.builders.ColorBuilders.ColorProp argb(@ColorInt int);
-  }
-
-  public static final class ColorBuilders.ColorProp {
-    method public static androidx.wear.tiles.builders.ColorBuilders.ColorProp.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ColorBuilders.ColorProp fromProto(androidx.wear.tiles.proto.ColorProto.ColorProp);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ColorProto.ColorProp toProto();
-  }
-
-  public static final class ColorBuilders.ColorProp.Builder {
-    method public androidx.wear.tiles.builders.ColorBuilders.ColorProp build();
-    method public androidx.wear.tiles.builders.ColorBuilders.ColorProp.Builder setArgb(@ColorInt int);
-  }
-
-  public final class DimensionBuilders {
-    method public static androidx.wear.tiles.builders.DimensionBuilders.DegreesProp degrees(float);
-    method public static androidx.wear.tiles.builders.DimensionBuilders.DpProp dp(@Dimension(unit=androidx.annotation.Dimension.DP) float);
-    method public static androidx.wear.tiles.builders.DimensionBuilders.EmProp em(int);
-    method public static androidx.wear.tiles.builders.DimensionBuilders.ExpandedDimensionProp expand();
-    method public static androidx.wear.tiles.builders.DimensionBuilders.SpProp sp(@Dimension(unit=androidx.annotation.Dimension.SP) float);
-    method public static androidx.wear.tiles.builders.DimensionBuilders.WrappedDimensionProp wrap();
-  }
-
-  public static interface DimensionBuilders.ContainerDimension {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.ContainerDimension toContainerDimensionProto();
-  }
-
-  public static interface DimensionBuilders.ContainerDimension.Builder {
-    method public androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension build();
-  }
-
-  public static final class DimensionBuilders.DegreesProp {
-    method public static androidx.wear.tiles.builders.DimensionBuilders.DegreesProp.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.DimensionBuilders.DegreesProp fromProto(androidx.wear.tiles.proto.DimensionProto.DegreesProp);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.DegreesProp toProto();
-  }
-
-  public static final class DimensionBuilders.DegreesProp.Builder {
-    method public androidx.wear.tiles.builders.DimensionBuilders.DegreesProp build();
-    method public androidx.wear.tiles.builders.DimensionBuilders.DegreesProp.Builder setValue(float);
-  }
-
-  public static final class DimensionBuilders.DpProp implements androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension androidx.wear.tiles.builders.DimensionBuilders.ImageDimension androidx.wear.tiles.builders.DimensionBuilders.SpacerDimension {
-    method public static androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.DimensionBuilders.DpProp fromProto(androidx.wear.tiles.proto.DimensionProto.DpProp);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.ContainerDimension toContainerDimensionProto();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.ImageDimension toImageDimensionProto();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.SpacerDimension toSpacerDimensionProto();
-  }
-
-  public static final class DimensionBuilders.DpProp.Builder implements androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension.Builder androidx.wear.tiles.builders.DimensionBuilders.ImageDimension.Builder androidx.wear.tiles.builders.DimensionBuilders.SpacerDimension.Builder {
-    method public androidx.wear.tiles.builders.DimensionBuilders.DpProp build();
-    method public androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder setValue(@Dimension(unit=androidx.annotation.Dimension.DP) float);
-  }
-
-  public static final class DimensionBuilders.EmProp {
-    method public static androidx.wear.tiles.builders.DimensionBuilders.EmProp.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.DimensionBuilders.EmProp fromProto(androidx.wear.tiles.proto.DimensionProto.EmProp);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.EmProp toProto();
-  }
-
-  public static final class DimensionBuilders.EmProp.Builder {
-    method public androidx.wear.tiles.builders.DimensionBuilders.EmProp build();
-    method public androidx.wear.tiles.builders.DimensionBuilders.EmProp.Builder setValue(float);
-  }
-
-  public static final class DimensionBuilders.ExpandedDimensionProp implements androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension androidx.wear.tiles.builders.DimensionBuilders.ImageDimension {
-    method public static androidx.wear.tiles.builders.DimensionBuilders.ExpandedDimensionProp.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.DimensionBuilders.ExpandedDimensionProp fromProto(androidx.wear.tiles.proto.DimensionProto.ExpandedDimensionProp);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.ContainerDimension toContainerDimensionProto();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.ImageDimension toImageDimensionProto();
-  }
-
-  public static final class DimensionBuilders.ExpandedDimensionProp.Builder implements androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension.Builder androidx.wear.tiles.builders.DimensionBuilders.ImageDimension.Builder {
-    method public androidx.wear.tiles.builders.DimensionBuilders.ExpandedDimensionProp build();
-  }
-
-  public static interface DimensionBuilders.ImageDimension {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.ImageDimension toImageDimensionProto();
-  }
-
-  public static interface DimensionBuilders.ImageDimension.Builder {
-    method public androidx.wear.tiles.builders.DimensionBuilders.ImageDimension build();
-  }
-
-  public static final class DimensionBuilders.ProportionalDimensionProp implements androidx.wear.tiles.builders.DimensionBuilders.ImageDimension {
-    method public static androidx.wear.tiles.builders.DimensionBuilders.ProportionalDimensionProp.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.DimensionBuilders.ProportionalDimensionProp fromProto(androidx.wear.tiles.proto.DimensionProto.ProportionalDimensionProp);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.ImageDimension toImageDimensionProto();
-  }
-
-  public static final class DimensionBuilders.ProportionalDimensionProp.Builder implements androidx.wear.tiles.builders.DimensionBuilders.ImageDimension.Builder {
-    method public androidx.wear.tiles.builders.DimensionBuilders.ProportionalDimensionProp build();
-    method public androidx.wear.tiles.builders.DimensionBuilders.ProportionalDimensionProp.Builder setAspectRatioHeight(@IntRange(from=0) int);
-    method public androidx.wear.tiles.builders.DimensionBuilders.ProportionalDimensionProp.Builder setAspectRatioWidth(@IntRange(from=0) int);
-  }
-
-  public static final class DimensionBuilders.SpProp {
-    method public static androidx.wear.tiles.builders.DimensionBuilders.SpProp.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.DimensionBuilders.SpProp fromProto(androidx.wear.tiles.proto.DimensionProto.SpProp);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.SpProp toProto();
-  }
-
-  public static final class DimensionBuilders.SpProp.Builder {
-    method public androidx.wear.tiles.builders.DimensionBuilders.SpProp build();
-    method public androidx.wear.tiles.builders.DimensionBuilders.SpProp.Builder setValue(@Dimension(unit=androidx.annotation.Dimension.SP) float);
-  }
-
-  public static interface DimensionBuilders.SpacerDimension {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.SpacerDimension toSpacerDimensionProto();
-  }
-
-  public static interface DimensionBuilders.SpacerDimension.Builder {
-    method public androidx.wear.tiles.builders.DimensionBuilders.SpacerDimension build();
-  }
-
-  public static final class DimensionBuilders.WrappedDimensionProp implements androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension {
-    method public static androidx.wear.tiles.builders.DimensionBuilders.WrappedDimensionProp.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.DimensionBuilders.WrappedDimensionProp fromProto(androidx.wear.tiles.proto.DimensionProto.WrappedDimensionProp);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.DimensionProto.ContainerDimension toContainerDimensionProto();
-  }
-
-  public static final class DimensionBuilders.WrappedDimensionProp.Builder implements androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension.Builder {
-    method public androidx.wear.tiles.builders.DimensionBuilders.WrappedDimensionProp build();
-  }
-
-  public final class LayoutElementBuilders {
-    field public static final int ARC_ANCHOR_CENTER = 2; // 0x2
-    field public static final int ARC_ANCHOR_END = 3; // 0x3
-    field public static final int ARC_ANCHOR_START = 1; // 0x1
-    field public static final int ARC_ANCHOR_UNDEFINED = 0; // 0x0
-    field public static final int CONTENT_SCALE_MODE_CROP = 2; // 0x2
-    field public static final int CONTENT_SCALE_MODE_FILL_BOUNDS = 3; // 0x3
-    field public static final int CONTENT_SCALE_MODE_FIT = 1; // 0x1
-    field public static final int CONTENT_SCALE_MODE_UNDEFINED = 0; // 0x0
-    field public static final int FONT_WEIGHT_BOLD = 700; // 0x2bc
-    field public static final int FONT_WEIGHT_NORMAL = 400; // 0x190
-    field public static final int FONT_WEIGHT_UNDEFINED = 0; // 0x0
-    field public static final int HALIGN_CENTER = 2; // 0x2
-    field public static final int HALIGN_END = 5; // 0x5
-    field public static final int HALIGN_LEFT = 1; // 0x1
-    field public static final int HALIGN_RIGHT = 3; // 0x3
-    field public static final int HALIGN_START = 4; // 0x4
-    field public static final int HALIGN_UNDEFINED = 0; // 0x0
-    field public static final int TEXT_ALIGN_CENTER = 2; // 0x2
-    field public static final int TEXT_ALIGN_END = 3; // 0x3
-    field public static final int TEXT_ALIGN_START = 1; // 0x1
-    field public static final int TEXT_ALIGN_UNDEFINED = 0; // 0x0
-    field public static final int TEXT_OVERFLOW_ELLIPSIZE_END = 2; // 0x2
-    field public static final int TEXT_OVERFLOW_TRUNCATE = 1; // 0x1
-    field public static final int TEXT_OVERFLOW_UNDEFINED = 0; // 0x0
-    field public static final int VALIGN_BOTTOM = 3; // 0x3
-    field public static final int VALIGN_CENTER = 2; // 0x2
-    field public static final int VALIGN_TOP = 1; // 0x1
-    field public static final int VALIGN_UNDEFINED = 0; // 0x0
-  }
-
-  public static final class LayoutElementBuilders.Arc implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.Arc.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.Arc fromProto(androidx.wear.tiles.proto.LayoutElementProto.Arc);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement toLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.Arc.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Arc.Builder addContent(androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Arc.Builder addContent(androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Arc build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Arc.Builder setAnchorAngle(androidx.wear.tiles.builders.DimensionBuilders.DegreesProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Arc.Builder setAnchorAngle(androidx.wear.tiles.builders.DimensionBuilders.DegreesProp.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Arc.Builder setAnchorType(int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Arc.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Arc.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Arc.Builder setVerticalAlign(int);
-  }
-
-  public static final class LayoutElementBuilders.ArcAdapter implements androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.ArcAdapter.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.ArcAdapter fromProto(androidx.wear.tiles.proto.LayoutElementProto.ArcAdapter);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement toArcLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.ArcAdapter.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcAdapter build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcAdapter.Builder setContent(androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcAdapter.Builder setContent(androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcAdapter.Builder setRotateContents(boolean);
-  }
-
-  public static interface LayoutElementBuilders.ArcLayoutElement {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement toArcLayoutElementProto();
-  }
-
-  public static interface LayoutElementBuilders.ArcLayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement build();
-  }
-
-  public static final class LayoutElementBuilders.ArcLine implements androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine fromProto(androidx.wear.tiles.proto.LayoutElementProto.ArcLine);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement toArcLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.ArcLine.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine.Builder setColor(androidx.wear.tiles.builders.ColorBuilders.ColorProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine.Builder setColor(androidx.wear.tiles.builders.ColorBuilders.ColorProp.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine.Builder setLength(androidx.wear.tiles.builders.DimensionBuilders.DegreesProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine.Builder setLength(androidx.wear.tiles.builders.DimensionBuilders.DegreesProp.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine.Builder setThickness(androidx.wear.tiles.builders.DimensionBuilders.DpProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcLine.Builder setThickness(androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder);
-  }
-
-  public static final class LayoutElementBuilders.ArcSpacer implements androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.ArcSpacer.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.ArcSpacer fromProto(androidx.wear.tiles.proto.LayoutElementProto.ArcSpacer);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement toArcLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.ArcSpacer.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcSpacer build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcSpacer.Builder setLength(androidx.wear.tiles.builders.DimensionBuilders.DegreesProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcSpacer.Builder setLength(androidx.wear.tiles.builders.DimensionBuilders.DegreesProp.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcSpacer.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcSpacer.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcSpacer.Builder setThickness(androidx.wear.tiles.builders.DimensionBuilders.DpProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcSpacer.Builder setThickness(androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder);
-  }
-
-  public static final class LayoutElementBuilders.ArcText implements androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.ArcText.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.ArcText fromProto(androidx.wear.tiles.proto.LayoutElementProto.ArcText);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.ArcLayoutElement toArcLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.ArcText.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.ArcLayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcText build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcText.Builder setFontStyle(androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcText.Builder setFontStyle(androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcText.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcText.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.ArcText.Builder setText(String);
-  }
-
-  public static final class LayoutElementBuilders.Box implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.Box fromProto(androidx.wear.tiles.proto.LayoutElementProto.Box);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement toLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.Box.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder addContent(androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder addContent(androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder setHorizontalAlignment(int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder setVerticalAlignment(int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Box.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension.Builder);
-  }
-
-  public static final class LayoutElementBuilders.Column implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.Column.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.Column fromProto(androidx.wear.tiles.proto.LayoutElementProto.Column);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement toLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.Column.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Column.Builder addContent(androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Column.Builder addContent(androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Column build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Column.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Column.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Column.Builder setHorizontalAlignment(int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Column.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Column.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Column.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Column.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension.Builder);
-  }
-
-  public static final class LayoutElementBuilders.FontStyle {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle fromProto(androidx.wear.tiles.proto.LayoutElementProto.FontStyle);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.FontStyle toProto();
-  }
-
-  public static final class LayoutElementBuilders.FontStyle.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder setColor(androidx.wear.tiles.builders.ColorBuilders.ColorProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder setColor(androidx.wear.tiles.builders.ColorBuilders.ColorProp.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder setItalic(boolean);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder setLetterSpacing(androidx.wear.tiles.builders.DimensionBuilders.EmProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder setLetterSpacing(androidx.wear.tiles.builders.DimensionBuilders.EmProp.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder setSize(androidx.wear.tiles.builders.DimensionBuilders.SpProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder setSize(androidx.wear.tiles.builders.DimensionBuilders.SpProp.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder setUnderline(boolean);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder setWeight(int);
-  }
-
-  public static class LayoutElementBuilders.FontStyles {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder body1();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder body2();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder button();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder caption1();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder caption2();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder display1();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder display2();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder display3();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder title1();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder title2();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder title3();
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.FontStyles withDeviceParameters(androidx.wear.tiles.readers.DeviceParametersReaders.DeviceParameters);
-  }
-
-  public static final class LayoutElementBuilders.Image implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.Image.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.Image fromProto(androidx.wear.tiles.proto.LayoutElementProto.Image);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement toLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.Image.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Image build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Image.Builder setContentScaleMode(int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Image.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.ImageDimension);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Image.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.ImageDimension.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Image.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Image.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Image.Builder setResourceId(String);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Image.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.ImageDimension);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Image.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.ImageDimension.Builder);
-  }
-
-  public static final class LayoutElementBuilders.Layout {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.Layout.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.Layout fromProto(androidx.wear.tiles.proto.LayoutElementProto.Layout);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.Layout toProto();
-  }
-
-  public static final class LayoutElementBuilders.Layout.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Layout build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Layout.Builder setRoot(androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Layout.Builder setRoot(androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder);
-  }
-
-  public static interface LayoutElementBuilders.LayoutElement {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement toLayoutElementProto();
-  }
-
-  public static interface LayoutElementBuilders.LayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement build();
-  }
-
-  public static final class LayoutElementBuilders.Row implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.Row.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.Row fromProto(androidx.wear.tiles.proto.LayoutElementProto.Row);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement toLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.Row.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Row.Builder addContent(androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Row.Builder addContent(androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Row build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Row.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Row.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Row.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Row.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Row.Builder setVerticalAlignment(int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Row.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Row.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.ContainerDimension.Builder);
-  }
-
-  public static final class LayoutElementBuilders.Spacer implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.Spacer.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.Spacer fromProto(androidx.wear.tiles.proto.LayoutElementProto.Spacer);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement toLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.Spacer.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spacer build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spacer.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.SpacerDimension);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spacer.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.SpacerDimension.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spacer.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spacer.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spacer.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.SpacerDimension);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spacer.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.SpacerDimension.Builder);
-  }
-
-  public static interface LayoutElementBuilders.Span {
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.Span toSpanProto();
-  }
-
-  public static interface LayoutElementBuilders.Span.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Span build();
-  }
-
-  public static final class LayoutElementBuilders.SpanImage implements androidx.wear.tiles.builders.LayoutElementBuilders.Span {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.SpanImage.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.SpanImage fromProto(androidx.wear.tiles.proto.LayoutElementProto.SpanImage);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.Span toSpanProto();
-  }
-
-  public static final class LayoutElementBuilders.SpanImage.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.Span.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanImage build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanImage.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.DpProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanImage.Builder setHeight(androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanImage.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.SpanModifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanImage.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.SpanModifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanImage.Builder setResourceId(String);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanImage.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.DpProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanImage.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder);
-  }
-
-  public static final class LayoutElementBuilders.SpanText implements androidx.wear.tiles.builders.LayoutElementBuilders.Span {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.SpanText.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.SpanText fromProto(androidx.wear.tiles.proto.LayoutElementProto.SpanText);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.Span toSpanProto();
-  }
-
-  public static final class LayoutElementBuilders.SpanText.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.Span.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanText build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanText.Builder setFontStyle(androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanText.Builder setFontStyle(androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanText.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.SpanModifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanText.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.SpanModifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.SpanText.Builder setText(String);
-  }
-
-  public static final class LayoutElementBuilders.Spannable implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.Spannable.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.Spannable fromProto(androidx.wear.tiles.proto.LayoutElementProto.Spannable);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement toLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.Spannable.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spannable.Builder addSpan(androidx.wear.tiles.builders.LayoutElementBuilders.Span);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spannable.Builder addSpan(androidx.wear.tiles.builders.LayoutElementBuilders.Span.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spannable build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spannable.Builder setLineSpacing(androidx.wear.tiles.builders.DimensionBuilders.SpProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spannable.Builder setLineSpacing(androidx.wear.tiles.builders.DimensionBuilders.SpProp.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spannable.Builder setMaxLines(@IntRange(from=1) int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spannable.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spannable.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spannable.Builder setMultilineAlignment(int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Spannable.Builder setOverflow(int);
-  }
-
-  public static final class LayoutElementBuilders.Text implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement {
-    method public static androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.LayoutElementBuilders.Text fromProto(androidx.wear.tiles.proto.LayoutElementProto.Text);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.LayoutElementProto.LayoutElement toLayoutElementProto();
-  }
-
-  public static final class LayoutElementBuilders.Text.Builder implements androidx.wear.tiles.builders.LayoutElementBuilders.LayoutElement.Builder {
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text build();
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder setFontStyle(androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder setFontStyle(androidx.wear.tiles.builders.LayoutElementBuilders.FontStyle.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder setLineHeight(androidx.wear.tiles.builders.DimensionBuilders.SpProp);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder setLineHeight(androidx.wear.tiles.builders.DimensionBuilders.SpProp.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder setMaxLines(@IntRange(from=1) int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder setModifiers(androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder setMultilineAlignment(int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder setOverflow(int);
-    method public androidx.wear.tiles.builders.LayoutElementBuilders.Text.Builder setText(String);
-  }
-
-  public final class ModifiersBuilders {
-  }
-
-  public static final class ModifiersBuilders.ArcModifiers {
-    method public static androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers fromProto(androidx.wear.tiles.proto.ModifiersProto.ArcModifiers);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ModifiersProto.ArcModifiers toProto();
-  }
-
-  public static final class ModifiersBuilders.ArcModifiers.Builder {
-    method public androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers build();
-    method public androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers.Builder setClickable(androidx.wear.tiles.builders.ModifiersBuilders.Clickable);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers.Builder setClickable(androidx.wear.tiles.builders.ModifiersBuilders.Clickable.Builder);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers.Builder setSemantics(androidx.wear.tiles.builders.ModifiersBuilders.Semantics);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.ArcModifiers.Builder setSemantics(androidx.wear.tiles.builders.ModifiersBuilders.Semantics.Builder);
-  }
-
-  public static final class ModifiersBuilders.Background {
-    method public static androidx.wear.tiles.builders.ModifiersBuilders.Background.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ModifiersBuilders.Background fromProto(androidx.wear.tiles.proto.ModifiersProto.Background);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ModifiersProto.Background toProto();
-  }
-
-  public static final class ModifiersBuilders.Background.Builder {
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Background build();
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Background.Builder setColor(androidx.wear.tiles.builders.ColorBuilders.ColorProp);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Background.Builder setColor(androidx.wear.tiles.builders.ColorBuilders.ColorProp.Builder);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Background.Builder setCorner(androidx.wear.tiles.builders.ModifiersBuilders.Corner);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Background.Builder setCorner(androidx.wear.tiles.builders.ModifiersBuilders.Corner.Builder);
-  }
-
-  public static final class ModifiersBuilders.Border {
-    method public static androidx.wear.tiles.builders.ModifiersBuilders.Border.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ModifiersBuilders.Border fromProto(androidx.wear.tiles.proto.ModifiersProto.Border);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ModifiersProto.Border toProto();
-  }
-
-  public static final class ModifiersBuilders.Border.Builder {
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Border build();
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Border.Builder setColor(androidx.wear.tiles.builders.ColorBuilders.ColorProp);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Border.Builder setColor(androidx.wear.tiles.builders.ColorBuilders.ColorProp.Builder);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Border.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.DpProp);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Border.Builder setWidth(androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder);
-  }
-
-  public static final class ModifiersBuilders.Clickable {
-    method public static androidx.wear.tiles.builders.ModifiersBuilders.Clickable.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ModifiersBuilders.Clickable fromProto(androidx.wear.tiles.proto.ModifiersProto.Clickable);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ModifiersProto.Clickable toProto();
-  }
-
-  public static final class ModifiersBuilders.Clickable.Builder {
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Clickable build();
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Clickable.Builder setId(String);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Clickable.Builder setOnClick(androidx.wear.tiles.builders.ActionBuilders.Action);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Clickable.Builder setOnClick(androidx.wear.tiles.builders.ActionBuilders.Action.Builder);
-  }
-
-  public static final class ModifiersBuilders.Corner {
-    method public static androidx.wear.tiles.builders.ModifiersBuilders.Corner.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ModifiersBuilders.Corner fromProto(androidx.wear.tiles.proto.ModifiersProto.Corner);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ModifiersProto.Corner toProto();
-  }
-
-  public static final class ModifiersBuilders.Corner.Builder {
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Corner build();
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Corner.Builder setRadius(androidx.wear.tiles.builders.DimensionBuilders.DpProp);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Corner.Builder setRadius(androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder);
-  }
-
-  public static final class ModifiersBuilders.Modifiers {
-    method public static androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ModifiersBuilders.Modifiers fromProto(androidx.wear.tiles.proto.ModifiersProto.Modifiers);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ModifiersProto.Modifiers toProto();
-  }
-
-  public static final class ModifiersBuilders.Modifiers.Builder {
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers build();
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder setBackground(androidx.wear.tiles.builders.ModifiersBuilders.Background);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder setBackground(androidx.wear.tiles.builders.ModifiersBuilders.Background.Builder);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder setBorder(androidx.wear.tiles.builders.ModifiersBuilders.Border);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder setBorder(androidx.wear.tiles.builders.ModifiersBuilders.Border.Builder);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder setClickable(androidx.wear.tiles.builders.ModifiersBuilders.Clickable);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder setClickable(androidx.wear.tiles.builders.ModifiersBuilders.Clickable.Builder);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder setPadding(androidx.wear.tiles.builders.ModifiersBuilders.Padding);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder setPadding(androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder setSemantics(androidx.wear.tiles.builders.ModifiersBuilders.Semantics);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Modifiers.Builder setSemantics(androidx.wear.tiles.builders.ModifiersBuilders.Semantics.Builder);
-  }
-
-  public static final class ModifiersBuilders.Padding {
-    method public static androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ModifiersBuilders.Padding fromProto(androidx.wear.tiles.proto.ModifiersProto.Padding);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ModifiersProto.Padding toProto();
-  }
-
-  public static final class ModifiersBuilders.Padding.Builder {
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Padding build();
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder setBottom(androidx.wear.tiles.builders.DimensionBuilders.DpProp);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder setBottom(androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder setEnd(androidx.wear.tiles.builders.DimensionBuilders.DpProp);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder setEnd(androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder setRtlAware(boolean);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder setStart(androidx.wear.tiles.builders.DimensionBuilders.DpProp);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder setStart(androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder setTop(androidx.wear.tiles.builders.DimensionBuilders.DpProp);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Padding.Builder setTop(androidx.wear.tiles.builders.DimensionBuilders.DpProp.Builder);
-  }
-
-  public static final class ModifiersBuilders.Semantics {
-    method public static androidx.wear.tiles.builders.ModifiersBuilders.Semantics.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ModifiersBuilders.Semantics fromProto(androidx.wear.tiles.proto.ModifiersProto.Semantics);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ModifiersProto.Semantics toProto();
-  }
-
-  public static final class ModifiersBuilders.Semantics.Builder {
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Semantics build();
-    method public androidx.wear.tiles.builders.ModifiersBuilders.Semantics.Builder setContentDescription(String);
-  }
-
-  public static final class ModifiersBuilders.SpanModifiers {
-    method public static androidx.wear.tiles.builders.ModifiersBuilders.SpanModifiers.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ModifiersBuilders.SpanModifiers fromProto(androidx.wear.tiles.proto.ModifiersProto.SpanModifiers);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ModifiersProto.SpanModifiers toProto();
-  }
-
-  public static final class ModifiersBuilders.SpanModifiers.Builder {
-    method public androidx.wear.tiles.builders.ModifiersBuilders.SpanModifiers build();
-    method public androidx.wear.tiles.builders.ModifiersBuilders.SpanModifiers.Builder setClickable(androidx.wear.tiles.builders.ModifiersBuilders.Clickable);
-    method public androidx.wear.tiles.builders.ModifiersBuilders.SpanModifiers.Builder setClickable(androidx.wear.tiles.builders.ModifiersBuilders.Clickable.Builder);
-  }
-
-  public final class ResourceBuilders {
-    field public static final int IMAGE_FORMAT_RGB_565 = 1; // 0x1
-    field public static final int IMAGE_FORMAT_UNDEFINED = 0; // 0x0
-  }
-
-  public static final class ResourceBuilders.AndroidImageResourceByResId {
-    method public static androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId fromProto(androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ResourceProto.AndroidImageResourceByResId toProto();
-  }
-
-  public static final class ResourceBuilders.AndroidImageResourceByResId.Builder {
-    method public androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId build();
-    method public androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId.Builder setResourceId(@DrawableRes int);
-  }
-
-  public static final class ResourceBuilders.ImageResource {
-    method public static androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ResourceBuilders.ImageResource fromProto(androidx.wear.tiles.proto.ResourceProto.ImageResource);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ResourceProto.ImageResource toProto();
-  }
-
-  public static final class ResourceBuilders.ImageResource.Builder {
-    method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource build();
-    method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResid(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId);
-    method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResid(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId.Builder);
-    method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setInlineResource(androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource);
-    method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setInlineResource(androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource.Builder);
-  }
-
-  public static final class ResourceBuilders.InlineImageResource {
-    method public static androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource fromProto(androidx.wear.tiles.proto.ResourceProto.InlineImageResource);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ResourceProto.InlineImageResource toProto();
-  }
-
-  public static final class ResourceBuilders.InlineImageResource.Builder {
-    method public androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource build();
-    method public androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource.Builder setData(byte[]);
-    method public androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource.Builder setFormat(int);
-    method public androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource.Builder setHeightPx(@Dimension(unit=androidx.annotation.Dimension.PX) int);
-    method public androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource.Builder setWidthPx(@Dimension(unit=androidx.annotation.Dimension.PX) int);
-  }
-
-  public static final class ResourceBuilders.Resources {
-    method public static androidx.wear.tiles.builders.ResourceBuilders.Resources.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.ResourceBuilders.Resources fromProto(androidx.wear.tiles.proto.ResourceProto.Resources);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.ResourceProto.Resources toProto();
-  }
-
-  public static final class ResourceBuilders.Resources.Builder {
-    method public androidx.wear.tiles.builders.ResourceBuilders.Resources.Builder addIdToImageMapping(String, androidx.wear.tiles.builders.ResourceBuilders.ImageResource);
-    method public androidx.wear.tiles.builders.ResourceBuilders.Resources.Builder addIdToImageMapping(String, androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder);
-    method public androidx.wear.tiles.builders.ResourceBuilders.Resources build();
-    method public androidx.wear.tiles.builders.ResourceBuilders.Resources.Builder setVersion(String);
-  }
-
-  public final class StateBuilders {
-  }
-
-  public static final class StateBuilders.State {
-    method public static androidx.wear.tiles.builders.StateBuilders.State.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.StateBuilders.State fromProto(androidx.wear.tiles.proto.StateProto.State);
-    method public String getLastClickableId();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.StateProto.State toProto();
-  }
-
-  public static final class StateBuilders.State.Builder {
-    method public androidx.wear.tiles.builders.StateBuilders.State build();
-    method public androidx.wear.tiles.builders.StateBuilders.State.Builder setLastClickableId(String);
-  }
-
-  public final class TileBuilders {
-  }
-
-  public static final class TileBuilders.Tile {
-    method public static androidx.wear.tiles.builders.TileBuilders.Tile.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.TileBuilders.Tile fromProto(androidx.wear.tiles.proto.TileProto.Tile);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.TileProto.Tile toProto();
-  }
-
-  public static final class TileBuilders.Tile.Builder {
-    method public androidx.wear.tiles.builders.TileBuilders.Tile build();
-    method public androidx.wear.tiles.builders.TileBuilders.Tile.Builder setFreshnessIntervalMillis(long);
-    method public androidx.wear.tiles.builders.TileBuilders.Tile.Builder setResourcesVersion(String);
-    method public androidx.wear.tiles.builders.TileBuilders.Tile.Builder setTimeline(androidx.wear.tiles.builders.TimelineBuilders.Timeline);
-    method public androidx.wear.tiles.builders.TileBuilders.Tile.Builder setTimeline(androidx.wear.tiles.builders.TimelineBuilders.Timeline.Builder);
-  }
-
-  public final class TimelineBuilders {
-  }
-
-  public static final class TimelineBuilders.TimeInterval {
-    method public static androidx.wear.tiles.builders.TimelineBuilders.TimeInterval.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.TimelineBuilders.TimeInterval fromProto(androidx.wear.tiles.proto.TimelineProto.TimeInterval);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.TimelineProto.TimeInterval toProto();
-  }
-
-  public static final class TimelineBuilders.TimeInterval.Builder {
-    method public androidx.wear.tiles.builders.TimelineBuilders.TimeInterval build();
-    method public androidx.wear.tiles.builders.TimelineBuilders.TimeInterval.Builder setEndMillis(long);
-    method public androidx.wear.tiles.builders.TimelineBuilders.TimeInterval.Builder setStartMillis(long);
-  }
-
-  public static final class TimelineBuilders.Timeline {
-    method public static androidx.wear.tiles.builders.TimelineBuilders.Timeline.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.TimelineBuilders.Timeline fromProto(androidx.wear.tiles.proto.TimelineProto.Timeline);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.TimelineProto.Timeline toProto();
-  }
-
-  public static final class TimelineBuilders.Timeline.Builder {
-    method public androidx.wear.tiles.builders.TimelineBuilders.Timeline.Builder addTimelineEntry(androidx.wear.tiles.builders.TimelineBuilders.TimelineEntry);
-    method public androidx.wear.tiles.builders.TimelineBuilders.Timeline.Builder addTimelineEntry(androidx.wear.tiles.builders.TimelineBuilders.TimelineEntry.Builder);
-    method public androidx.wear.tiles.builders.TimelineBuilders.Timeline build();
-  }
-
-  public static final class TimelineBuilders.TimelineEntry {
-    method public static androidx.wear.tiles.builders.TimelineBuilders.TimelineEntry.Builder builder();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static androidx.wear.tiles.builders.TimelineBuilders.TimelineEntry fromProto(androidx.wear.tiles.proto.TimelineProto.TimelineEntry);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.tiles.proto.TimelineProto.TimelineEntry toProto();
-  }
-
-  public static final class TimelineBuilders.TimelineEntry.Builder {
-    method public androidx.wear.tiles.builders.TimelineBuilders.TimelineEntry build();
-    method public androidx.wear.tiles.builders.TimelineBuilders.TimelineEntry.Builder setLayout(androidx.wear.tiles.builders.LayoutElementBuilders.Layout);
-    method public androidx.wear.tiles.builders.TimelineBuilders.TimelineEntry.Builder setLayout(androidx.wear.tiles.builders.LayoutElementBuilders.Layout.Builder);
-    method public androidx.wear.tiles.builders.TimelineBuilders.TimelineEntry.Builder setValidity(androidx.wear.tiles.builders.TimelineBuilders.TimeInterval);
-    method public androidx.wear.tiles.builders.TimelineBuilders.TimelineEntry.Builder setValidity(androidx.wear.tiles.builders.TimelineBuilders.TimeInterval.Builder);
-  }
-
-}
-
-package androidx.wear.tiles.readers {
-
-  public class DeviceParametersReaders {
-    field public static final int DEVICE_PLATFORM_UNDEFINED = 0; // 0x0
-    field public static final int DEVICE_PLATFORM_WEAR_OS = 1; // 0x1
-    field public static final int SCREEN_SHAPE_RECT = 2; // 0x2
-    field public static final int SCREEN_SHAPE_ROUND = 1; // 0x1
-    field public static final int SCREEN_SHAPE_UNDEFINED = 0; // 0x0
-  }
-
-  public static class DeviceParametersReaders.DeviceParameters {
-    method public int getDevicePlatform();
-    method @FloatRange(from=0.0, fromInclusive=false) public float getScreenDensity();
-    method @Dimension(unit=androidx.annotation.Dimension.DP) public int getScreenHeightDp();
-    method public int getScreenShape();
-    method @Dimension(unit=androidx.annotation.Dimension.DP) public int getScreenWidthDp();
-  }
-
-  public class EventReaders {
-  }
-
-  public static class EventReaders.TileAddEvent {
-    method public int getTileId();
-  }
-
-  public static class EventReaders.TileEnterEvent {
-    method public int getTileId();
-  }
-
-  public static class EventReaders.TileLeaveEvent {
-    method public int getTileId();
-  }
-
-  public static class EventReaders.TileRemoveEvent {
-    method public int getTileId();
-  }
-
-  public class RequestReaders {
-  }
-
-  public static class RequestReaders.ResourcesRequest {
-    method public androidx.wear.tiles.readers.DeviceParametersReaders.DeviceParameters getDeviceParameters();
-    method public java.util.List<java.lang.String!> getResourceIds();
-    method public int getTileId();
-    method public String getVersion();
-  }
-
-  public static class RequestReaders.TileRequest {
-    method public androidx.wear.tiles.readers.DeviceParametersReaders.DeviceParameters getDeviceParameters();
-    method public androidx.wear.tiles.builders.StateBuilders.State getState();
-    method public int getTileId();
-  }
-
-}
-

wear/wear-watchface-client/api/current.txt

diff --git a/wear/wear-watchface-client/api/current.txt b/wear/wear-watchface-client/api/current.txt
index 0c88581..e8551cb 100644
--- a/wear/wear-watchface-client/api/current.txt
+++ b/wear/wear-watchface-client/api/current.txt
@@ -37,77 +37,66 @@
     property public final boolean hasLowBitAmbient;
   }
 
-  public interface EditorObserverCallback {
-    method public void onEditorStateChange(androidx.wear.watchface.client.EditorState editorState);
+  public interface EditorListener {
+    method public void onEditorStateChanged(androidx.wear.watchface.client.EditorState editorState);
   }
 
   public interface EditorServiceClient {
+    method public void addListener(androidx.wear.watchface.client.EditorListener editorListener, java.util.concurrent.Executor listenerExecutor);
     method public void closeEditor();
-    method public void registerObserver(androidx.wear.watchface.client.EditorObserverCallback editorObserverCallback);
-    method public void registerObserver(optional java.util.concurrent.Executor? observerCallbackExecutor, androidx.wear.watchface.client.EditorObserverCallback editorObserverCallback);
-    method public void unregisterObserver(androidx.wear.watchface.client.EditorObserverCallback editorObserverCallback);
+    method public void removeListener(androidx.wear.watchface.client.EditorListener editorListener);
   }
 
   public final class EditorState {
-    method public java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> getPreviewComplicationData();
+    method public java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> getPreviewComplicationsData();
     method public java.util.Map<java.lang.String,java.lang.String> getUserStyle();
-    method public String? getWatchFaceInstanceId();
-    method public boolean hasCommitChanges();
-    property public final boolean commitChanges;
-    property public final java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> previewComplicationData;
+    method public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+    method public boolean shouldCommitChanges();
+    property public final java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> previewComplicationsData;
+    property public final boolean shouldCommitChanges;
     property public final java.util.Map<java.lang.String,java.lang.String> userStyle;
-    property public final String? watchFaceInstanceId;
+    property public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
   }
 
   public final class EditorStateKt {
   }
 
   public interface HeadlessWatchFaceClient extends java.lang.AutoCloseable {
-    method public android.os.IBinder asBinder();
-    method public default static androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBinder(android.os.IBinder binder);
-    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
+    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public long getPreviewReferenceTimeMillis();
     method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
-    method @RequiresApi(27) public android.graphics.Bitmap? takeComplicationScreenshot(int complicationId, androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.complications.data.ComplicationData complicationData, androidx.wear.watchface.style.UserStyle? userStyle);
-    method @RequiresApi(27) public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
-    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
+    method @RequiresApi(27) public android.graphics.Bitmap? renderComplicationToBitmap(int complicationId, androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.complications.data.ComplicationData complicationData, androidx.wear.watchface.style.UserStyle? userStyle);
+    method @RequiresApi(27) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
+    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public abstract long previewReferenceTimeMillis;
     property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
-    field public static final androidx.wear.watchface.client.HeadlessWatchFaceClient.Companion Companion;
-  }
-
-  public static final class HeadlessWatchFaceClient.Companion {
-    method public androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBinder(android.os.IBinder binder);
   }
 
   public interface InteractiveWatchFaceSysUiClient extends java.lang.AutoCloseable {
-    method public android.os.IBinder asBinder();
-    method public default static androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient createFromBinder(android.os.IBinder binder);
     method public java.util.List<androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.ContentDescriptionLabel> getContentDescriptionLabels();
     method public String getInstanceId();
     method public long getPreviewReferenceTimeMillis();
     method public void performAmbientTick();
-    method public void sendTouchEvent(int xPosition, int yPosition, int tapType);
+    method @RequiresApi(27) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
+    method public void sendTouchEvent(@Px int xPosition, @Px int yPosition, int tapType);
     method public void setSystemState(androidx.wear.watchface.client.SystemState systemState);
-    method @RequiresApi(27) public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
     property public abstract java.util.List<androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.ContentDescriptionLabel> contentDescriptionLabels;
     property public abstract String instanceId;
     property public abstract long previewReferenceTimeMillis;
     field public static final androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.Companion Companion;
-    field public static final int TAP_TYPE_TAP = 2; // 0x2
-    field public static final int TAP_TYPE_TOUCH = 0; // 0x0
-    field public static final int TAP_TYPE_TOUCH_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_DOWN = 0; // 0x0
+    field public static final int TAP_TYPE_UP = 2; // 0x2
   }
 
   public static final class InteractiveWatchFaceSysUiClient.Companion {
-    method public androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient createFromBinder(android.os.IBinder binder);
-    field public static final int TAP_TYPE_TAP = 2; // 0x2
-    field public static final int TAP_TYPE_TOUCH = 0; // 0x0
-    field public static final int TAP_TYPE_TOUCH_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_DOWN = 0; // 0x0
+    field public static final int TAP_TYPE_UP = 2; // 0x2
   }
 
   public static final class InteractiveWatchFaceSysUiClient.ContentDescriptionLabel {
-    ctor public InteractiveWatchFaceSysUiClient.ContentDescriptionLabel(android.support.wearable.complications.TimeDependentText text, android.graphics.Rect bounds, android.app.PendingIntent? tapAction);
+    ctor public InteractiveWatchFaceSysUiClient.ContentDescriptionLabel(androidx.wear.complications.data.ComplicationText text, android.graphics.Rect bounds, android.app.PendingIntent? tapAction);
     method public android.graphics.Rect getBounds();
     method public android.app.PendingIntent? getTapAction();
     method public CharSequence getTextAt(android.content.res.Resources resources, long dateTimeMillis);
@@ -116,27 +105,20 @@
   }
 
   public interface InteractiveWatchFaceWcsClient extends java.lang.AutoCloseable {
-    method public android.os.IBinder asBinder();
-    method public void bringAttentionToComplication(int complicationId);
-    method public default static androidx.wear.watchface.client.InteractiveWatchFaceWcsClient createFromBinder(android.os.IBinder binder);
+    method public void displayPressedAnimation(int complicationId);
     method public default Integer? getComplicationIdAt(@Px int x, @Px int y);
-    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
+    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public String getInstanceId();
     method public long getPreviewReferenceTimeMillis();
     method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
-    method @RequiresApi(27) public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
+    method @RequiresApi(27) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
     method public void updateComplicationData(java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData> idToComplicationData);
-    method public void updateInstance(String newInstanceId, androidx.wear.watchface.style.UserStyle userStyle);
-    method public void updateInstance(String newInstanceId, java.util.Map<java.lang.String,java.lang.String> userStyle);
-    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
+    method public void updateWatchFaceInstance(String newInstanceId, androidx.wear.watchface.style.UserStyle userStyle);
+    method public void updateWatchFaceInstance(String newInstanceId, java.util.Map<java.lang.String,java.lang.String> userStyle);
+    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public abstract String instanceId;
     property public abstract long previewReferenceTimeMillis;
     property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
-    field public static final androidx.wear.watchface.client.InteractiveWatchFaceWcsClient.Companion Companion;
-  }
-
-  public static final class InteractiveWatchFaceWcsClient.Companion {
-    method public androidx.wear.watchface.client.InteractiveWatchFaceWcsClient createFromBinder(android.os.IBinder binder);
   }
 
   public final class SystemState {
@@ -148,7 +130,7 @@
   }
 
   public interface WatchFaceControlClient extends java.lang.AutoCloseable {
-    method public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, int surfaceWidth, int surfaceHeight);
+    method public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, @Px int surfaceWidth, @Px int surfaceHeight);
     method public default static suspend Object? createWatchFaceControlClient(android.content.Context p, String context, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceControlClient> watchFacePackageName);
     method public androidx.wear.watchface.client.EditorServiceClient getEditorServiceClient();
     method public androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient? getInteractiveWatchFaceSysUiClientInstance(String instanceId);
@@ -168,5 +150,11 @@
     ctor public WatchFaceControlClient.ServiceStartFailureException();
   }
 
+  public final class WatchFaceId {
+    ctor public WatchFaceId(String id);
+    method public String getId();
+    property public final String id;
+  }
+
 }
 

wear/wear-watchface-client/api/public_plus_experimental_current.txt

diff --git a/wear/wear-watchface-client/api/public_plus_experimental_current.txt b/wear/wear-watchface-client/api/public_plus_experimental_current.txt
index f4ad91e..3341bd8 100644
--- a/wear/wear-watchface-client/api/public_plus_experimental_current.txt
+++ b/wear/wear-watchface-client/api/public_plus_experimental_current.txt
@@ -37,77 +37,66 @@
     property public final boolean hasLowBitAmbient;
   }
 
-  public interface EditorObserverCallback {
-    method public void onEditorStateChange(androidx.wear.watchface.client.EditorState editorState);
+  public interface EditorListener {
+    method public void onEditorStateChanged(androidx.wear.watchface.client.EditorState editorState);
   }
 
   public interface EditorServiceClient {
+    method public void addListener(androidx.wear.watchface.client.EditorListener editorListener, java.util.concurrent.Executor listenerExecutor);
     method public void closeEditor();
-    method public void registerObserver(androidx.wear.watchface.client.EditorObserverCallback editorObserverCallback);
-    method public void registerObserver(optional java.util.concurrent.Executor? observerCallbackExecutor, androidx.wear.watchface.client.EditorObserverCallback editorObserverCallback);
-    method public void unregisterObserver(androidx.wear.watchface.client.EditorObserverCallback editorObserverCallback);
+    method public void removeListener(androidx.wear.watchface.client.EditorListener editorListener);
   }
 
   public final class EditorState {
-    method public java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> getPreviewComplicationData();
+    method public java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> getPreviewComplicationsData();
     method public java.util.Map<java.lang.String,java.lang.String> getUserStyle();
-    method public String? getWatchFaceInstanceId();
-    method public boolean hasCommitChanges();
-    property public final boolean commitChanges;
-    property public final java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> previewComplicationData;
+    method public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+    method public boolean shouldCommitChanges();
+    property public final java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> previewComplicationsData;
+    property public final boolean shouldCommitChanges;
     property public final java.util.Map<java.lang.String,java.lang.String> userStyle;
-    property public final String? watchFaceInstanceId;
+    property public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
   }
 
   public final class EditorStateKt {
   }
 
   public interface HeadlessWatchFaceClient extends java.lang.AutoCloseable {
-    method public android.os.IBinder asBinder();
-    method public default static androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBinder(android.os.IBinder binder);
-    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
+    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public long getPreviewReferenceTimeMillis();
     method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
-    method @RequiresApi(27) public android.graphics.Bitmap? takeComplicationScreenshot(int complicationId, androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.complications.data.ComplicationData complicationData, androidx.wear.watchface.style.UserStyle? userStyle);
-    method @RequiresApi(27) public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
-    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
+    method @RequiresApi(27) public android.graphics.Bitmap? renderComplicationToBitmap(int complicationId, androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.complications.data.ComplicationData complicationData, androidx.wear.watchface.style.UserStyle? userStyle);
+    method @RequiresApi(27) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
+    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public abstract long previewReferenceTimeMillis;
     property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
-    field public static final androidx.wear.watchface.client.HeadlessWatchFaceClient.Companion Companion;
-  }
-
-  public static final class HeadlessWatchFaceClient.Companion {
-    method public androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBinder(android.os.IBinder binder);
   }
 
   public interface InteractiveWatchFaceSysUiClient extends java.lang.AutoCloseable {
-    method public android.os.IBinder asBinder();
-    method public default static androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient createFromBinder(android.os.IBinder binder);
     method public java.util.List<androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.ContentDescriptionLabel> getContentDescriptionLabels();
     method public String getInstanceId();
     method public long getPreviewReferenceTimeMillis();
     method public void performAmbientTick();
-    method public void sendTouchEvent(int xPosition, int yPosition, int tapType);
+    method @RequiresApi(27) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
+    method public void sendTouchEvent(@Px int xPosition, @Px int yPosition, int tapType);
     method public void setSystemState(androidx.wear.watchface.client.SystemState systemState);
-    method @RequiresApi(27) public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
     property public abstract java.util.List<androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.ContentDescriptionLabel> contentDescriptionLabels;
     property public abstract String instanceId;
     property public abstract long previewReferenceTimeMillis;
     field public static final androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.Companion Companion;
-    field public static final int TAP_TYPE_TAP = 2; // 0x2
-    field public static final int TAP_TYPE_TOUCH = 0; // 0x0
-    field public static final int TAP_TYPE_TOUCH_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_DOWN = 0; // 0x0
+    field public static final int TAP_TYPE_UP = 2; // 0x2
   }
 
   public static final class InteractiveWatchFaceSysUiClient.Companion {
-    method public androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient createFromBinder(android.os.IBinder binder);
-    field public static final int TAP_TYPE_TAP = 2; // 0x2
-    field public static final int TAP_TYPE_TOUCH = 0; // 0x0
-    field public static final int TAP_TYPE_TOUCH_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_DOWN = 0; // 0x0
+    field public static final int TAP_TYPE_UP = 2; // 0x2
   }
 
   public static final class InteractiveWatchFaceSysUiClient.ContentDescriptionLabel {
-    ctor public InteractiveWatchFaceSysUiClient.ContentDescriptionLabel(android.support.wearable.complications.TimeDependentText text, android.graphics.Rect bounds, android.app.PendingIntent? tapAction);
+    ctor public InteractiveWatchFaceSysUiClient.ContentDescriptionLabel(androidx.wear.complications.data.ComplicationText text, android.graphics.Rect bounds, android.app.PendingIntent? tapAction);
     method public android.graphics.Rect getBounds();
     method public android.app.PendingIntent? getTapAction();
     method public CharSequence getTextAt(android.content.res.Resources resources, long dateTimeMillis);
@@ -116,27 +105,20 @@
   }
 
   public interface InteractiveWatchFaceWcsClient extends java.lang.AutoCloseable {
-    method public android.os.IBinder asBinder();
-    method public void bringAttentionToComplication(int complicationId);
-    method public default static androidx.wear.watchface.client.InteractiveWatchFaceWcsClient createFromBinder(android.os.IBinder binder);
+    method public void displayPressedAnimation(int complicationId);
     method public default Integer? getComplicationIdAt(@Px int x, @Px int y);
-    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
+    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public String getInstanceId();
     method public long getPreviewReferenceTimeMillis();
     method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
-    method @RequiresApi(27) public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
+    method @RequiresApi(27) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
     method public void updateComplicationData(java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData> idToComplicationData);
-    method public void updateInstance(String newInstanceId, androidx.wear.watchface.style.UserStyle userStyle);
-    method public void updateInstance(String newInstanceId, java.util.Map<java.lang.String,java.lang.String> userStyle);
-    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
+    method public void updateWatchFaceInstance(String newInstanceId, androidx.wear.watchface.style.UserStyle userStyle);
+    method public void updateWatchFaceInstance(String newInstanceId, java.util.Map<java.lang.String,java.lang.String> userStyle);
+    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public abstract String instanceId;
     property public abstract long previewReferenceTimeMillis;
     property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
-    field public static final androidx.wear.watchface.client.InteractiveWatchFaceWcsClient.Companion Companion;
-  }
-
-  public static final class InteractiveWatchFaceWcsClient.Companion {
-    method public androidx.wear.watchface.client.InteractiveWatchFaceWcsClient createFromBinder(android.os.IBinder binder);
   }
 
   public final class SystemState {
@@ -148,7 +130,7 @@
   }
 
   public interface WatchFaceControlClient extends java.lang.AutoCloseable {
-    method public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, int surfaceWidth, int surfaceHeight);
+    method public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, @Px int surfaceWidth, @Px int surfaceHeight);
     method public default static suspend Object? createWatchFaceControlClient(android.content.Context p, String context, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceControlClient> watchFacePackageName);
     method public androidx.wear.watchface.client.EditorServiceClient getEditorServiceClient();
     method public androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient? getInteractiveWatchFaceSysUiClientInstance(String instanceId);
@@ -168,5 +150,11 @@
     ctor public WatchFaceControlClient.ServiceStartFailureException();
   }
 
+  public final class WatchFaceId {
+    ctor public WatchFaceId(String id);
+    method public String getId();
+    property public final String id;
+  }
+
 }
 

wear/wear-watchface-client/api/restricted_current.txt

diff --git a/wear/wear-watchface-client/api/restricted_current.txt b/wear/wear-watchface-client/api/restricted_current.txt
index 64c52c8..28faa3f 100644
--- a/wear/wear-watchface-client/api/restricted_current.txt
+++ b/wear/wear-watchface-client/api/restricted_current.txt
@@ -38,26 +38,25 @@
     property public final boolean hasLowBitAmbient;
   }
 
-  public interface EditorObserverCallback {
-    method public void onEditorStateChange(androidx.wear.watchface.client.EditorState editorState);
+  public interface EditorListener {
+    method public void onEditorStateChanged(androidx.wear.watchface.client.EditorState editorState);
   }
 
   public interface EditorServiceClient {
+    method public void addListener(androidx.wear.watchface.client.EditorListener editorListener, java.util.concurrent.Executor listenerExecutor);
     method public void closeEditor();
-    method public void registerObserver(androidx.wear.watchface.client.EditorObserverCallback editorObserverCallback);
-    method public void registerObserver(optional java.util.concurrent.Executor? observerCallbackExecutor, androidx.wear.watchface.client.EditorObserverCallback editorObserverCallback);
-    method public void unregisterObserver(androidx.wear.watchface.client.EditorObserverCallback editorObserverCallback);
+    method public void removeListener(androidx.wear.watchface.client.EditorListener editorListener);
   }
 
   public final class EditorState {
-    method public java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> getPreviewComplicationData();
+    method public java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> getPreviewComplicationsData();
     method public java.util.Map<java.lang.String,java.lang.String> getUserStyle();
-    method public String? getWatchFaceInstanceId();
-    method public boolean hasCommitChanges();
-    property public final boolean commitChanges;
-    property public final java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> previewComplicationData;
+    method public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+    method public boolean shouldCommitChanges();
+    property public final java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData> previewComplicationsData;
+    property public final boolean shouldCommitChanges;
     property public final java.util.Map<java.lang.String,java.lang.String> userStyle;
-    property public final String? watchFaceInstanceId;
+    property public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
   }
 
   public final class EditorStateKt {
@@ -65,51 +64,41 @@
   }
 
   public interface HeadlessWatchFaceClient extends java.lang.AutoCloseable {
-    method public android.os.IBinder asBinder();
-    method public default static androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBinder(android.os.IBinder binder);
-    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
+    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public long getPreviewReferenceTimeMillis();
     method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
-    method @RequiresApi(27) public android.graphics.Bitmap? takeComplicationScreenshot(int complicationId, androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.complications.data.ComplicationData complicationData, androidx.wear.watchface.style.UserStyle? userStyle);
-    method @RequiresApi(27) public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
-    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
+    method @RequiresApi(27) public android.graphics.Bitmap? renderComplicationToBitmap(int complicationId, androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.complications.data.ComplicationData complicationData, androidx.wear.watchface.style.UserStyle? userStyle);
+    method @RequiresApi(27) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
+    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public abstract long previewReferenceTimeMillis;
     property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
-    field public static final androidx.wear.watchface.client.HeadlessWatchFaceClient.Companion Companion;
-  }
-
-  public static final class HeadlessWatchFaceClient.Companion {
-    method public androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBinder(android.os.IBinder binder);
   }
 
   public interface InteractiveWatchFaceSysUiClient extends java.lang.AutoCloseable {
-    method public android.os.IBinder asBinder();
-    method public default static androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient createFromBinder(android.os.IBinder binder);
     method public java.util.List<androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.ContentDescriptionLabel> getContentDescriptionLabels();
     method public String getInstanceId();
     method public long getPreviewReferenceTimeMillis();
     method public void performAmbientTick();
-    method public void sendTouchEvent(int xPosition, int yPosition, @androidx.wear.watchface.client.TapType int tapType);
+    method @RequiresApi(27) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
+    method public void sendTouchEvent(@Px int xPosition, @Px int yPosition, @androidx.wear.watchface.client.TapType int tapType);
     method public void setSystemState(androidx.wear.watchface.client.SystemState systemState);
-    method @RequiresApi(27) public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
     property public abstract java.util.List<androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.ContentDescriptionLabel> contentDescriptionLabels;
     property public abstract String instanceId;
     property public abstract long previewReferenceTimeMillis;
     field public static final androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.Companion Companion;
-    field public static final int TAP_TYPE_TAP = 2; // 0x2
-    field public static final int TAP_TYPE_TOUCH = 0; // 0x0
-    field public static final int TAP_TYPE_TOUCH_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_DOWN = 0; // 0x0
+    field public static final int TAP_TYPE_UP = 2; // 0x2
   }
 
   public static final class InteractiveWatchFaceSysUiClient.Companion {
-    method public androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient createFromBinder(android.os.IBinder binder);
-    field public static final int TAP_TYPE_TAP = 2; // 0x2
-    field public static final int TAP_TYPE_TOUCH = 0; // 0x0
-    field public static final int TAP_TYPE_TOUCH_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+    field public static final int TAP_TYPE_DOWN = 0; // 0x0
+    field public static final int TAP_TYPE_UP = 2; // 0x2
   }
 
   public static final class InteractiveWatchFaceSysUiClient.ContentDescriptionLabel {
-    ctor public InteractiveWatchFaceSysUiClient.ContentDescriptionLabel(android.support.wearable.complications.TimeDependentText text, android.graphics.Rect bounds, android.app.PendingIntent? tapAction);
+    ctor public InteractiveWatchFaceSysUiClient.ContentDescriptionLabel(androidx.wear.complications.data.ComplicationText text, android.graphics.Rect bounds, android.app.PendingIntent? tapAction);
     method public android.graphics.Rect getBounds();
     method public android.app.PendingIntent? getTapAction();
     method public CharSequence getTextAt(android.content.res.Resources resources, long dateTimeMillis);
@@ -118,27 +107,20 @@
   }
 
   public interface InteractiveWatchFaceWcsClient extends java.lang.AutoCloseable {
-    method public android.os.IBinder asBinder();
-    method public void bringAttentionToComplication(int complicationId);
-    method public default static androidx.wear.watchface.client.InteractiveWatchFaceWcsClient createFromBinder(android.os.IBinder binder);
+    method public void displayPressedAnimation(int complicationId);
     method public default Integer? getComplicationIdAt(@Px int x, @Px int y);
-    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
+    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public String getInstanceId();
     method public long getPreviewReferenceTimeMillis();
     method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
-    method @RequiresApi(27) public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
+    method @RequiresApi(27) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idAndComplicationData);
     method public void updateComplicationData(java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData> idToComplicationData);
-    method public void updateInstance(String newInstanceId, androidx.wear.watchface.style.UserStyle userStyle);
-    method public void updateInstance(String newInstanceId, java.util.Map<java.lang.String,java.lang.String> userStyle);
-    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
+    method public void updateWatchFaceInstance(String newInstanceId, androidx.wear.watchface.style.UserStyle userStyle);
+    method public void updateWatchFaceInstance(String newInstanceId, java.util.Map<java.lang.String,java.lang.String> userStyle);
+    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public abstract String instanceId;
     property public abstract long previewReferenceTimeMillis;
     property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
-    field public static final androidx.wear.watchface.client.InteractiveWatchFaceWcsClient.Companion Companion;
-  }
-
-  public static final class InteractiveWatchFaceWcsClient.Companion {
-    method public androidx.wear.watchface.client.InteractiveWatchFaceWcsClient createFromBinder(android.os.IBinder binder);
   }
 
   public final class SystemState {
@@ -149,11 +131,11 @@
     property public final int interruptionFilter;
   }
 
-  @IntDef({androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.TAP_TYPE_TOUCH, androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.TAP_TYPE_TOUCH_CANCEL, androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.TAP_TYPE_TAP}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public @interface TapType {
+  @IntDef({androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.TAP_TYPE_DOWN, androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.TAP_TYPE_CANCEL, androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient.TAP_TYPE_UP}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public @interface TapType {
   }
 
   public interface WatchFaceControlClient extends java.lang.AutoCloseable {
-    method public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, int surfaceWidth, int surfaceHeight);
+    method public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, @Px int surfaceWidth, @Px int surfaceHeight);
     method public default static suspend Object? createWatchFaceControlClient(android.content.Context p, String context, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceControlClient> watchFacePackageName);
     method public androidx.wear.watchface.client.EditorServiceClient getEditorServiceClient();
     method public androidx.wear.watchface.client.InteractiveWatchFaceSysUiClient? getInteractiveWatchFaceSysUiClientInstance(String instanceId);
@@ -173,5 +155,11 @@
     ctor public WatchFaceControlClient.ServiceStartFailureException();
   }
 
+  public final class WatchFaceId {
+    ctor public WatchFaceId(String id);
+    method public String getId();
+    property public final String id;
+  }
+
 }
 

wear/wear-watchface-client/src/androidTest/java/androidx/wear/watchface/client/test/EditorServiceClientTest.kt

diff --git a/wear/wear-watchface-client/src/androidTest/java/androidx/wear/watchface/client/test/EditorServiceClientTest.kt b/wear/wear-watchface-client/src/androidTest/java/androidx/wear/watchface/client/test/EditorServiceClientTest.kt
index 3060243..9817f0a 100644
--- a/wear/wear-watchface-client/src/androidTest/java/androidx/wear/watchface/client/test/EditorServiceClientTest.kt
+++ b/wear/wear-watchface-client/src/androidTest/java/androidx/wear/watchface/client/test/EditorServiceClientTest.kt
@@ -18,7 +18,7 @@
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
-import androidx.wear.watchface.client.EditorObserverCallback
+import androidx.wear.watchface.client.EditorListener
 import androidx.wear.watchface.client.EditorServiceClientImpl
 import androidx.wear.watchface.client.EditorState
 import androidx.wear.watchface.editor.EditorService
@@ -37,12 +37,12 @@
     @Test
     fun registerObserver() {
         lateinit var observedEditorState: EditorState
-        val observer = object : EditorObserverCallback {
-            override fun onEditorStateChange(editorState: EditorState) {
+        val observer = object : EditorListener {
+            override fun onEditorStateChanged(editorState: EditorState) {
                 observedEditorState = editorState
             }
         }
-        editorServiceClient.registerObserver(observer)
+        editorServiceClient.addListener(observer) { runnable -> runnable.run() }
 
         val watchFaceInstanceId = "id-1"
         EditorService.globalEditorService.broadcastEditorState(
@@ -54,10 +54,15 @@
             )
         )
 
-        editorServiceClient.unregisterObserver(observer)
+        editorServiceClient.removeListener(observer)
 
-        assertThat(observedEditorState.watchFaceInstanceId).isEqualTo(watchFaceInstanceId)
+        assertThat(observedEditorState.watchFaceId.id).isEqualTo(watchFaceInstanceId)
         assertThat(observedEditorState.userStyle.toString()).isEqualTo("{color=red, size=small}")
-        assertTrue(observedEditorState.commitChanges)
+        assertTrue(observedEditorState.shouldCommitChanges)
+
+        val editorStateString = observedEditorState.toString()
+        assertThat(editorStateString).contains("watchFaceId: $watchFaceInstanceId")
+        assertThat(editorStateString).contains("{color=red, size=small}")
+        assertThat(editorStateString).contains("shouldCommitChanges: true")
     }
 }
\ No newline at end of file

wear/wear-watchface-client/src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlClientTest.kt

diff --git a/wear/wear-watchface-client/src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlClientTest.kt b/wear/wear-watchface-client/src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlClientTest.kt
index 6548a2e..9124eca 100644
--- a/wear/wear-watchface-client/src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlClientTest.kt
+++ b/wear/wear-watchface-client/src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlClientTest.kt
@@ -172,7 +172,7 @@
             400,
             400
         )!!
-        val bitmap = headlessInstance.takeWatchFaceScreenshot(
+        val bitmap = headlessInstance.renderWatchFaceToBitmap(
             RenderParameters(
                 DrawMode.INTERACTIVE,
                 RenderParameters.DRAW_ALL_LAYERS,
@@ -205,7 +205,7 @@
             400,
             400
         )!!
-        val bitmap = headlessInstance.takeWatchFaceScreenshot(
+        val bitmap = headlessInstance.renderWatchFaceToBitmap(
             RenderParameters(
                 DrawMode.INTERACTIVE,
                 mapOf(
@@ -235,9 +235,9 @@
             400
         )!!
 
-        assertThat(headlessInstance.complicationState.size).isEqualTo(2)
+        assertThat(headlessInstance.complicationsState.size).isEqualTo(2)
 
-        val leftComplicationDetails = headlessInstance.complicationState[
+        val leftComplicationDetails = headlessInstance.complicationsState[
             EXAMPLE_CANVAS_WATCHFACE_LEFT_COMPLICATION_ID
         ]!!
         assertThat(leftComplicationDetails.bounds).isEqualTo(Rect(80, 160, 160, 240))
@@ -257,7 +257,7 @@
         )
         assertTrue(leftComplicationDetails.isEnabled)
 
-        val rightComplicationDetails = headlessInstance.complicationState[
+        val rightComplicationDetails = headlessInstance.complicationsState[
             EXAMPLE_CANVAS_WATCHFACE_RIGHT_COMPLICATION_ID
         ]!!
         assertThat(rightComplicationDetails.bounds).isEqualTo(Rect(240, 160, 320, 240))
@@ -327,7 +327,7 @@
                 }
             }
 
-        val bitmap = interactiveInstance.takeWatchFaceScreenshot(
+        val bitmap = interactiveInstance.renderWatchFaceToBitmap(
             RenderParameters(
                 DrawMode.INTERACTIVE,
                 RenderParameters.DRAW_ALL_LAYERS,
@@ -372,7 +372,7 @@
                 }
             }
 
-        val bitmap = interactiveInstance.takeWatchFaceScreenshot(
+        val bitmap = interactiveInstance.renderWatchFaceToBitmap(
             RenderParameters(
                 DrawMode.INTERACTIVE,
                 RenderParameters.DRAW_ALL_LAYERS,
@@ -425,9 +425,9 @@
             )
         )
 
-        assertThat(interactiveInstance.complicationState.size).isEqualTo(2)
+        assertThat(interactiveInstance.complicationsState.size).isEqualTo(2)
 
-        val leftComplicationDetails = interactiveInstance.complicationState[
+        val leftComplicationDetails = interactiveInstance.complicationsState[
             EXAMPLE_CANVAS_WATCHFACE_LEFT_COMPLICATION_ID
         ]!!
         assertThat(leftComplicationDetails.bounds).isEqualTo(Rect(80, 160, 160, 240))
@@ -450,7 +450,7 @@
             ComplicationType.SHORT_TEXT
         )
 
-        val rightComplicationDetails = interactiveInstance.complicationState[
+        val rightComplicationDetails = interactiveInstance.complicationsState[
             EXAMPLE_CANVAS_WATCHFACE_RIGHT_COMPLICATION_ID
         ]!!
         assertThat(rightComplicationDetails.bounds).isEqualTo(Rect(240, 160, 320, 240))
@@ -637,7 +637,7 @@
 
         // Note this map doesn't include all the categories, which is fine the others will be set
         // to their defaults.
-        interactiveInstance.updateInstance(
+        interactiveInstance.updateWatchFaceInstance(
             "testId2",
             mapOf(
                 COLOR_STYLE_SETTING to BLUE_STYLE,
@@ -649,9 +649,9 @@
 
         // The complications should have been cleared.
         val leftComplication =
-            interactiveInstance.complicationState[EXAMPLE_CANVAS_WATCHFACE_LEFT_COMPLICATION_ID]!!
+            interactiveInstance.complicationsState[EXAMPLE_CANVAS_WATCHFACE_LEFT_COMPLICATION_ID]!!
         val rightComplication =
-            interactiveInstance.complicationState[EXAMPLE_CANVAS_WATCHFACE_RIGHT_COMPLICATION_ID]!!
+            interactiveInstance.complicationsState[EXAMPLE_CANVAS_WATCHFACE_RIGHT_COMPLICATION_ID]!!
         assertThat(leftComplication.currentType).isEqualTo(ComplicationType.NO_DATA)
         assertThat(rightComplication.currentType).isEqualTo(ComplicationType.NO_DATA)
 
@@ -662,7 +662,7 @@
         sysUiInterface?.close()
 
         interactiveInstance.updateComplicationData(complications)
-        val bitmap = interactiveInstance.takeWatchFaceScreenshot(
+        val bitmap = interactiveInstance.renderWatchFaceToBitmap(
             RenderParameters(
                 DrawMode.INTERACTIVE,
                 RenderParameters.DRAW_ALL_LAYERS,

wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/ComplicationState.kt

diff --git a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/ComplicationState.kt b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/ComplicationState.kt
index 4023d7c..3b1196c 100644
--- a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/ComplicationState.kt
+++ b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/ComplicationState.kt
@@ -25,45 +25,38 @@
 import androidx.wear.watchface.Complication
 import androidx.wear.watchface.data.ComplicationBoundsType
 import androidx.wear.watchface.data.ComplicationStateWireFormat
-import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting.ComplicationOverlay
-import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting.ComplicationsOption
 
-/** State of the [Complication]. */
+/**
+ * State of the [Complication].
+ *
+ * @param bounds Screen space bounds of the [Complication] in pixels.
+ * @param boundsType The type of the complication's bounds.
+ * @param supportedTypes The [ComplicationType]s supported by this complication.
+ * @param defaultProviderPolicy The [DefaultComplicationProviderPolicy] for this complication.
+ * @param defaultProviderType The default [ComplicationType] for this complication.
+ * @param isEnabled Whether or not the complication is currently enabled (i.e. it should be drawn).
+ * @param isInitiallyEnabled Whether or not the complication was initially enabled before
+ *     considering any [ComplicationsOption] whose [ComplicationOverlay]s may enable or disable
+ *     complications.
+ * @param currentType The [ComplicationType] of the complication's current [ComplicationData].
+ * @param fixedComplicationProvider Whether or not the complication provider is fixed (i.e the user
+ *      can't configure it).
+ * @param complicationConfigExtras Extras to be merged into the Intent sent when invoking the
+ *      provider chooser activity.
+ */
 public class ComplicationState(
-    /** Screen space bounds of the [Complication] in pixels. */
     public val bounds: Rect,
-
-    /** The type of the complication's bounds. */
     @ComplicationBoundsType public val boundsType: Int,
-
-    /** The [ComplicationType]s supported by this complication. */
     public val supportedTypes: List<ComplicationType>,
-
-    /** The [DefaultComplicationProviderPolicy] for this complication. */
     public val defaultProviderPolicy: DefaultComplicationProviderPolicy,
-
-    /** The default [ComplicationType] for this complication. */
     public val defaultProviderType: ComplicationType,
-
-    /** Whether or not the complication is currently enabled (i.e. it should be drawn). */
     @get:JvmName("isEnabled")
     public val isEnabled: Boolean,
-
-    /**
-     * Whether or not the complication was initially enabled before considering any
-     * [ComplicationsOption] whose [ComplicationOverlay]s may enable or disable complications.
-     */
     @get:JvmName("isInitiallyEnabled")
     public val isInitiallyEnabled: Boolean,
-
-    /** The [ComplicationType] of the complication's current [ComplicationData]. */
     public val currentType: ComplicationType,
-
-    /** Whether or not the complication provider is fixed (i.e the user can't configure it). */
     @get:JvmName("isFixedComplicationProvider")
     public val fixedComplicationProvider: Boolean,
-
-    /** Extras to be merged into the Intent sent when invoking the provider chooser activity. */
     public val complicationConfigExtras: Bundle
 ) {
     /** @hide */

wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/DeviceConfig.kt

diff --git a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/DeviceConfig.kt b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/DeviceConfig.kt
index eb82cef..cf58f8a0 100644
--- a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/DeviceConfig.kt
+++ b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/DeviceConfig.kt
@@ -16,23 +16,21 @@
 
 package androidx.wear.watchface.client
 
-/** Describes the hardware configuration of the device the watch face is running on. */
+/**
+ * Describes the hardware configuration of the device the watch face is running on.
+ *
+ * @param hasLowBitAmbient Whether or not the watch hardware supports low bit ambient support.
+ * @param hasBurnInProtection Whether or not the watch hardware supports burn in protection.
+ * @param analogPreviewReferenceTimeMillis UTC reference time for screenshots of analog watch faces
+ *     in milliseconds since the epoch.
+ * @param digitalPreviewReferenceTimeMillis UTC reference time for screenshots of digital watch
+ *     faces in milliseconds since the epoch.
+ */
 public class DeviceConfig(
-    /** Whether or not the watch hardware supports low bit ambient support. */
     @get:JvmName("hasLowBitAmbient")
     public val hasLowBitAmbient: Boolean,
-
-    /** Whether or not the watch hardware supports burn in protection. */
     @get:JvmName("hasBurnInProtection")
     public val hasBurnInProtection: Boolean,
-
-    /**
-     * UTC reference time for screenshots of analog watch faces in milliseconds since the epoch.
-     */
     public val analogPreviewReferenceTimeMillis: Long,
-
-    /**
-     * UTC reference time for screenshots of digital watch faces in milliseconds since the epoch.
-     */
     public val digitalPreviewReferenceTimeMillis: Long
 )

wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/EditorServiceClient.kt

diff --git a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/EditorServiceClient.kt b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/EditorServiceClient.kt
index b23223c..c48e5da 100644
--- a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/EditorServiceClient.kt
+++ b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/EditorServiceClient.kt
@@ -22,36 +22,30 @@
 import androidx.wear.watchface.editor.data.EditorStateWireFormat
 import java.util.concurrent.Executor
 
-/** Client for the watchface editor service. */
+/**
+ * Client for the watchface editor service, which observes
+ * [androidx.wear.watchface.editor.EditorSession]. This client can be reused to observe multiple
+ * editor sessions.
+ */
 public interface EditorServiceClient {
     /**
-     * Starts listening to [androidx.wear.watchface.editor.EditorSession] events, with the callback
-     * executed by an immediate executor on an undefined thread.
+     * Starts listening for [EditorState] which is sent when
+     * [androidx.wear.watchface.editor.EditorSession] closes. The
+     * [EditorListener.onEditorStateChanged] callback is run on the specified [listenerExecutor].
      */
-    public fun registerObserver(
-        editorObserverCallback: EditorObserverCallback
-    )
+    public fun addListener(editorListener: EditorListener, listenerExecutor: Executor)
 
-    /**
-     * Starts listening to [androidx.wear.watchface.editor.EditorSession] events with the callback
-     * run on the specified [Executor] by an immediate executor, on an undefined thread if `null`.
-     */
-    public fun registerObserver(
-        observerCallbackExecutor: Executor? = null,
-        editorObserverCallback: EditorObserverCallback
-    )
-
-    /** Unregisters an [EditorObserverCallback] previously registered via [registerObserver].  */
-    public fun unregisterObserver(editorObserverCallback: EditorObserverCallback)
+    /** Unregisters an [EditorListener] previously registered via [addListener].  */
+    public fun removeListener(editorListener: EditorListener)
 
     /** Instructs any open editor to close. */
     public fun closeEditor()
 }
 
 /** Observes state changes in [androidx.wear.watchface.editor.EditorSession]. */
-public interface EditorObserverCallback {
+public interface EditorListener {
     /** Called in response to [androidx.wear.watchface.editor.EditorSession.close] .*/
-    public fun onEditorStateChange(editorState: EditorState)
+    public fun onEditorStateChanged(editorState: EditorState)
 }
 
 /** @hide */
@@ -60,28 +54,18 @@
     private val iEditorService: IEditorService
 ) : EditorServiceClient {
     private val lock = Any()
-    private val editorMap = HashMap<EditorObserverCallback, Int>()
+    private val editorMap = HashMap<EditorListener, Int>()
 
-    override fun registerObserver(editorObserverCallback: EditorObserverCallback) {
-        registerObserver(null, editorObserverCallback)
-    }
-
-    override fun registerObserver(
-        observerCallbackExecutor: Executor?,
-        editorObserverCallback: EditorObserverCallback
+    override fun addListener(
+        editorListener: EditorListener,
+        listenerExecutor: Executor
     ) {
-        val executor = observerCallbackExecutor ?: object : Executor {
-            override fun execute(runnable: Runnable) {
-                runnable.run()
-            }
-        }
-
         val observer = object : IEditorObserver.Stub() {
             override fun getApiVersion() = IEditorObserver.API_VERSION
 
             override fun onEditorStateChange(editorStateWireFormat: EditorStateWireFormat) {
-                executor.execute {
-                    editorObserverCallback.onEditorStateChange(
+                listenerExecutor.execute {
+                    editorListener.onEditorStateChanged(
                         editorStateWireFormat.asApiEditorState()
                     )
                 }
@@ -89,15 +73,15 @@
         }
 
         synchronized(lock) {
-            editorMap[editorObserverCallback] = iEditorService.registerObserver(observer)
+            editorMap[editorListener] = iEditorService.registerObserver(observer)
         }
     }
 
-    override fun unregisterObserver(editorObserverCallback: EditorObserverCallback) {
+    override fun removeListener(editorListener: EditorListener) {
         synchronized(lock) {
-            editorMap[editorObserverCallback]?.let {
+            editorMap[editorListener]?.let {
                 iEditorService.unregisterObserver(it)
-                editorMap.remove(editorObserverCallback)
+                editorMap.remove(editorListener)
             }
         }
     }

wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/EditorState.kt

diff --git a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/EditorState.kt b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/EditorState.kt
index f425f28..31fc4e3 100644
--- a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/EditorState.kt
+++ b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/EditorState.kt
@@ -16,41 +16,63 @@
 
 package androidx.wear.watchface.client
 
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.annotation.RestrictTo
 import androidx.wear.complications.data.ComplicationData
-import androidx.wear.complications.data.asApiComplicationData
+import androidx.wear.complications.data.toApiComplicationData
 import androidx.wear.watchface.editor.data.EditorStateWireFormat
 import androidx.wear.watchface.style.UserStyle
 
-/** The state of the editing session. See [androidx.wear.watchface.editor.EditorSession]. */
+/**
+ * The system is responsible for the management and generation of these ids and they have no
+ * context outside of an instance of an EditorState and should not be stored or saved for later
+ * use by the WatchFace provider.
+ *
+ * @param id The system's id for a watch face being edited. This is passed in from
+ *     [androidx.wear.watchface.EditorRequest.watchFaceId].
+ */
+public class WatchFaceId(public val id: String)
+
+/**
+ * The state of the editing session. See [androidx.wear.watchface.editor.EditorSession].
+ *
+ * @param watchFaceId Unique ID for the instance of the watch face being edited (see
+ *     [androidx.wear.watchface.editor.EditorRequest.watchFaceId]), only defined for
+ *     Android R and beyond.
+ * @param userStyle The current [UserStyle] encoded as a Map<String, String>.
+ * @param previewComplicationsData Preview [ComplicationData] needed for taking screenshots without
+ *     live complication data.
+ * @param shouldCommitChanges Whether or not this state should be committed (i.e. the user aborted
+ *     the session). If it's not committed then any changes (E.g. complication provider changes)
+ *     should be abandoned. There's no need to resend the style to the watchface because the
+ *     library will have restored the previous style.
+ */
 public class EditorState internal constructor(
-    /**
-     * Unique ID for the instance of the watch face being edited, only defined for Android R and
-     * beyond, it's `null` on Android P and earlier.
-     */
-    public val watchFaceInstanceId: String?,
-
-    /** The current [UserStyle] encoded as a Map<String, String>. */
+    @RequiresApi(Build.VERSION_CODES.R)
+    public val watchFaceId: WatchFaceId,
     public val userStyle: Map<String, String>,
-
-    /** Preview [ComplicationData] needed for taking screenshots without live complication data. */
-    public val previewComplicationData: Map<Int, ComplicationData>,
-
-    /** Whether or not this state should be committed. */
-    @get:JvmName("hasCommitChanges")
-    public val commitChanges: Boolean
-)
+    public val previewComplicationsData: Map<Int, ComplicationData>,
+    @get:JvmName("shouldCommitChanges")
+    public val shouldCommitChanges: Boolean
+) {
+    override fun toString(): String =
+        "{watchFaceId: ${watchFaceId.id}, userStyle: $userStyle" +
+            ", previewComplicationsData: [" +
+            previewComplicationsData.map { "${it.key} -> ${it.value}" }.joinToString() +
+            "], shouldCommitChanges: $shouldCommitChanges}"
+}
 
 /** @hide */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public fun EditorStateWireFormat.asApiEditorState(): EditorState {
     return EditorState(
-        watchFaceInstanceId,
+        WatchFaceId(watchFaceInstanceId ?: ""),
         userStyle.mUserStyle,
         previewComplicationData.associateBy(
             { it.id },
-            { it.complicationData.asApiComplicationData() }
+            { it.complicationData.toApiComplicationData() }
         ),
         commitChanges
     )
-}
\ No newline at end of file
+}

wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/HeadlessWatchFaceClient.kt

diff --git a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/HeadlessWatchFaceClient.kt b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/HeadlessWatchFaceClient.kt
index 4ea6283..c9e6796 100644
--- a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/HeadlessWatchFaceClient.kt
+++ b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/HeadlessWatchFaceClient.kt
@@ -17,18 +17,20 @@
 package androidx.wear.watchface.client
 
 import android.graphics.Bitmap
-import android.os.IBinder
 import android.support.wearable.watchface.SharedMemoryImage
 import androidx.annotation.RequiresApi
 import androidx.wear.complications.data.ComplicationData
 import androidx.wear.utility.TraceEvent
+import androidx.wear.watchface.Complication
+import androidx.wear.watchface.ComplicationsManager
 import androidx.wear.watchface.RenderParameters
 import androidx.wear.watchface.control.IHeadlessWatchFace
-import androidx.wear.watchface.control.data.ComplicationScreenshotParams
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams
+import androidx.wear.watchface.control.data.ComplicationRenderParams
+import androidx.wear.watchface.control.data.WatchFaceRenderParams
 import androidx.wear.watchface.data.IdAndComplicationDataWireFormat
 import androidx.wear.watchface.style.UserStyle
 import androidx.wear.watchface.style.UserStyleSchema
+import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting
 
 /**
  * Controls a stateless remote headless watch face.  This is mostly intended for use by watch face
@@ -45,21 +47,16 @@
     public val userStyleSchema: UserStyleSchema
 
     /**
-     * Map of complication ids to [ComplicationState] for each complication slot. Note this can
-     * change, typically in response to styling.
+     * Map of complication ids to [ComplicationState] for each [Complication] registered with the
+     * watch face's [ComplicationsManager]. The ComplicationState is based on the initial state of
+     * each Complication plus any overrides from the default style's
+     * [ComplicationsUserStyleSetting]. Because the style can't change, ComplicationState is
+     * immutable for a headless watch face.
      */
-    public val complicationState: Map<Int, ComplicationState>
-
-    public companion object {
-        /** Constructs a [HeadlessWatchFaceClient] from an [IBinder]. */
-        @JvmStatic
-        public fun createFromBinder(binder: IBinder): HeadlessWatchFaceClient =
-            HeadlessWatchFaceClientImpl(binder)
-    }
+    public val complicationsState: Map<Int, ComplicationState>
 
     /**
-     * Requests a shared memory backed [Bitmap] containing a screenshot of the watch face with the
-     * given settings.
+     * Renders the watchface to a shared memory backed [Bitmap] with the given settings.
      *
      * @param renderParameters The [RenderParameters] to draw with.
      * @param calendarTimeMillis The UTC time in milliseconds since the epoch to render with.
@@ -70,7 +67,7 @@
      *     given settings.
      */
     @RequiresApi(27)
-    public fun takeWatchFaceScreenshot(
+    public fun renderWatchFaceToBitmap(
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         userStyle: UserStyle?,
@@ -78,8 +75,7 @@
     ): Bitmap
 
     /**
-     * Requests a shared memory backed [Bitmap] containing a screenshot of the complication with the
-     * given settings.
+     * Renders the complication to a shared memory backed [Bitmap] with the given settings.
      *
      * @param complicationId The id of the complication to render
      * @param renderParameters The [RenderParameters] to draw with
@@ -90,46 +86,41 @@
      *     given settings, or `null` if [complicationId] is unrecognized.
      */
     @RequiresApi(27)
-    public fun takeComplicationScreenshot(
+    public fun renderComplicationToBitmap(
         complicationId: Int,
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         complicationData: ComplicationData,
         userStyle: UserStyle?,
     ): Bitmap?
-
-    /** Returns the associated [IBinder]. Allows this interface to be passed over AIDL. */
-    public fun asBinder(): IBinder
 }
 
 internal class HeadlessWatchFaceClientImpl internal constructor(
     private val iHeadlessWatchFace: IHeadlessWatchFace
 ) : HeadlessWatchFaceClient {
 
-    constructor(binder: IBinder) : this(IHeadlessWatchFace.Stub.asInterface(binder))
-
     override val previewReferenceTimeMillis: Long
         get() = iHeadlessWatchFace.previewReferenceTimeMillis
 
     override val userStyleSchema: UserStyleSchema
         get() = UserStyleSchema(iHeadlessWatchFace.userStyleSchema)
 
-    override val complicationState: Map<Int, ComplicationState>
+    override val complicationsState: Map<Int, ComplicationState>
         get() = iHeadlessWatchFace.complicationState.associateBy(
             { it.id },
             { ComplicationState(it.complicationState) }
         )
 
     @RequiresApi(27)
-    override fun takeWatchFaceScreenshot(
+    override fun renderWatchFaceToBitmap(
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         userStyle: UserStyle?,
         idToComplicationData: Map<Int, ComplicationData>?
-    ): Bitmap = TraceEvent("HeadlessWatchFaceClientImpl.takeWatchFaceScreenshot").use {
+    ): Bitmap = TraceEvent("HeadlessWatchFaceClientImpl.renderWatchFaceToBitmap").use {
         SharedMemoryImage.ashmemReadImageBundle(
-            iHeadlessWatchFace.takeWatchFaceScreenshot(
-                WatchfaceScreenshotParams(
+            iHeadlessWatchFace.renderWatchFaceToBitmap(
+                WatchFaceRenderParams(
                     renderParameters.toWireFormat(),
                     calendarTimeMillis,
                     userStyle?.toWireFormat(),
@@ -145,15 +136,15 @@
     }
 
     @RequiresApi(27)
-    override fun takeComplicationScreenshot(
+    override fun renderComplicationToBitmap(
         complicationId: Int,
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         complicationData: ComplicationData,
         userStyle: UserStyle?,
-    ): Bitmap? = TraceEvent("HeadlessWatchFaceClientImpl.takeComplicationScreenshot").use {
-        iHeadlessWatchFace.takeComplicationScreenshot(
-            ComplicationScreenshotParams(
+    ): Bitmap? = TraceEvent("HeadlessWatchFaceClientImpl.renderComplicationToBitmap").use {
+        iHeadlessWatchFace.renderComplicationToBitmap(
+            ComplicationRenderParams(
                 complicationId,
                 renderParameters.toWireFormat(),
                 calendarTimeMillis,
@@ -168,6 +159,4 @@
     override fun close() = TraceEvent("HeadlessWatchFaceClientImpl.close").use {
         iHeadlessWatchFace.release()
     }
-
-    override fun asBinder(): IBinder = iHeadlessWatchFace.asBinder()
 }

wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/InteractiveWatchFaceSysUiClient.kt

diff --git a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/InteractiveWatchFaceSysUiClient.kt b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/InteractiveWatchFaceSysUiClient.kt
index 64201a8..8c47bb6 100644
--- a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/InteractiveWatchFaceSysUiClient.kt
+++ b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/InteractiveWatchFaceSysUiClient.kt
@@ -20,17 +20,18 @@
 import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.Rect
-import android.os.IBinder
-import android.support.wearable.complications.TimeDependentText
 import android.support.wearable.watchface.SharedMemoryImage
 import androidx.annotation.IntDef
+import androidx.annotation.Px
 import androidx.annotation.RequiresApi
 import androidx.annotation.RestrictTo
 import androidx.wear.complications.data.ComplicationData
+import androidx.wear.complications.data.ComplicationText
+import androidx.wear.complications.data.toApiComplicationText
 import androidx.wear.utility.TraceEvent
 import androidx.wear.watchface.RenderParameters
 import androidx.wear.watchface.control.IInteractiveWatchFaceSysUI
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams
+import androidx.wear.watchface.control.data.WatchFaceRenderParams
 import androidx.wear.watchface.data.IdAndComplicationDataWireFormat
 import androidx.wear.watchface.style.UserStyle
 import java.util.Objects
@@ -40,9 +41,9 @@
  * @hide
  */
 @IntDef(
-    InteractiveWatchFaceSysUiClient.TAP_TYPE_TOUCH,
-    InteractiveWatchFaceSysUiClient.TAP_TYPE_TOUCH_CANCEL,
-    InteractiveWatchFaceSysUiClient.TAP_TYPE_TAP
+    InteractiveWatchFaceSysUiClient.TAP_TYPE_DOWN,
+    InteractiveWatchFaceSysUiClient.TAP_TYPE_CANCEL,
+    InteractiveWatchFaceSysUiClient.TAP_TYPE_UP
 )
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public annotation class TapType
@@ -57,45 +58,38 @@
 
     public companion object {
         /** Indicates a "down" touch event on the watch face. */
-        public const val TAP_TYPE_TOUCH: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_TOUCH
+        public const val TAP_TYPE_DOWN: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_DOWN
 
         /**
-         * Indicates that a previous TAP_TYPE_TOUCH event has been canceled. This generally happens
+         * Indicates that a previous [TAP_TYPE_DOWN] event has been canceled. This generally happens
          * when the watch face is touched but then a move or long press occurs.
          */
-        public const val TAP_TYPE_TOUCH_CANCEL: Int =
-            IInteractiveWatchFaceSysUI.TAP_TYPE_TOUCH_CANCEL
+        public const val TAP_TYPE_CANCEL: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_CANCEL
 
         /**
          * Indicates that an "up" event on the watch face has occurred that has not been consumed by
-         * another activity. A TAP_TYPE_TOUCH always occur first. This event will not occur if a
-         * TAP_TYPE_TOUCH_CANCEL is sent.
+         * another activity. A [TAP_TYPE_DOWN] always occur first. This event will not occur if a
+         * [TAP_TYPE_CANCEL] is sent.
          */
-        public const val TAP_TYPE_TAP: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_TAP
-
-        /**
-         * Constructs an [InteractiveWatchFaceSysUiClient] from the [IBinder] returned by
-         * [asBinder].
-         */
-        @JvmStatic
-        public fun createFromBinder(binder: IBinder): InteractiveWatchFaceSysUiClient =
-            InteractiveWatchFaceSysUiClientImpl(binder)
+        public const val TAP_TYPE_UP: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_UP
     }
 
     /**
      * Sends a tap event to the watch face for processing.
      */
-    public fun sendTouchEvent(xPosition: Int, yPosition: Int, @TapType tapType: Int)
+    public fun sendTouchEvent(@Px xPosition: Int, @Px yPosition: Int, @TapType tapType: Int)
 
-    /** Describes regions of the watch face for use by a screen reader. */
+    /**
+     * Describes regions of the watch face for use by a screen reader.
+     *
+     * @param text [ComplicationText] associated with the region, to be read by the screen reader.
+     * @param bounds [Rect] describing the area of the feature on screen.
+     * @param tapAction [PendingIntent] to be used if the screen reader's user triggers a tap
+     *     action.
+     */
     public class ContentDescriptionLabel(
-        /** Text associated with the region, to be read by the screen reader. */
-        private val text: TimeDependentText,
-
-        /** Area of the feature on screen. */
+        private val text: ComplicationText,
         public val bounds: Rect,
-
-        /** [PendingIntent] to be used if the screen reader's user triggers a tap action. */
         public val tapAction: PendingIntent?
     ) {
         /**
@@ -129,8 +123,7 @@
     public val contentDescriptionLabels: List<ContentDescriptionLabel>
 
     /**
-     * Requests a shared memory backed [Bitmap] containing a screenshot of the watch face with the
-     * given settings.
+     * Renders the watchface to a shared memory backed [Bitmap] with the given settings.
      *
      * @param renderParameters The [RenderParameters] to draw with.
      * @param calendarTimeMillis The UTC time in milliseconds since the epoch to render with.
@@ -141,7 +134,7 @@
      *     given settings.
      */
     @RequiresApi(27)
-    public fun takeWatchFaceScreenshot(
+    public fun renderWatchFaceToBitmap(
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         userStyle: UserStyle?,
@@ -159,17 +152,12 @@
 
     /** Triggers watch face rendering into the surface when in ambient mode. */
     public fun performAmbientTick()
-
-    /** Returns the associated [IBinder]. Allows this interface to be passed over AIDL. */
-    public fun asBinder(): IBinder
 }
 
 internal class InteractiveWatchFaceSysUiClientImpl internal constructor(
     private val iInteractiveWatchFaceSysUI: IInteractiveWatchFaceSysUI
 ) : InteractiveWatchFaceSysUiClient {
 
-    constructor(binder: IBinder) : this(IInteractiveWatchFaceSysUI.Stub.asInterface(binder))
-
     override fun sendTouchEvent(
         xPosition: Int,
         yPosition: Int,
@@ -182,22 +170,22 @@
         List<InteractiveWatchFaceSysUiClient.ContentDescriptionLabel>
             get() = iInteractiveWatchFaceSysUI.contentDescriptionLabels.map {
                 InteractiveWatchFaceSysUiClient.ContentDescriptionLabel(
-                    it.text,
+                    it.text.toApiComplicationText(),
                     it.bounds,
                     it.tapAction
                 )
             }
 
     @RequiresApi(27)
-    override fun takeWatchFaceScreenshot(
+    override fun renderWatchFaceToBitmap(
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         userStyle: UserStyle?,
         idAndComplicationData: Map<Int, ComplicationData>?
-    ): Bitmap = TraceEvent("InteractiveWatchFaceSysUiClientImpl.takeWatchFaceScreenshot").use {
+    ): Bitmap = TraceEvent("InteractiveWatchFaceSysUiClientImpl.renderWatchFaceToBitmap").use {
         SharedMemoryImage.ashmemReadImageBundle(
-            iInteractiveWatchFaceSysUI.takeWatchFaceScreenshot(
-                WatchfaceScreenshotParams(
+            iInteractiveWatchFaceSysUI.renderWatchFaceToBitmap(
+                WatchFaceRenderParams(
                     renderParameters.toWireFormat(),
                     calendarTimeMillis,
                     userStyle?.toWireFormat(),
@@ -238,6 +226,4 @@
     override fun close() = TraceEvent("InteractiveWatchFaceSysUiClientImpl.close").use {
         iInteractiveWatchFaceSysUI.release()
     }
-
-    override fun asBinder(): IBinder = iInteractiveWatchFaceSysUI.asBinder()
 }

wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/InteractiveWatchFaceWcsClient.kt

diff --git a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/InteractiveWatchFaceWcsClient.kt b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/InteractiveWatchFaceWcsClient.kt
index e60a906..811fb6c 100644
--- a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/InteractiveWatchFaceWcsClient.kt
+++ b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/InteractiveWatchFaceWcsClient.kt
@@ -17,19 +17,21 @@
 package androidx.wear.watchface.client
 
 import android.graphics.Bitmap
-import android.os.IBinder
 import android.support.wearable.watchface.SharedMemoryImage
 import androidx.annotation.Px
 import androidx.annotation.RequiresApi
 import androidx.wear.complications.data.ComplicationData
 import androidx.wear.utility.TraceEvent
+import androidx.wear.watchface.Complication
+import androidx.wear.watchface.ComplicationsManager
 import androidx.wear.watchface.RenderParameters
 import androidx.wear.watchface.control.IInteractiveWatchFaceWCS
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams
+import androidx.wear.watchface.control.data.WatchFaceRenderParams
 import androidx.wear.watchface.data.ComplicationBoundsType
 import androidx.wear.watchface.data.IdAndComplicationDataWireFormat
 import androidx.wear.watchface.style.UserStyle
 import androidx.wear.watchface.style.UserStyleSchema
+import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting
 import androidx.wear.watchface.style.data.UserStyleWireFormat
 
 /**
@@ -40,16 +42,6 @@
  * Note clients should call [close] when finished.
  */
 public interface InteractiveWatchFaceWcsClient : AutoCloseable {
-
-    public companion object {
-        /**
-         * Constructs an [InteractiveWatchFaceWcsClient] from the [IBinder] returned by [asBinder].
-         */
-        @JvmStatic
-        public fun createFromBinder(binder: IBinder): InteractiveWatchFaceWcsClient =
-            InteractiveWatchFaceWcsClientImpl(binder)
-    }
-
     /**
      * Sends new ComplicationData to the watch face. Note this doesn't have to be a full update,
      * it's possible to update just one complication at a time, but doing so may result in a less
@@ -58,8 +50,7 @@
     public fun updateComplicationData(idToComplicationData: Map<Int, ComplicationData>)
 
     /**
-     * Requests a shared memory backed [Bitmap] containing a screenshot of the watch face with the
-     * given settings.
+     * Renders the watchface to a shared memory backed [Bitmap] with the given settings.
      *
      * @param renderParameters The [RenderParameters] to draw with.
      * @param calendarTimeMillis The UTC time in milliseconds since the epoch to render with.
@@ -70,7 +61,7 @@
      *     given settings.
      */
     @RequiresApi(27)
-    public fun takeWatchFaceScreenshot(
+    public fun renderWatchFaceToBitmap(
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         userStyle: UserStyle?,
@@ -86,7 +77,7 @@
      * any complication data. Setting the new UserStyle may have a side effect of enabling or
      * disabling complications, which will be visible via [ComplicationState.isEnabled].
      */
-    public fun updateInstance(newInstanceId: String, userStyle: UserStyle)
+    public fun updateWatchFaceInstance(newInstanceId: String, userStyle: UserStyle)
 
     /**
      * Renames this instance to [newInstanceId] (must be unique, usually this would be different
@@ -95,7 +86,7 @@
      * a side effect of enabling or disabling complications, which will be visible via
      * [ComplicationState.isEnabled].
      */
-    public fun updateInstance(newInstanceId: String, userStyle: Map<String, String>)
+    public fun updateWatchFaceInstance(newInstanceId: String, userStyle: Map<String, String>)
 
     /** Returns the ID of this watch face instance. */
     public val instanceId: String
@@ -104,18 +95,17 @@
     public val userStyleSchema: UserStyleSchema
 
     /**
-     * Map of complication ids to [ComplicationState] for each complication slot. Note
-     * this can change, typically in response to styling.
+     * Map of complication ids to [ComplicationState] for each [Complication] registered with the
+     * watch face's [ComplicationsManager]. The ComplicationState is based on the initial state of
+     * each Complication plus any overrides from a [ComplicationsUserStyleSetting]. As a
+     * consequence ComplicationState may update based on style changes.
      */
-    public val complicationState: Map<Int, ComplicationState>
-
-    /** Returns the associated [IBinder]. Allows this interface to be passed over AIDL. */
-    public fun asBinder(): IBinder
+    public val complicationsState: Map<Int, ComplicationState>
 
     /** Returns the ID of the complication at the given coordinates or `null` if there isn't one.*/
     @SuppressWarnings("AutoBoxing")
     public fun getComplicationIdAt(@Px x: Int, @Px y: Int): Int? =
-        complicationState.asSequence().firstOrNull {
+        complicationsState.asSequence().firstOrNull {
             it.value.isEnabled && when (it.value.boundsType) {
                 ComplicationBoundsType.ROUND_RECT -> it.value.bounds.contains(x, y)
                 ComplicationBoundsType.BACKGROUND -> false
@@ -125,10 +115,9 @@
         }?.key
 
     /**
-     * Requests the specified complication is highlighted for a short period to bring attention to
-     * it.
+     * Requests that [ComplicationsManager.displayPressedAnimation] is called for [complicationId].
      */
-    public fun bringAttentionToComplication(complicationId: Int)
+    public fun displayPressedAnimation(complicationId: Int)
 }
 
 /** Controls a stateful remote interactive watch face with an interface tailored for WCS. */
@@ -136,8 +125,6 @@
     private val iInteractiveWatchFaceWcs: IInteractiveWatchFaceWCS
 ) : InteractiveWatchFaceWcsClient {
 
-    constructor(binder: IBinder) : this(IInteractiveWatchFaceWCS.Stub.asInterface(binder))
-
     override fun updateComplicationData(
         idToComplicationData: Map<Int, ComplicationData>
     ) = TraceEvent("InteractiveWatchFaceWcsClientImpl.updateComplicationData").use {
@@ -149,15 +136,15 @@
     }
 
     @RequiresApi(27)
-    override fun takeWatchFaceScreenshot(
+    override fun renderWatchFaceToBitmap(
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         userStyle: UserStyle?,
         idAndComplicationData: Map<Int, ComplicationData>?
-    ): Bitmap = TraceEvent("InteractiveWatchFaceWcsClientImpl.takeWatchFaceScreenshot").use {
+    ): Bitmap = TraceEvent("InteractiveWatchFaceWcsClientImpl.renderWatchFaceToBitmap").use {
         SharedMemoryImage.ashmemReadImageBundle(
-            iInteractiveWatchFaceWcs.takeWatchFaceScreenshot(
-                WatchfaceScreenshotParams(
+            iInteractiveWatchFaceWcs.renderWatchFaceToBitmap(
+                WatchFaceRenderParams(
                     renderParameters.toWireFormat(),
                     calendarTimeMillis,
                     userStyle?.toWireFormat(),
@@ -175,16 +162,22 @@
     override val previewReferenceTimeMillis: Long
         get() = iInteractiveWatchFaceWcs.previewReferenceTimeMillis
 
-    override fun updateInstance(newInstanceId: String, userStyle: UserStyle) = TraceEvent(
+    override fun updateWatchFaceInstance(newInstanceId: String, userStyle: UserStyle) = TraceEvent(
         "InteractiveWatchFaceWcsClientImpl.updateInstance"
     ).use {
-        iInteractiveWatchFaceWcs.updateInstance(newInstanceId, userStyle.toWireFormat())
+        iInteractiveWatchFaceWcs.updateWatchfaceInstance(newInstanceId, userStyle.toWireFormat())
     }
 
-    override fun updateInstance(newInstanceId: String, userStyle: Map<String, String>) = TraceEvent(
+    override fun updateWatchFaceInstance(
+        newInstanceId: String,
+        userStyle: Map<String, String>
+    ) = TraceEvent(
         "InteractiveWatchFaceWcsClientImpl.updateInstance"
     ).use {
-        iInteractiveWatchFaceWcs.updateInstance(newInstanceId, UserStyleWireFormat(userStyle))
+        iInteractiveWatchFaceWcs.updateWatchfaceInstance(
+            newInstanceId,
+            UserStyleWireFormat(userStyle)
+        )
     }
 
     override val instanceId: String
@@ -193,7 +186,7 @@
     override val userStyleSchema: UserStyleSchema
         get() = UserStyleSchema(iInteractiveWatchFaceWcs.userStyleSchema)
 
-    override val complicationState: Map<Int, ComplicationState>
+    override val complicationsState: Map<Int, ComplicationState>
         get() = iInteractiveWatchFaceWcs.complicationDetails.associateBy(
             { it.id },
             { ComplicationState(it.complicationState) }
@@ -203,9 +196,7 @@
         iInteractiveWatchFaceWcs.release()
     }
 
-    override fun asBinder(): IBinder = iInteractiveWatchFaceWcs.asBinder()
-
-    override fun bringAttentionToComplication(complicationId: Int) = TraceEvent(
+    override fun displayPressedAnimation(complicationId: Int) = TraceEvent(
         "InteractiveWatchFaceWcsClientImpl.bringAttentionToComplication"
     ).use {
         iInteractiveWatchFaceWcs.bringAttentionToComplication(complicationId)

wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/SystemState.kt

diff --git a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/SystemState.kt b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/SystemState.kt
index 70552c4..6963a15 100644
--- a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/SystemState.kt
+++ b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/SystemState.kt
@@ -34,17 +34,23 @@
 )
 public annotation class InterruptionFilter
 
-/** Describes the system state of the watch face. */
+/**
+ * Describes the system state of the watch face.
+ *
+ * @param inAmbientMode Whether the device is is ambient mode or not.
+ * @param interruptionFilter The interruption filter defines which notifications are allowed to
+ *     interrupt the user. For watch faces this value is one of:
+ *     [NotificationManager.INTERRUPTION_FILTER_ALARMS],
+ *     [NotificationManager.INTERRUPTION_FILTER_ALL],
+ *     [NotificationManager.INTERRUPTION_FILTER_NONE],
+ *     [NotificationManager.INTERRUPTION_FILTER_PRIORITY],
+ *     [NotificationManager.INTERRUPTION_FILTER_UNKNOWN]. @see [NotificationManager] for more
+ *     details.
+ */
 public class SystemState(
-    /** Whether the device is is ambient mode or not. */
     @get:JvmName("inAmbientMode")
     public val inAmbientMode: Boolean,
 
-    /**
-     * The current user interruption settings.
-     *
-     * @see [NotificationManager] for details.
-     */
     @InterruptionFilter
     public val interruptionFilter: Int
 )
\ No newline at end of file

wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/WatchFaceControlClient.kt

diff --git a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/WatchFaceControlClient.kt b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/WatchFaceControlClient.kt
index 60a6ae6..7f63e28 100644
--- a/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/WatchFaceControlClient.kt
+++ b/wear/wear-watchface-client/src/main/java/androidx/wear/watchface/client/WatchFaceControlClient.kt
@@ -22,6 +22,7 @@
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.IBinder
+import androidx.annotation.Px
 import androidx.wear.complications.data.ComplicationData
 import androidx.wear.utility.AsyncTraceEvent
 import androidx.wear.utility.TraceEvent
@@ -47,15 +48,18 @@
         /**
          * Constructs a [WatchFaceControlClient] which attempts to connect to a watch face in the
          * android package [watchFacePackageName].
+         *
+         * @param context Calling application's [Context].
+         * @param watchFacePackageName The name of the package containing the watch face control
+         *     service to bind to.
+         * @return The [WatchFaceControlClient] if there is one.
          * @throws [ServiceNotBoundException] if the watch face control service can not be bound or
          * a [ServiceStartFailureException] if the watch face dies during startup.
          */
         @SuppressLint("NewApi") // For ACTION_WATCHFACE_CONTROL_SERVICE
         @JvmStatic
         public suspend fun createWatchFaceControlClient(
-            /** Calling application's [Context]. */
             context: Context,
-            /** The name of the package containing the watch face control service to bind to. */
             watchFacePackageName: String
         ): WatchFaceControlClient = createWatchFaceControlClientImpl(
             context,
@@ -115,7 +119,7 @@
 
     /**
      * Creates a [HeadlessWatchFaceClient] with the specified [DeviceConfig]. Screenshots made with
-     * [HeadlessWatchFaceClient.takeWatchFaceScreenshot] will be `surfaceWidth` x `surfaceHeight` in
+     * [HeadlessWatchFaceClient.renderWatchFaceToBitmap] will be `surfaceWidth` x `surfaceHeight` in
      * size.
      *
      * When finished call [HeadlessWatchFaceClient.close] to release resources.
@@ -131,8 +135,8 @@
     public fun createHeadlessWatchFaceClient(
         watchFaceName: ComponentName,
         deviceConfig: DeviceConfig,
-        surfaceWidth: Int,
-        surfaceHeight: Int
+        @Px surfaceWidth: Int,
+        @Px surfaceHeight: Int
     ): HeadlessWatchFaceClient?
 
     /**

wear/wear-watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationDrawableTest.java

diff --git a/wear/wear-watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationDrawableTest.java b/wear/wear-watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationDrawableTest.java
index 3519721..1492085 100644
--- a/wear/wear-watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationDrawableTest.java
+++ b/wear/wear-watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationDrawableTest.java
@@ -56,7 +56,7 @@
 import androidx.wear.watchface.WatchFaceService;
 import androidx.wear.watchface.WatchFaceType;
 import androidx.wear.watchface.WatchState;
-import androidx.wear.watchface.style.UserStyleRepository;
+import androidx.wear.watchface.style.CurrentUserStyleRepository;
 import androidx.wear.watchface.style.UserStyleSchema;
 
 import org.jetbrains.annotations.Nullable;
@@ -720,14 +720,14 @@
         protected Object createWatchFace(@NonNull SurfaceHolder surfaceHolder,
                 @NonNull WatchState watchState,
                 @NonNull Continuation<? super WatchFace> completion) {
-            UserStyleRepository userStyleRepository =
-                    new UserStyleRepository(new UserStyleSchema(new ArrayList<>()));
+            CurrentUserStyleRepository currentUserStyleRepository =
+                    new CurrentUserStyleRepository(new UserStyleSchema(new ArrayList<>()));
             return new WatchFace(
                     WatchFaceType.ANALOG,
-                    userStyleRepository,
+                    currentUserStyleRepository,
                     new Renderer.CanvasRenderer(
-                            surfaceHolder, userStyleRepository, watchState, CanvasType.SOFTWARE,
-                            16L) {
+                            surfaceHolder, currentUserStyleRepository, watchState,
+                            CanvasType.SOFTWARE, 16L) {
                         @Override
                         public void render(@NonNull Canvas canvas, @NonNull Rect bounds,
                                 @NonNull Calendar calendar) {

wear/wear-watchface-data/api/restricted_current.txt

diff --git a/wear/wear-watchface-data/api/restricted_current.txt b/wear/wear-watchface-data/api/restricted_current.txt
index 3415e93..84a0dc3 100644
--- a/wear/wear-watchface-data/api/restricted_current.txt
+++ b/wear/wear-watchface-data/api/restricted_current.txt
@@ -123,8 +123,8 @@
 
 package androidx.wear.watchface.control.data {
 
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class ComplicationScreenshotParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
-    ctor public ComplicationScreenshotParams(int, androidx.wear.watchface.data.RenderParametersWireFormat, long, android.support.wearable.complications.ComplicationData?, androidx.wear.watchface.style.data.UserStyleWireFormat?);
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class ComplicationRenderParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+    ctor public ComplicationRenderParams(int, androidx.wear.watchface.data.RenderParametersWireFormat, long, android.support.wearable.complications.ComplicationData?, androidx.wear.watchface.style.data.UserStyleWireFormat?);
     method public int describeContents();
     method public long getCalendarTimeMillis();
     method public android.support.wearable.complications.ComplicationData? getComplicationData();
@@ -132,7 +132,7 @@
     method public androidx.wear.watchface.data.RenderParametersWireFormat getRenderParametersWireFormat();
     method public androidx.wear.watchface.style.data.UserStyleWireFormat? getUserStyle();
     method public void writeToParcel(android.os.Parcel, int);
-    field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.ComplicationScreenshotParams!>! CREATOR;
+    field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.ComplicationRenderParams!>! CREATOR;
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class HeadlessWatchFaceInstanceParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
@@ -160,15 +160,15 @@
     field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.WallpaperInteractiveWatchFaceInstanceParams!>! CREATOR;
   }
 
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class WatchfaceScreenshotParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
-    ctor public WatchfaceScreenshotParams(androidx.wear.watchface.data.RenderParametersWireFormat, long, androidx.wear.watchface.style.data.UserStyleWireFormat?, java.util.List<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!>?);
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class WatchFaceRenderParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+    ctor public WatchFaceRenderParams(androidx.wear.watchface.data.RenderParametersWireFormat, long, androidx.wear.watchface.style.data.UserStyleWireFormat?, java.util.List<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!>?);
     method public int describeContents();
     method public long getCalendarTimeMillis();
     method public java.util.List<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!>? getIdAndComplicationDatumWireFormats();
     method public androidx.wear.watchface.data.RenderParametersWireFormat getRenderParametersWireFormat();
     method public androidx.wear.watchface.style.data.UserStyleWireFormat? getUserStyle();
     method public void writeToParcel(android.os.Parcel, int);
-    field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.WatchfaceScreenshotParams!>! CREATOR;
+    field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.WatchFaceRenderParams!>! CREATOR;
   }
 
 }

wear/wear-watchface-data/src/main/aidl/android/support/wearable/watchface/IWatchFaceService.aidl

diff --git a/wear/wear-watchface-data/src/main/aidl/android/support/wearable/watchface/IWatchFaceService.aidl b/wear/wear-watchface-data/src/main/aidl/android/support/wearable/watchface/IWatchFaceService.aidl
index d0ca805..eacc2ff 100644
--- a/wear/wear-watchface-data/src/main/aidl/android/support/wearable/watchface/IWatchFaceService.aidl
+++ b/wear/wear-watchface-data/src/main/aidl/android/support/wearable/watchface/IWatchFaceService.aidl
@@ -31,12 +31,12 @@
 interface IWatchFaceService {
     // IMPORTANT NOTE: All methods must be given an explicit transaction id that must never change
     // in the future to remain binary backwards compatible.
-    // Next Id: 8
+    // Next Id: 9
 
     /**
      * API version number. This should be incremented every time a new method is added.
      */
-    const int WATCHFACE_SERVICE_API_VERSION = 3;
+    const int WATCHFACE_SERVICE_API_VERSION = 4;
 
     /**
      * Requests that the style for the provided watch face be set to the given style.
@@ -97,4 +97,7 @@
      * @since API version 0.
      */
     int getApiVersion() = 7;
+
+    /** Reserved. Do not use. */
+    void reserved8() = 8;
 }

wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IHeadlessWatchFace.aidl

diff --git a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IHeadlessWatchFace.aidl b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IHeadlessWatchFace.aidl
index 2fd8652..af5245c 100644
--- a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IHeadlessWatchFace.aidl
+++ b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IHeadlessWatchFace.aidl
@@ -16,8 +16,8 @@
 
 package androidx.wear.watchface.control;
 
-import androidx.wear.watchface.control.data.ComplicationScreenshotParams;
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams;
+import androidx.wear.watchface.control.data.ComplicationRenderParams;
+import androidx.wear.watchface.control.data.WatchFaceRenderParams;
 import androidx.wear.watchface.data.IdAndComplicationStateWireFormat;
 import androidx.wear.watchface.style.data.UserStyleSchemaWireFormat;
 
@@ -73,24 +73,24 @@
      * Watch Face.
      *
      * @since API version 1.
-     * @param params The {@link WatchfaceScreenshotParams} for this screenshot.
+     * @param params The {@link WatchFaceRenderParams} for this screenshot.
      * @return A bundle containing a compressed shared memory backed {@link Bitmap} of the watch
      *     face with the requested settings
      * TODO(alexclarke): Refactor to return a parcelable rather than a bundle.
      */
-    Bundle takeWatchFaceScreenshot(in WatchfaceScreenshotParams params) = 5;
+    Bundle renderWatchFaceToBitmap(in WatchFaceRenderParams params) = 5;
 
     /**
      * Request for a {@link Bundle} containing a WebP compressed shared memory backed {@link Bitmap}
      * (see {@link SharedMemoryImage#ashmemCompressedImageBundleToBitmap}).
      *
      * @since API version 1.
-     * @param params The {@link ComplicationScreenshotParams} for this screenshot.
+     * @param params The {@link ComplicationRenderParams} for this screenshot.
      * @return A bundle containing a compressed shared memory backed {@link Bitmap} of the
      *     complication with the requested settings
      * TODO(alexclarke): Refactor to return a parcelable rather than a bundle.
      */
-    Bundle takeComplicationScreenshot(in ComplicationScreenshotParams params) = 6;
+    Bundle renderComplicationToBitmap(in ComplicationRenderParams params) = 6;
 
     /**
      * Releases the watch face instance.  It is an error to issue any further commands on any AIDLs

wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFaceSysUI.aidl

diff --git a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFaceSysUI.aidl b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFaceSysUI.aidl
index dd86be4..b198392 100644
--- a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFaceSysUI.aidl
+++ b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFaceSysUI.aidl
@@ -17,7 +17,7 @@
 package androidx.wear.watchface.control;
 
 import android.support.wearable.watchface.accessibility.ContentDescriptionLabel;
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams;
+import androidx.wear.watchface.control.data.WatchFaceRenderParams;
 import androidx.wear.watchface.data.SystemState;
 import androidx.wear.watchface.style.data.UserStyleWireFormat;
 
@@ -38,21 +38,21 @@
     const int API_VERSION = 1;
 
     /** Indicates a "down" touch event on the watch face. */
-    const int TAP_TYPE_TOUCH = 0;
+    const int TAP_TYPE_DOWN = 0;
 
     /**
-     * Indicates that a previous TAP_TYPE_TOUCH event has been canceled. This generally happens when
-     * the watch face is touched but then a move or long press occurs.
+     * Indicates that a previous {@link #TAP_TYPE_DOWN} event has been canceled. This generally
+     * happens when the watch face is touched but then a move or long press occurs.
      */
-    const int TAP_TYPE_TOUCH_CANCEL = 1;
+    const int TAP_TYPE_CANCEL = 1;
 
     /**
      * Indicates that an "up" event on the watch face has occurred that has not been consumed by
-     * another activity. A TAP_TYPE_TOUCH always occur first. This event will not occur if a
-     * TAP_TYPE_TOUCH_CANCEL is sent.
+     * another activity. A {@link #TAP_TYPE_DOWN} always occur first. This event will not occur if a
+     * {@link #TAP_TYPE_CANCEL} is sent.
      *
      */
-    const int TAP_TYPE_TAP = 2;
+    const int TAP_TYPE_UP = 2;
 
     /**
      * Returns the version number for this API which the client can use to determine which methods
@@ -81,8 +81,7 @@
      *
      * @param xPos X Coordinate of the touch event
      * @param yPos Y Coordinate of the touch event
-     * @param tapType One of {@link #TAP_TYPE_TOUCH}, {@link #TAP_TYPE_TOUCH_CANCEL},
-     *    {@link #TAP_TYPE_TAP}
+     * @param tapType One of {@link #TAP_TYPE_DOWN}, {@link #TAP_TYPE_CANCEL}, {@link #TAP_TYPE_UP}
      * @since API version 1.
      */
     oneway void sendTouchEvent(in int xPos, in int yPos, in int tapType) = 4;
@@ -108,12 +107,12 @@
      * calendarTimeMillis.
      *
      * @since API version 1.
-     * @param params The {@link WatchfaceScreenshotParams} for this screenshot.
+     * @param params The {@link WatchFaceRenderParams} for this screenshot.
      * @return A bundle containing a compressed shared memory backed {@link Bitmap} of the watch
      *     face with the requested settings
      * TODO(alexclarke): Refactor to return a parcelable rather than a bundle.
      */
-    Bundle takeWatchFaceScreenshot(in WatchfaceScreenshotParams params) = 7;
+    Bundle renderWatchFaceToBitmap(in WatchFaceRenderParams params) = 7;
 
     /**
      * Gets the labels to be read aloud by screen readers. The results will change depending on the

wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFaceWCS.aidl

diff --git a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFaceWCS.aidl b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFaceWCS.aidl
index 001c086..b948017 100644
--- a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFaceWCS.aidl
+++ b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFaceWCS.aidl
@@ -16,7 +16,7 @@
 
 package androidx.wear.watchface.control;
 
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams;
+import androidx.wear.watchface.control.data.WatchFaceRenderParams;
 import androidx.wear.watchface.data.SystemState;
 import androidx.wear.watchface.data.IdAndComplicationDataWireFormat;
 import androidx.wear.watchface.data.IdAndComplicationStateWireFormat;
@@ -59,7 +59,8 @@
      *
      * @since API version 1.
      */
-    oneway void updateComplicationData(in List<IdAndComplicationDataWireFormat> complicationData) = 4;
+    oneway void updateComplicationData(
+            in List<IdAndComplicationDataWireFormat> complicationData) = 4;
 
     /**
      * Renames this instance to newInstanceId, sets the current user style
@@ -68,7 +69,8 @@
      *
      * @since API version 1.
      */
-    oneway void updateInstance(in String newInstanceId, in UserStyleWireFormat userStyle) = 5;
+    oneway void updateWatchfaceInstance(
+            in String newInstanceId, in UserStyleWireFormat userStyle) = 5;
 
     /**
      * Returns the reference preview time for this watch face in milliseconds since the epoch.
@@ -101,12 +103,12 @@
      * calendarTimeMillis.
      *
      * @since API version 1.
-     * @param params The {@link WatchfaceScreenshotParams} for this screenshot.
+     * @param params The {@link WatchFaceRenderParams} for this screenshot.
      * @return A bundle containing a compressed shared memory backed {@link Bitmap} of the watch
      *     face with the requested settings
      * TODO(alexclarke): Refactor to return a parcelable rather than a bundle.
      */
-    Bundle takeWatchFaceScreenshot(in WatchfaceScreenshotParams params) = 10;
+    Bundle renderWatchFaceToBitmap(in WatchFaceRenderParams params) = 10;
 
     /**
      * If there's no {@link IInteractiveWatchFaceSysUI} holding a reference then the

wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/ComplicationRenderParams.aidl

diff --git a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/WatchfaceScreenshotParams.aidl b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/ComplicationRenderParams.aidl
similarity index 94%
rename from wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/WatchfaceScreenshotParams.aidl
rename to wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/ComplicationRenderParams.aidl
index decdabc..299880b 100644
--- a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/WatchfaceScreenshotParams.aidl
+++ b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/ComplicationRenderParams.aidl
@@ -17,4 +17,4 @@
 package androidx.wear.watchface.control.data;
 
 /** @hide */
-parcelable WatchfaceScreenshotParams;
+parcelable ComplicationRenderParams;

wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/ComplicationScreenshotParams.aidl

diff --git a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/ComplicationScreenshotParams.aidl b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/ComplicationScreenshotParams.aidl
deleted file mode 100644
index 3f8b02c..0000000
--- a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/ComplicationScreenshotParams.aidl
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.wear.watchface.control.data;
-
-/** @hide */
-parcelable ComplicationScreenshotParams;

wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/WatchFaceRenderParams.aidl

diff --git a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/WatchfaceScreenshotParams.aidl b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/WatchFaceRenderParams.aidl
similarity index 94%
copy from wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/WatchfaceScreenshotParams.aidl
copy to wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/WatchFaceRenderParams.aidl
index decdabc..0577ccf 100644
--- a/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/WatchfaceScreenshotParams.aidl
+++ b/wear/wear-watchface-data/src/main/aidl/androidx/wear/watchface/control/data/WatchFaceRenderParams.aidl
@@ -17,4 +17,4 @@
 package androidx.wear.watchface.control.data;
 
 /** @hide */
-parcelable WatchfaceScreenshotParams;
+parcelable WatchFaceRenderParams;

wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/ComplicationRenderParams.java

diff --git a/wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/ComplicationScreenshotParams.java b/wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/ComplicationRenderParams.java
similarity index 86%
rename from wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/ComplicationScreenshotParams.java
rename to wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/ComplicationRenderParams.java
index a57438c..f3a9b0d 100644
--- a/wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/ComplicationScreenshotParams.java
+++ b/wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/ComplicationRenderParams.java
@@ -32,14 +32,14 @@
 import androidx.wear.watchface.style.data.UserStyleWireFormat;
 
 /**
- * Parameters for the various AIDL takeComplicationScreenshot commands.
+ * Parameters for the various AIDL renderComplicationToBitmap commands.
  *
  * @hide
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
 @VersionedParcelize
 @SuppressLint("BanParcelableUsage") // TODO(b/169214666): Remove Parcelable
-public class ComplicationScreenshotParams implements VersionedParcelable, Parcelable {
+public class ComplicationRenderParams implements VersionedParcelable, Parcelable {
 
     /** ID of the complication we want to take a screen short of. */
     @ParcelField(1)
@@ -72,9 +72,9 @@
     UserStyleWireFormat mUserStyle;
 
     /** Used by VersionedParcelable. */
-    ComplicationScreenshotParams() {}
+    ComplicationRenderParams() {}
 
-    public ComplicationScreenshotParams(
+    public ComplicationRenderParams(
             int complicationId,
             @NonNull RenderParametersWireFormat renderParametersWireFormats,
             long calendarTimeMillis,
@@ -122,17 +122,17 @@
         return 0;
     }
 
-    public static final Parcelable.Creator<ComplicationScreenshotParams> CREATOR =
-            new Parcelable.Creator<ComplicationScreenshotParams>() {
+    public static final Parcelable.Creator<ComplicationRenderParams> CREATOR =
+            new Parcelable.Creator<ComplicationRenderParams>() {
                 @Override
-                public ComplicationScreenshotParams createFromParcel(Parcel source) {
+                public ComplicationRenderParams createFromParcel(Parcel source) {
                     return ParcelUtils.fromParcelable(
                             source.readParcelable(getClass().getClassLoader()));
                 }
 
                 @Override
-                public ComplicationScreenshotParams[] newArray(int size) {
-                    return new ComplicationScreenshotParams[size];
+                public ComplicationRenderParams[] newArray(int size) {
+                    return new ComplicationRenderParams[size];
                 }
             };
 }

wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/WatchFaceRenderParams.java

diff --git a/wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/WatchfaceScreenshotParams.java b/wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/WatchFaceRenderParams.java
similarity index 87%
rename from wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/WatchfaceScreenshotParams.java
rename to wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/WatchFaceRenderParams.java
index dc5da8f..291fd02 100644
--- a/wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/WatchfaceScreenshotParams.java
+++ b/wear/wear-watchface-data/src/main/java/androidx/wear/watchface/control/data/WatchFaceRenderParams.java
@@ -41,7 +41,7 @@
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
 @VersionedParcelize
 @SuppressLint("BanParcelableUsage") // TODO(b/169214666): Remove Parcelable
-public class WatchfaceScreenshotParams implements VersionedParcelable, Parcelable {
+public class WatchFaceRenderParams implements VersionedParcelable, Parcelable {
     /** The {@link RenderParametersWireFormat} to render with. */
     @ParcelField(1)
     @NonNull
@@ -68,9 +68,9 @@
     List<IdAndComplicationDataWireFormat> mIdAndComplicationDatumWireFormats;
 
     /** Used by VersionedParcelable. */
-    WatchfaceScreenshotParams() {}
+    WatchFaceRenderParams() {}
 
-    public WatchfaceScreenshotParams(
+    public WatchFaceRenderParams(
             @NonNull RenderParametersWireFormat renderParametersWireFormats,
             long calendarTimeMillis,
             @Nullable UserStyleWireFormat userStyle,
@@ -112,17 +112,17 @@
         return 0;
     }
 
-    public static final Parcelable.Creator<WatchfaceScreenshotParams> CREATOR =
-            new Parcelable.Creator<WatchfaceScreenshotParams>() {
+    public static final Parcelable.Creator<WatchFaceRenderParams> CREATOR =
+            new Parcelable.Creator<WatchFaceRenderParams>() {
                 @Override
-                public WatchfaceScreenshotParams createFromParcel(Parcel source) {
+                public WatchFaceRenderParams createFromParcel(Parcel source) {
                     return ParcelUtils.fromParcelable(
                             source.readParcelable(getClass().getClassLoader()));
                 }
 
                 @Override
-                public WatchfaceScreenshotParams[] newArray(int size) {
-                    return new WatchfaceScreenshotParams[size];
+                public WatchFaceRenderParams[] newArray(int size) {
+                    return new WatchFaceRenderParams[size];
                 }
             };
 }

wear/wear-watchface-editor/api/current.txt

diff --git a/wear/wear-watchface-editor/api/current.txt b/wear/wear-watchface-editor/api/current.txt
index daadcc5..33c96a0 100644
--- a/wear/wear-watchface-editor/api/current.txt
+++ b/wear/wear-watchface-editor/api/current.txt
@@ -2,16 +2,17 @@
 package androidx.wear.watchface.editor {
 
   public final class EditorRequest {
-    ctor public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, String? watchFaceInstanceId, java.util.Map<java.lang.String,java.lang.String>? initialUserStyle);
+    ctor @RequiresApi(android.os.Build.VERSION_CODES.R) public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, java.util.Map<java.lang.String,java.lang.String>? initialUserStyle, @RequiresApi(android.os.Build.VERSION_CODES.R) androidx.wear.watchface.client.WatchFaceId watchFaceId);
+    ctor public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, java.util.Map<java.lang.String,java.lang.String>? initialUserStyle);
     method public static androidx.wear.watchface.editor.EditorRequest? createFromIntent(android.content.Intent intent);
     method public String getEditorPackageName();
     method public java.util.Map<java.lang.String,java.lang.String>? getInitialUserStyle();
     method public android.content.ComponentName getWatchFaceComponentName();
-    method public String? getWatchFaceInstanceId();
+    method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
     property public final String editorPackageName;
     property public final java.util.Map<java.lang.String,java.lang.String>? initialUserStyle;
     property public final android.content.ComponentName watchFaceComponentName;
-    property public final String? watchFaceInstanceId;
+    property @RequiresApi(android.os.Build.VERSION_CODES.R) public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
     field public static final androidx.wear.watchface.editor.EditorRequest.Companion Companion;
   }
 
@@ -25,26 +26,26 @@
     method @UiThread public static final kotlinx.coroutines.Deferred<androidx.wear.watchface.editor.EditorSession> createOnWatchEditingSessionAsync(androidx.activity.ComponentActivity activity, android.content.Intent editIntent);
     method public abstract Integer? getBackgroundComplicationId();
     method @UiThread public abstract Integer? getComplicationIdAt(@Px int x, @Px int y);
-    method public abstract suspend Object? getComplicationPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
-    method public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
-    method public abstract String? getInstanceId();
+    method @UiThread public abstract suspend Object? getComplicationsPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
+    method public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public abstract long getPreviewReferenceTimeMillis();
     method public abstract androidx.wear.watchface.style.UserStyle getUserStyle();
     method public abstract androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
     method public abstract android.content.ComponentName getWatchFaceComponentName();
-    method public final boolean isCommitChangesOnClose();
+    method @RequiresApi(android.os.Build.VERSION_CODES.R) public abstract androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+    method @UiThread public final boolean isCommitChangesOnClose();
     method @UiThread public abstract suspend Object? launchComplicationProviderChooser(int complicationId, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
-    method public final void setCommitChangesOnClose(boolean p);
+    method @UiThread public abstract android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
+    method @UiThread public final void setCommitChangesOnClose(boolean p);
     method public abstract void setUserStyle(androidx.wear.watchface.style.UserStyle p);
-    method @UiThread public abstract android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     property public abstract Integer? backgroundComplicationId;
-    property public final boolean commitChangesOnClose;
-    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
-    property public abstract String? instanceId;
+    property @UiThread public final boolean commitChangesOnClose;
+    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public abstract long previewReferenceTimeMillis;
     property public abstract androidx.wear.watchface.style.UserStyle userStyle;
     property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
     property public abstract android.content.ComponentName watchFaceComponentName;
+    property @RequiresApi(android.os.Build.VERSION_CODES.R) public abstract androidx.wear.watchface.client.WatchFaceId watchFaceId;
     field public static final androidx.wear.watchface.editor.EditorSession.Companion Companion;
   }
 

wear/wear-watchface-editor/api/public_plus_experimental_current.txt

diff --git a/wear/wear-watchface-editor/api/public_plus_experimental_current.txt b/wear/wear-watchface-editor/api/public_plus_experimental_current.txt
index daadcc5..33c96a0 100644
--- a/wear/wear-watchface-editor/api/public_plus_experimental_current.txt
+++ b/wear/wear-watchface-editor/api/public_plus_experimental_current.txt
@@ -2,16 +2,17 @@
 package androidx.wear.watchface.editor {
 
   public final class EditorRequest {
-    ctor public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, String? watchFaceInstanceId, java.util.Map<java.lang.String,java.lang.String>? initialUserStyle);
+    ctor @RequiresApi(android.os.Build.VERSION_CODES.R) public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, java.util.Map<java.lang.String,java.lang.String>? initialUserStyle, @RequiresApi(android.os.Build.VERSION_CODES.R) androidx.wear.watchface.client.WatchFaceId watchFaceId);
+    ctor public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, java.util.Map<java.lang.String,java.lang.String>? initialUserStyle);
     method public static androidx.wear.watchface.editor.EditorRequest? createFromIntent(android.content.Intent intent);
     method public String getEditorPackageName();
     method public java.util.Map<java.lang.String,java.lang.String>? getInitialUserStyle();
     method public android.content.ComponentName getWatchFaceComponentName();
-    method public String? getWatchFaceInstanceId();
+    method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
     property public final String editorPackageName;
     property public final java.util.Map<java.lang.String,java.lang.String>? initialUserStyle;
     property public final android.content.ComponentName watchFaceComponentName;
-    property public final String? watchFaceInstanceId;
+    property @RequiresApi(android.os.Build.VERSION_CODES.R) public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
     field public static final androidx.wear.watchface.editor.EditorRequest.Companion Companion;
   }
 
@@ -25,26 +26,26 @@
     method @UiThread public static final kotlinx.coroutines.Deferred<androidx.wear.watchface.editor.EditorSession> createOnWatchEditingSessionAsync(androidx.activity.ComponentActivity activity, android.content.Intent editIntent);
     method public abstract Integer? getBackgroundComplicationId();
     method @UiThread public abstract Integer? getComplicationIdAt(@Px int x, @Px int y);
-    method public abstract suspend Object? getComplicationPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
-    method public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
-    method public abstract String? getInstanceId();
+    method @UiThread public abstract suspend Object? getComplicationsPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
+    method public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public abstract long getPreviewReferenceTimeMillis();
     method public abstract androidx.wear.watchface.style.UserStyle getUserStyle();
     method public abstract androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
     method public abstract android.content.ComponentName getWatchFaceComponentName();
-    method public final boolean isCommitChangesOnClose();
+    method @RequiresApi(android.os.Build.VERSION_CODES.R) public abstract androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+    method @UiThread public final boolean isCommitChangesOnClose();
     method @UiThread public abstract suspend Object? launchComplicationProviderChooser(int complicationId, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
-    method public final void setCommitChangesOnClose(boolean p);
+    method @UiThread public abstract android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
+    method @UiThread public final void setCommitChangesOnClose(boolean p);
     method public abstract void setUserStyle(androidx.wear.watchface.style.UserStyle p);
-    method @UiThread public abstract android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     property public abstract Integer? backgroundComplicationId;
-    property public final boolean commitChangesOnClose;
-    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
-    property public abstract String? instanceId;
+    property @UiThread public final boolean commitChangesOnClose;
+    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public abstract long previewReferenceTimeMillis;
     property public abstract androidx.wear.watchface.style.UserStyle userStyle;
     property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
     property public abstract android.content.ComponentName watchFaceComponentName;
+    property @RequiresApi(android.os.Build.VERSION_CODES.R) public abstract androidx.wear.watchface.client.WatchFaceId watchFaceId;
     field public static final androidx.wear.watchface.editor.EditorSession.Companion Companion;
   }
 

wear/wear-watchface-editor/api/restricted_current.txt

diff --git a/wear/wear-watchface-editor/api/restricted_current.txt b/wear/wear-watchface-editor/api/restricted_current.txt
index 2e3da9d..74cca21 100644
--- a/wear/wear-watchface-editor/api/restricted_current.txt
+++ b/wear/wear-watchface-editor/api/restricted_current.txt
@@ -7,11 +7,11 @@
     method public Integer? getBackgroundComplicationId();
     method protected final boolean getClosed();
     method public Integer? getComplicationIdAt(@Px int x, @Px int y);
-    method public suspend Object? getComplicationPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> $completion);
+    method public suspend Object? getComplicationsPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> $completion);
     method public final kotlinx.coroutines.CoroutineScope getCoroutineScope();
     method protected final boolean getForceClosed();
     method public suspend Object? launchComplicationProviderChooser(int p, kotlin.coroutines.Continuation<? super java.lang.Boolean> $completion);
-    method protected abstract void releaseResources();
+    method @UiThread protected abstract void releaseResources();
     method protected final void requireNotClosed();
     method protected final void setClosed(boolean p);
     method protected final void setForceClosed(boolean p);
@@ -22,16 +22,17 @@
   }
 
   public final class EditorRequest {
-    ctor public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, String? watchFaceInstanceId, java.util.Map<java.lang.String,java.lang.String>? initialUserStyle);
+    ctor @RequiresApi(android.os.Build.VERSION_CODES.R) public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, java.util.Map<java.lang.String,java.lang.String>? initialUserStyle, @RequiresApi(android.os.Build.VERSION_CODES.R) androidx.wear.watchface.client.WatchFaceId watchFaceId);
+    ctor public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, java.util.Map<java.lang.String,java.lang.String>? initialUserStyle);
     method public static androidx.wear.watchface.editor.EditorRequest? createFromIntent(android.content.Intent intent);
     method public String getEditorPackageName();
     method public java.util.Map<java.lang.String,java.lang.String>? getInitialUserStyle();
     method public android.content.ComponentName getWatchFaceComponentName();
-    method public String? getWatchFaceInstanceId();
+    method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
     property public final String editorPackageName;
     property public final java.util.Map<java.lang.String,java.lang.String>? initialUserStyle;
     property public final android.content.ComponentName watchFaceComponentName;
-    property public final String? watchFaceInstanceId;
+    property @RequiresApi(android.os.Build.VERSION_CODES.R) public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
     field public static final androidx.wear.watchface.editor.EditorRequest.Companion Companion;
   }
 
@@ -45,26 +46,26 @@
     method @UiThread public static final kotlinx.coroutines.Deferred<androidx.wear.watchface.editor.EditorSession> createOnWatchEditingSessionAsync(androidx.activity.ComponentActivity activity, android.content.Intent editIntent);
     method public abstract Integer? getBackgroundComplicationId();
     method @UiThread public abstract Integer? getComplicationIdAt(@Px int x, @Px int y);
-    method public abstract suspend Object? getComplicationPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
-    method public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
-    method public abstract String? getInstanceId();
+    method @UiThread public abstract suspend Object? getComplicationsPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
+    method public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public abstract long getPreviewReferenceTimeMillis();
     method public abstract androidx.wear.watchface.style.UserStyle getUserStyle();
     method public abstract androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
     method public abstract android.content.ComponentName getWatchFaceComponentName();
-    method public final boolean isCommitChangesOnClose();
+    method @RequiresApi(android.os.Build.VERSION_CODES.R) public abstract androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+    method @UiThread public final boolean isCommitChangesOnClose();
     method @UiThread public abstract suspend Object? launchComplicationProviderChooser(int complicationId, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
-    method public final void setCommitChangesOnClose(boolean p);
+    method @UiThread public abstract android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
+    method @UiThread public final void setCommitChangesOnClose(boolean p);
     method public abstract void setUserStyle(androidx.wear.watchface.style.UserStyle p);
-    method @UiThread public abstract android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     property public abstract Integer? backgroundComplicationId;
-    property public final boolean commitChangesOnClose;
-    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
-    property public abstract String? instanceId;
+    property @UiThread public final boolean commitChangesOnClose;
+    property public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public abstract long previewReferenceTimeMillis;
     property public abstract androidx.wear.watchface.style.UserStyle userStyle;
     property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
     property public abstract android.content.ComponentName watchFaceComponentName;
+    property @RequiresApi(android.os.Build.VERSION_CODES.R) public abstract androidx.wear.watchface.client.WatchFaceId watchFaceId;
     field public static final androidx.wear.watchface.editor.EditorSession.Companion Companion;
   }
 

wear/wear-watchface-editor/guava/api/current.txt

diff --git a/wear/wear-watchface-editor/guava/api/current.txt b/wear/wear-watchface-editor/guava/api/current.txt
index 097e699..aeeb1fd 100644
--- a/wear/wear-watchface-editor/guava/api/current.txt
+++ b/wear/wear-watchface-editor/guava/api/current.txt
@@ -7,26 +7,26 @@
     method @RequiresApi(27) @UiThread public static androidx.wear.watchface.editor.ListenableEditorSession? createHeadlessEditingSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
     method public Integer? getBackgroundComplicationId();
     method public Integer? getComplicationIdAt(int x, int y);
-    method public suspend Object? getComplicationPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
-    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
-    method public String? getInstanceId();
+    method public suspend Object? getComplicationsPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
+    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public com.google.common.util.concurrent.ListenableFuture<java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData>> getListenableComplicationPreviewData();
     method public long getPreviewReferenceTimeMillis();
     method public androidx.wear.watchface.style.UserStyle getUserStyle();
     method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
     method public android.content.ComponentName getWatchFaceComponentName();
+    method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
     method public suspend Object? launchComplicationProviderChooser(int complicationId, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
     method @UiThread public static com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ListenableEditorSession> listenableCreateOnWatchEditingSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent);
     method public com.google.common.util.concurrent.ListenableFuture<java.lang.Boolean> listenableLaunchComplicationProviderChooser(int complicationId);
+    method public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     method public void setUserStyle(androidx.wear.watchface.style.UserStyle value);
-    method public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     property public Integer? backgroundComplicationId;
-    property public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
-    property public String? instanceId;
+    property public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public long previewReferenceTimeMillis;
     property public androidx.wear.watchface.style.UserStyle userStyle;
     property public androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
     property public android.content.ComponentName watchFaceComponentName;
+    property @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId watchFaceId;
     field public static final androidx.wear.watchface.editor.ListenableEditorSession.Companion Companion;
   }
 

wear/wear-watchface-editor/guava/api/public_plus_experimental_current.txt

diff --git a/wear/wear-watchface-editor/guava/api/public_plus_experimental_current.txt b/wear/wear-watchface-editor/guava/api/public_plus_experimental_current.txt
index 097e699..aeeb1fd 100644
--- a/wear/wear-watchface-editor/guava/api/public_plus_experimental_current.txt
+++ b/wear/wear-watchface-editor/guava/api/public_plus_experimental_current.txt
@@ -7,26 +7,26 @@
     method @RequiresApi(27) @UiThread public static androidx.wear.watchface.editor.ListenableEditorSession? createHeadlessEditingSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
     method public Integer? getBackgroundComplicationId();
     method public Integer? getComplicationIdAt(int x, int y);
-    method public suspend Object? getComplicationPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
-    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
-    method public String? getInstanceId();
+    method public suspend Object? getComplicationsPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
+    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public com.google.common.util.concurrent.ListenableFuture<java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData>> getListenableComplicationPreviewData();
     method public long getPreviewReferenceTimeMillis();
     method public androidx.wear.watchface.style.UserStyle getUserStyle();
     method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
     method public android.content.ComponentName getWatchFaceComponentName();
+    method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
     method public suspend Object? launchComplicationProviderChooser(int complicationId, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
     method @UiThread public static com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ListenableEditorSession> listenableCreateOnWatchEditingSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent);
     method public com.google.common.util.concurrent.ListenableFuture<java.lang.Boolean> listenableLaunchComplicationProviderChooser(int complicationId);
+    method public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     method public void setUserStyle(androidx.wear.watchface.style.UserStyle value);
-    method public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     property public Integer? backgroundComplicationId;
-    property public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
-    property public String? instanceId;
+    property public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public long previewReferenceTimeMillis;
     property public androidx.wear.watchface.style.UserStyle userStyle;
     property public androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
     property public android.content.ComponentName watchFaceComponentName;
+    property @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId watchFaceId;
     field public static final androidx.wear.watchface.editor.ListenableEditorSession.Companion Companion;
   }
 

wear/wear-watchface-editor/guava/api/restricted_current.txt

diff --git a/wear/wear-watchface-editor/guava/api/restricted_current.txt b/wear/wear-watchface-editor/guava/api/restricted_current.txt
index 097e699..aeeb1fd 100644
--- a/wear/wear-watchface-editor/guava/api/restricted_current.txt
+++ b/wear/wear-watchface-editor/guava/api/restricted_current.txt
@@ -7,26 +7,26 @@
     method @RequiresApi(27) @UiThread public static androidx.wear.watchface.editor.ListenableEditorSession? createHeadlessEditingSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
     method public Integer? getBackgroundComplicationId();
     method public Integer? getComplicationIdAt(int x, int y);
-    method public suspend Object? getComplicationPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
-    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationState();
-    method public String? getInstanceId();
+    method public suspend Object? getComplicationsPreviewData(kotlin.coroutines.Continuation<? super java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>> p);
+    method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> getComplicationsState();
     method public com.google.common.util.concurrent.ListenableFuture<java.util.Map<java.lang.Integer,androidx.wear.complications.data.ComplicationData>> getListenableComplicationPreviewData();
     method public long getPreviewReferenceTimeMillis();
     method public androidx.wear.watchface.style.UserStyle getUserStyle();
     method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
     method public android.content.ComponentName getWatchFaceComponentName();
+    method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
     method public suspend Object? launchComplicationProviderChooser(int complicationId, kotlin.coroutines.Continuation<? super java.lang.Boolean> p);
     method @UiThread public static com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ListenableEditorSession> listenableCreateOnWatchEditingSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent);
     method public com.google.common.util.concurrent.ListenableFuture<java.lang.Boolean> listenableLaunchComplicationProviderChooser(int complicationId);
+    method public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     method public void setUserStyle(androidx.wear.watchface.style.UserStyle value);
-    method public android.graphics.Bitmap takeWatchFaceScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     property public Integer? backgroundComplicationId;
-    property public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationState;
-    property public String? instanceId;
+    property public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationState> complicationsState;
     property public long previewReferenceTimeMillis;
     property public androidx.wear.watchface.style.UserStyle userStyle;
     property public androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
     property public android.content.ComponentName watchFaceComponentName;
+    property @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId watchFaceId;
     field public static final androidx.wear.watchface.editor.ListenableEditorSession.Companion Companion;
   }
 

wear/wear-watchface-editor/guava/src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt

diff --git a/wear/wear-watchface-editor/guava/src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt b/wear/wear-watchface-editor/guava/src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt
index b59c76e..f6f7ae7 100644
--- a/wear/wear-watchface-editor/guava/src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt
+++ b/wear/wear-watchface-editor/guava/src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt
@@ -19,6 +19,7 @@
 import android.content.ComponentName
 import android.content.Intent
 import android.graphics.Bitmap
+import android.os.Build
 import androidx.activity.ComponentActivity
 import androidx.annotation.RequiresApi
 import androidx.annotation.UiThread
@@ -27,6 +28,7 @@
 import androidx.wear.watchface.RenderParameters
 import androidx.wear.watchface.client.ComplicationState
 import androidx.wear.watchface.client.HeadlessWatchFaceClient
+import androidx.wear.watchface.client.WatchFaceId
 import androidx.wear.watchface.style.UserStyle
 import androidx.wear.watchface.style.UserStyleSchema
 import com.google.common.util.concurrent.ListenableFuture
@@ -105,7 +107,9 @@
 
     override val watchFaceComponentName: ComponentName = wrappedEditorSession.watchFaceComponentName
 
-    override val instanceId: String? = wrappedEditorSession.instanceId
+    @get:RequiresApi(Build.VERSION_CODES.R)
+    @RequiresApi(Build.VERSION_CODES.R)
+    override val watchFaceId: WatchFaceId = wrappedEditorSession.watchFaceId
 
     override var userStyle: UserStyle
         get() = wrappedEditorSession.userStyle
@@ -118,16 +122,16 @@
     override val userStyleSchema: UserStyleSchema
         get() = wrappedEditorSession.userStyleSchema
 
-    override val complicationState: Map<Int, ComplicationState>
-        get() = wrappedEditorSession.complicationState
+    override val complicationsState: Map<Int, ComplicationState>
+        get() = wrappedEditorSession.complicationsState
 
-    /** [ListenableFuture] wrapper around [EditorSession.getComplicationPreviewData]. */
+    /** [ListenableFuture] wrapper around [EditorSession.getComplicationsPreviewData]. */
     public fun getListenableComplicationPreviewData():
         ListenableFuture<Map<Int, ComplicationData>> {
             val future = ResolvableFuture.create<Map<Int, ComplicationData>>()
             getCoroutineScope().launch {
                 try {
-                    future.set(wrappedEditorSession.getComplicationPreviewData())
+                    future.set(wrappedEditorSession.getComplicationsPreviewData())
                 } catch (e: Exception) {
                     future.setException(e)
                 }
@@ -135,8 +139,8 @@
             return future
         }
 
-    override suspend fun getComplicationPreviewData(): Map<Int, ComplicationData> =
-        wrappedEditorSession.getComplicationPreviewData()
+    override suspend fun getComplicationsPreviewData(): Map<Int, ComplicationData> =
+        wrappedEditorSession.getComplicationsPreviewData()
 
     @get:SuppressWarnings("AutoBoxing")
     override val backgroundComplicationId: Int?
@@ -146,11 +150,11 @@
     override fun getComplicationIdAt(x: Int, y: Int): Int? =
         wrappedEditorSession.getComplicationIdAt(x, y)
 
-    override fun takeWatchFaceScreenshot(
+    override fun renderWatchFaceToBitmap(
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         idToComplicationData: Map<Int, ComplicationData>?
-    ): Bitmap = wrappedEditorSession.takeWatchFaceScreenshot(
+    ): Bitmap = wrappedEditorSession.renderWatchFaceToBitmap(
         renderParameters,
         calendarTimeMillis,
         idToComplicationData

wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/ComplicationConfigFragment.kt

diff --git a/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/ComplicationConfigFragment.kt b/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/ComplicationConfigFragment.kt
index c3b0876..b82fab5 100644
--- a/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/ComplicationConfigFragment.kt
+++ b/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/ComplicationConfigFragment.kt
@@ -97,7 +97,7 @@
     init {
         watchFaceConfigActivity.coroutineScope.launch {
             previewComplicationData =
-                watchFaceConfigActivity.editorSession.getComplicationPreviewData()
+                watchFaceConfigActivity.editorSession.getComplicationsPreviewData()
             setWillNotDraw(false)
         }
     }
@@ -159,7 +159,7 @@
         // Silently do nothing if the complication is fixed. Note the user is given a visual clue
         // that the complication is not editable in [Complication.drawOutline] so this is OK.
         val complicationState =
-            watchFaceConfigActivity.editorSession.complicationState[complicationId]!!
+            watchFaceConfigActivity.editorSession.complicationsState[complicationId]!!
         if (complicationState.fixedComplicationProvider) {
             return true
         }
@@ -209,7 +209,7 @@
 
     override fun onDraw(canvas: Canvas) {
         val editingSession = watchFaceConfigActivity.editorSession
-        val bitmap = editingSession.takeWatchFaceScreenshot(
+        val bitmap = editingSession.renderWatchFaceToBitmap(
             RenderParameters(
                 DrawMode.INTERACTIVE,
                 mapOf(

wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/ConfigFragment.kt

diff --git a/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/ConfigFragment.kt b/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/ConfigFragment.kt
index e88ea1c..f625f55 100644
--- a/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/ConfigFragment.kt
+++ b/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/ConfigFragment.kt
@@ -87,7 +87,7 @@
     private fun initConfigOptions() {
         val editingSession = watchFaceConfigActivity.editorSession
         val hasBackgroundComplication = editingSession.backgroundComplicationId != null
-        val numComplications = editingSession.complicationState.size
+        val numComplications = editingSession.complicationsState.size
         val hasNonBackgroundComplication =
             numComplications > if (hasBackgroundComplication) 1 else 0
         val configOptions = ArrayList<ConfigOption>()

wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/WatchFaceConfigActivity.kt

diff --git a/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/WatchFaceConfigActivity.kt b/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/WatchFaceConfigActivity.kt
index b9db60c..41aa828 100644
--- a/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/WatchFaceConfigActivity.kt
+++ b/wear/wear-watchface-editor/samples/src/main/java/androidx/wear/watchface/editor/sample/WatchFaceConfigActivity.kt
@@ -175,7 +175,7 @@
         if (hasBackgroundComplication) {
             topLevelOptionCount++
         }
-        val numComplications = editorSession.complicationState.size
+        val numComplications = editorSession.complicationsState.size
         val hasNonBackgroundComplication =
             numComplications > (if (hasBackgroundComplication) 1 else 0)
         if (hasNonBackgroundComplication) {
@@ -189,7 +189,7 @@
 
             // For a single complication go directly to the provider selector.
             numComplications == 1 -> {
-                val onlyComplication = editorSession.complicationState.entries.first()
+                val onlyComplication = editorSession.complicationsState.entries.first()
                 coroutineScope.launch {
                     fragmentController.showComplicationConfig(onlyComplication.key)
                 }

wear/wear-watchface-editor/src/androidTest/java/androidx/wear/watchface/editor/EditingSessionTest.kt

diff --git a/wear/wear-watchface-editor/src/androidTest/java/androidx/wear/watchface/editor/EditingSessionTest.kt b/wear/wear-watchface-editor/src/androidTest/java/androidx/wear/watchface/editor/EditingSessionTest.kt
index 2aeab67..8c4f528 100644
--- a/wear/wear-watchface-editor/src/androidTest/java/androidx/wear/watchface/editor/EditingSessionTest.kt
+++ b/wear/wear-watchface-editor/src/androidTest/java/androidx/wear/watchface/editor/EditingSessionTest.kt
@@ -45,17 +45,20 @@
 import androidx.wear.complications.data.LongTextComplicationData
 import androidx.wear.complications.data.PlainComplicationText
 import androidx.wear.complications.data.ShortTextComplicationData
-import androidx.wear.watchface.CanvasComplication
+import androidx.wear.watchface.CanvasComplicationDrawable
 import androidx.wear.watchface.Complication
 import androidx.wear.watchface.ComplicationsManager
+import androidx.wear.watchface.MutableWatchState
 import androidx.wear.watchface.RenderParameters
 import androidx.wear.watchface.WatchFace
+import androidx.wear.watchface.client.WatchFaceId
 import androidx.wear.watchface.client.asApiEditorState
+import androidx.wear.watchface.complications.rendering.ComplicationDrawable
 import androidx.wear.watchface.data.ComplicationBoundsType
 import androidx.wear.watchface.editor.data.EditorStateWireFormat
 import androidx.wear.watchface.style.Layer
 import androidx.wear.watchface.style.UserStyle
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import androidx.wear.watchface.style.UserStyleSetting
 import com.google.common.truth.Truth.assertThat
@@ -65,7 +68,6 @@
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.Test
@@ -128,14 +130,14 @@
                                     "ProviderApp1",
                                     "Provider1",
                                     providerIcon1,
-                                    ComplicationType.SHORT_TEXT.asWireComplicationType(),
+                                    ComplicationType.SHORT_TEXT.toWireComplicationType(),
                                     provider1
                                 ),
                                 RIGHT_COMPLICATION_ID to ComplicationProviderInfo(
                                     "ProviderApp2",
                                     "Provider2",
                                     providerIcon2,
-                                    ComplicationType.LONG_TEXT.asWireComplicationType(),
+                                    ComplicationType.LONG_TEXT.toWireComplicationType(),
                                     provider2
                                 )
                             ),
@@ -218,7 +220,7 @@
                         Icon.createWithBitmap(
                             Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
                         ),
-                        ComplicationType.LONG_TEXT.asWireComplicationType(),
+                        ComplicationType.LONG_TEXT.toWireComplicationType(),
                         provider3
                     )
                 )
@@ -228,17 +230,12 @@
     }
 }
 
-// Disables the requirement that watchFaceInstanceId has to be non-null on R and above.
-public class WatchFaceEditorContractForTest : WatchFaceEditorContract() {
-    override fun nullWatchFaceInstanceIdOK() = true
-}
-
 @RunWith(AndroidJUnit4::class)
 @MediumTest
 public class EditorSessionTest {
     private val testComponentName = ComponentName("test.package", "test.class")
     private val testEditorPackageName = "test.package"
-    private val testInstanceId = "TEST_INSTANCE_ID"
+    private val testInstanceId = WatchFaceId("TEST_INSTANCE_ID")
     private lateinit var editorDelegate: WatchFace.EditorDelegate
     private val screenBounds = Rect(0, 0, 400, 400)
 
@@ -283,7 +280,9 @@
         listOf(Layer.TOP_LAYER)
     )
 
-    private val mockLeftCanvasComplication = Mockito.mock(CanvasComplication::class.java)
+    private val placeholderWatchState = MutableWatchState().asWatchState()
+    private val mockLeftCanvasComplication =
+        CanvasComplicationDrawable(ComplicationDrawable(), placeholderWatchState)
     private val leftComplication =
         Complication.createRoundRectComplicationBuilder(
             LEFT_COMPLICATION_ID,
@@ -300,7 +299,8 @@
         ).setDefaultProviderType(ComplicationType.SHORT_TEXT)
             .build()
 
-    private val mockRightCanvasComplication = Mockito.mock(CanvasComplication::class.java)
+    private val mockRightCanvasComplication =
+        CanvasComplicationDrawable(ComplicationDrawable(), placeholderWatchState)
     private val rightComplication =
         Complication.createRoundRectComplicationBuilder(
             RIGHT_COMPLICATION_ID,
@@ -322,7 +322,8 @@
             )
             .build()
 
-    private val mockBackgroundCanvasComplication = Mockito.mock(CanvasComplication::class.java)
+    private val mockBackgroundCanvasComplication =
+        CanvasComplicationDrawable(ComplicationDrawable(), placeholderWatchState)
     private val backgroundComplication =
         Complication.createBackgroundComplicationBuilder(
             BACKGROUND_COMPLICATION_ID,
@@ -356,10 +357,10 @@
     private fun createOnWatchFaceEditingTestActivity(
         userStyleSettings: List<UserStyleSetting>,
         complications: List<Complication>,
-        instanceId: String? = testInstanceId,
+        watchFaceId: WatchFaceId = testInstanceId,
         previewReferenceTimeMillis: Long = 12345
     ): ActivityScenario<OnWatchFaceEditingTestActivity> {
-        val userStyleRepository = UserStyleRepository(UserStyleSchema(userStyleSettings))
+        val userStyleRepository = CurrentUserStyleRepository(UserStyleSchema(userStyleSettings))
         val complicationsManager = ComplicationsManager(complications, userStyleRepository)
 
         // Mocking getters and setters with mockito at the same time is hard so we do this instead.
@@ -373,7 +374,7 @@
             override val screenBounds = this@EditorSessionTest.screenBounds
             override val previewReferenceTimeMillis = previewReferenceTimeMillis
 
-            override fun takeScreenshot(
+            override fun renderWatchFaceToBitmap(
                 renderParameters: RenderParameters,
                 calendarTimeMillis: Long,
                 idToComplicationData: Map<Int, androidx.wear.complications.data.ComplicationData>?
@@ -386,9 +387,9 @@
         WatchFace.registerEditorDelegate(testComponentName, editorDelegate)
 
         return ActivityScenario.launch(
-            WatchFaceEditorContractForTest().createIntent(
+            WatchFaceEditorContract().createIntent(
                 ApplicationProvider.getApplicationContext<Context>(),
-                EditorRequest(testComponentName, testEditorPackageName, instanceId, null)
+                EditorRequest(testComponentName, testEditorPackageName, null, watchFaceId)
             ).apply {
                 component = ComponentName(
                     ApplicationProvider.getApplicationContext<Context>(),
@@ -410,7 +411,7 @@
     public fun instanceId() {
         val scenario = createOnWatchFaceEditingTestActivity(emptyList(), emptyList())
         scenario.onActivity {
-            assertThat(it.editorSession.instanceId).isEqualTo(testInstanceId)
+            assertThat(it.editorSession.watchFaceId.id).isEqualTo(testInstanceId.id)
         }
     }
 
@@ -473,40 +474,42 @@
             listOf(leftComplication, rightComplication, backgroundComplication)
         )
         scenario.onActivity {
-            assertThat(it.editorSession.complicationState.size).isEqualTo(3)
-            assertThat(it.editorSession.complicationState[LEFT_COMPLICATION_ID]!!.bounds)
+            assertThat(it.editorSession.complicationsState.size).isEqualTo(3)
+            assertThat(it.editorSession.complicationsState[LEFT_COMPLICATION_ID]!!.bounds)
                 .isEqualTo(Rect(80, 160, 160, 240))
-            assertThat(it.editorSession.complicationState[LEFT_COMPLICATION_ID]!!.boundsType)
+            assertThat(it.editorSession.complicationsState[LEFT_COMPLICATION_ID]!!.boundsType)
                 .isEqualTo(ComplicationBoundsType.ROUND_RECT)
             assertFalse(
-                it.editorSession.complicationState[LEFT_COMPLICATION_ID]!!.fixedComplicationProvider
+                it.editorSession.complicationsState[
+                    LEFT_COMPLICATION_ID
+                ]!!.fixedComplicationProvider
             )
             assertTrue(
-                it.editorSession.complicationState[LEFT_COMPLICATION_ID]!!.isInitiallyEnabled
+                it.editorSession.complicationsState[LEFT_COMPLICATION_ID]!!.isInitiallyEnabled
             )
 
-            assertThat(it.editorSession.complicationState[RIGHT_COMPLICATION_ID]!!.bounds)
+            assertThat(it.editorSession.complicationsState[RIGHT_COMPLICATION_ID]!!.bounds)
                 .isEqualTo(Rect(240, 160, 320, 240))
-            assertThat(it.editorSession.complicationState[RIGHT_COMPLICATION_ID]!!.boundsType)
+            assertThat(it.editorSession.complicationsState[RIGHT_COMPLICATION_ID]!!.boundsType)
                 .isEqualTo(ComplicationBoundsType.ROUND_RECT)
             assertFalse(
-                it.editorSession.complicationState[RIGHT_COMPLICATION_ID]!!
+                it.editorSession.complicationsState[RIGHT_COMPLICATION_ID]!!
                     .fixedComplicationProvider
             )
             assertTrue(
-                it.editorSession.complicationState[RIGHT_COMPLICATION_ID]!!.isInitiallyEnabled
+                it.editorSession.complicationsState[RIGHT_COMPLICATION_ID]!!.isInitiallyEnabled
             )
 
-            assertThat(it.editorSession.complicationState[BACKGROUND_COMPLICATION_ID]!!.bounds)
+            assertThat(it.editorSession.complicationsState[BACKGROUND_COMPLICATION_ID]!!.bounds)
                 .isEqualTo(screenBounds)
-            assertThat(it.editorSession.complicationState[BACKGROUND_COMPLICATION_ID]!!.boundsType)
+            assertThat(it.editorSession.complicationsState[BACKGROUND_COMPLICATION_ID]!!.boundsType)
                 .isEqualTo(ComplicationBoundsType.BACKGROUND)
             assertFalse(
-                it.editorSession.complicationState[BACKGROUND_COMPLICATION_ID]!!
+                it.editorSession.complicationsState[BACKGROUND_COMPLICATION_ID]!!
                     .fixedComplicationProvider
             )
             assertFalse(
-                it.editorSession.complicationState[BACKGROUND_COMPLICATION_ID]!!.isInitiallyEnabled
+                it.editorSession.complicationsState[BACKGROUND_COMPLICATION_ID]!!.isInitiallyEnabled
             )
             // We could test more state but this should be enough.
         }
@@ -514,6 +517,8 @@
 
     @Test
     public fun fixedComplicationProvider() {
+        val mockLeftCanvasComplication =
+            CanvasComplicationDrawable(ComplicationDrawable(), placeholderWatchState)
         val fixedLeftComplication =
             Complication.createRoundRectComplicationBuilder(
                 LEFT_COMPLICATION_ID,
@@ -537,7 +542,9 @@
         )
         scenario.onActivity {
             assertTrue(
-                it.editorSession.complicationState[LEFT_COMPLICATION_ID]!!.fixedComplicationProvider
+                it.editorSession.complicationsState[
+                    LEFT_COMPLICATION_ID
+                ]!!.fixedComplicationProvider
             )
 
             try {
@@ -750,7 +757,7 @@
 
             // This should update the preview data to point to the updated provider3 data.
             val previewComplication =
-                editorSession.getComplicationPreviewData()[LEFT_COMPLICATION_ID]
+                editorSession.getComplicationsPreviewData()[LEFT_COMPLICATION_ID]
                     as LongTextComplicationData
 
             assertThat(
@@ -764,7 +771,7 @@
                 TestComplicationHelperActivity.lastIntent?.extras?.getString(
                     ProviderChooserIntent.EXTRA_WATCHFACE_INSTANCE_ID
                 )
-            ).isEqualTo(testInstanceId)
+            ).isEqualTo(testInstanceId.id)
         }
     }
 
@@ -809,12 +816,12 @@
     }
 
     @Test
-    public fun takeWatchFaceScreenshot() {
+    public fun renderWatchFaceToBitmap() {
         val scenario = createOnWatchFaceEditingTestActivity(emptyList(), emptyList())
 
         scenario.onActivity {
             assertThat(
-                it.editorSession.takeWatchFaceScreenshot(
+                it.editorSession.renderWatchFaceToBitmap(
                     RenderParameters.DEFAULT_INTERACTIVE,
                     1234L,
                     null
@@ -853,16 +860,16 @@
 
         assertThat(result.userStyle[colorStyleSetting.id]).isEqualTo(blueStyleOption.id)
         assertThat(result.userStyle[watchHandStyleSetting.id]).isEqualTo(gothicStyleOption.id)
-        assertThat(result.watchFaceInstanceId).isEqualTo(testInstanceId)
-        assertTrue(result.commitChanges)
+        assertThat(result.watchFaceId.id).isEqualTo(testInstanceId.id)
+        assertTrue(result.shouldCommitChanges)
 
         // The style change should also have been applied to the watchface
         assertThat(editorDelegate.userStyle[colorStyleSetting]!!.id).isEqualTo(blueStyleOption.id)
         assertThat(editorDelegate.userStyle[watchHandStyleSetting]!!.id)
             .isEqualTo(gothicStyleOption.id)
 
-        assertThat(result.previewComplicationData.size).isEqualTo(2)
-        val leftComplicationData = result.previewComplicationData[LEFT_COMPLICATION_ID] as
+        assertThat(result.previewComplicationsData.size).isEqualTo(2)
+        val leftComplicationData = result.previewComplicationsData[LEFT_COMPLICATION_ID] as
             ShortTextComplicationData
         assertThat(
             leftComplicationData.text.getTextAt(
@@ -871,7 +878,7 @@
             )
         ).isEqualTo("Left")
 
-        val rightComplicationData = result.previewComplicationData[RIGHT_COMPLICATION_ID] as
+        val rightComplicationData = result.previewComplicationsData[RIGHT_COMPLICATION_ID] as
             LongTextComplicationData
         assertThat(
             rightComplicationData.text.getTextAt(
@@ -884,11 +891,11 @@
     }
 
     @Test
-    public fun nullInstanceId() {
+    public fun emptyInstanceId() {
         val scenario = createOnWatchFaceEditingTestActivity(
             listOf(colorStyleSetting, watchHandStyleSetting),
             emptyList(),
-            instanceId = null
+            watchFaceId = WatchFaceId("")
         )
 
         val editorObserver = TestEditorObserver()
@@ -896,7 +903,7 @@
 
         scenario.onActivity { activity ->
             runBlocking {
-                assertThat(activity.editorSession.instanceId).isNull()
+                assertThat(activity.editorSession.watchFaceId.id).isEmpty()
                 activity.editorSession.close()
                 activity.finish()
             }
@@ -906,7 +913,7 @@
             TIMEOUT_MILLIS,
             TimeUnit.MILLISECONDS
         ).asApiEditorState()
-        assertNull(result.watchFaceInstanceId)
+        assertThat(result.watchFaceId.id).isEmpty()
 
         EditorService.globalEditorService.unregisterObserver(observerId)
     }
@@ -927,7 +934,7 @@
             TIMEOUT_MILLIS,
             TimeUnit.MILLISECONDS
         ).asApiEditorState()
-        assertThat(result.previewComplicationData).isEmpty()
+        assertThat(result.previewComplicationsData).isEmpty()
 
         EditorService.globalEditorService.unregisterObserver(observerId)
     }
@@ -967,7 +974,7 @@
         ).asApiEditorState()
         assertThat(result.userStyle[colorStyleSetting.id]).isEqualTo(blueStyleOption.id)
         assertThat(result.userStyle[watchHandStyleSetting.id]).isEqualTo(gothicStyleOption.id)
-        assertFalse(result.commitChanges)
+        assertFalse(result.shouldCommitChanges)
 
         // The original style should be applied to the watch face however because
         // commitChangesOnClose is false.
@@ -983,7 +990,7 @@
         runBlocking {
             val intent = WatchFaceEditorContract().createIntent(
                 ApplicationProvider.getApplicationContext<Context>(),
-                EditorRequest(testComponentName, testEditorPackageName, testInstanceId, null)
+                EditorRequest(testComponentName, testEditorPackageName, null, testInstanceId)
             )
             assertThat(intent.getPackage()).isEqualTo(testEditorPackageName)
 
@@ -991,7 +998,7 @@
             assertThat(editorRequest.editorPackageName).isEqualTo(testEditorPackageName)
             assertThat(editorRequest.initialUserStyle).isNull()
             assertThat(editorRequest.watchFaceComponentName).isEqualTo(testComponentName)
-            assertThat(editorRequest.watchFaceInstanceId).isEqualTo(testInstanceId)
+            assertThat(editorRequest.watchFaceId.id).isEqualTo(testInstanceId.id)
         }
     }
 
@@ -1029,4 +1036,29 @@
 
         EditorService.globalEditorService.unregisterObserver(observerId)
     }
+
+    @Test
+    public fun closeEditorSessionBeforeWatchFaceDelegateCreated() {
+        val session: ActivityScenario<OnWatchFaceEditingTestActivity> = ActivityScenario.launch(
+            WatchFaceEditorContract().createIntent(
+                ApplicationProvider.getApplicationContext<Context>(),
+                EditorRequest(
+                    testComponentName,
+                    testEditorPackageName,
+                    null,
+                    WatchFaceId("instanceId")
+                )
+            ).apply {
+                component = ComponentName(
+                    ApplicationProvider.getApplicationContext<Context>(),
+                    OnWatchFaceEditingTestActivity::class.java
+                )
+            }
+        )
+
+        session.onActivity { activity ->
+            // This shouldn't throw an exception.
+            activity.editorSession.close()
+        }
+    }
 }

wear/wear-watchface-editor/src/androidTest/java/androidx/wear/watchface/editor/EditorSessionGuavaTest.kt

diff --git a/wear/wear-watchface-editor/src/androidTest/java/androidx/wear/watchface/editor/EditorSessionGuavaTest.kt b/wear/wear-watchface-editor/src/androidTest/java/androidx/wear/watchface/editor/EditorSessionGuavaTest.kt
index 6f6c8f9..3fb581d 100644
--- a/wear/wear-watchface-editor/src/androidTest/java/androidx/wear/watchface/editor/EditorSessionGuavaTest.kt
+++ b/wear/wear-watchface-editor/src/androidTest/java/androidx/wear/watchface/editor/EditorSessionGuavaTest.kt
@@ -30,11 +30,14 @@
 import androidx.wear.complications.data.ComplicationType
 import androidx.wear.complications.data.LongTextComplicationData
 import androidx.wear.complications.data.ShortTextComplicationData
-import androidx.wear.watchface.CanvasComplication
+import androidx.wear.watchface.CanvasComplicationDrawable
 import androidx.wear.watchface.Complication
 import androidx.wear.watchface.ComplicationsManager
+import androidx.wear.watchface.MutableWatchState
 import androidx.wear.watchface.WatchFace
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.client.WatchFaceId
+import androidx.wear.watchface.complications.rendering.ComplicationDrawable
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import androidx.wear.watchface.style.UserStyleSetting
 import com.google.common.truth.Truth
@@ -52,11 +55,13 @@
 public class EditorSessionGuavaTest {
     private val testComponentName = ComponentName("test.package", "test.class")
     private val testEditorPackageName = "test.package"
-    private val testInstanceId = "TEST_INSTANCE_ID"
+    private val testInstanceId = WatchFaceId("TEST_INSTANCE_ID")
     private var editorDelegate = Mockito.mock(WatchFace.EditorDelegate::class.java)
     private val screenBounds = Rect(0, 0, 400, 400)
 
-    private val mockLeftCanvasComplication = Mockito.mock(CanvasComplication::class.java)
+    private val placeholderWatchState = MutableWatchState().asWatchState()
+    private val mockLeftCanvasComplication =
+        CanvasComplicationDrawable(ComplicationDrawable(), placeholderWatchState)
     private val leftComplication =
         Complication.createRoundRectComplicationBuilder(
             LEFT_COMPLICATION_ID,
@@ -73,7 +78,8 @@
         ).setDefaultProviderType(ComplicationType.SHORT_TEXT)
             .build()
 
-    private val mockRightCanvasComplication = Mockito.mock(CanvasComplication::class.java)
+    private val mockRightCanvasComplication =
+        CanvasComplicationDrawable(ComplicationDrawable(), placeholderWatchState)
     private val rightComplication =
         Complication.createRoundRectComplicationBuilder(
             RIGHT_COMPLICATION_ID,
@@ -93,10 +99,10 @@
     private fun createOnWatchFaceEditingTestActivity(
         userStyleSettings: List<UserStyleSetting>,
         complications: List<Complication>,
-        instanceId: String? = testInstanceId,
+        watchFaceId: WatchFaceId = testInstanceId,
         previewReferenceTimeMillis: Long = 12345
     ): ActivityScenario<OnWatchFaceEditingTestActivity> {
-        val userStyleRepository = UserStyleRepository(UserStyleSchema(userStyleSettings))
+        val userStyleRepository = CurrentUserStyleRepository(UserStyleSchema(userStyleSettings))
         val complicationsManager = ComplicationsManager(complications, userStyleRepository)
 
         WatchFace.registerEditorDelegate(testComponentName, editorDelegate)
@@ -108,9 +114,9 @@
             .thenReturn(previewReferenceTimeMillis)
 
         return ActivityScenario.launch(
-            WatchFaceEditorContractForTest().createIntent(
+            WatchFaceEditorContract().createIntent(
                 ApplicationProvider.getApplicationContext<Context>(),
-                EditorRequest(testComponentName, testEditorPackageName, instanceId, null)
+                EditorRequest(testComponentName, testEditorPackageName, null, watchFaceId)
             ).apply {
                 component = ComponentName(
                     ApplicationProvider.getApplicationContext<Context>(),

wear/wear-watchface-editor/src/main/java/androidx/wear/watchface/editor/EditorSession.kt

diff --git a/wear/wear-watchface-editor/src/main/java/androidx/wear/watchface/editor/EditorSession.kt b/wear/wear-watchface-editor/src/main/java/androidx/wear/watchface/editor/EditorSession.kt
index d61d42a..250bc0f 100644
--- a/wear/wear-watchface-editor/src/main/java/androidx/wear/watchface/editor/EditorSession.kt
+++ b/wear/wear-watchface-editor/src/main/java/androidx/wear/watchface/editor/EditorSession.kt
@@ -21,6 +21,7 @@
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -45,10 +46,11 @@
 import androidx.wear.watchface.RenderParameters
 import androidx.wear.watchface.WatchFace
 import androidx.wear.watchface.client.ComplicationState
-import androidx.wear.watchface.client.EditorObserverCallback
+import androidx.wear.watchface.client.EditorListener
 import androidx.wear.watchface.client.EditorServiceClient
 import androidx.wear.watchface.client.EditorState
 import androidx.wear.watchface.client.HeadlessWatchFaceClient
+import androidx.wear.watchface.client.WatchFaceId
 import androidx.wear.watchface.data.ComplicationBoundsType
 import androidx.wear.watchface.data.IdAndComplicationDataWireFormat
 import androidx.wear.watchface.editor.data.EditorStateWireFormat
@@ -65,7 +67,7 @@
  * Interface for manipulating watch face state during an editing session for a watch face editing
  * session. The editor should adjust [userStyle] and call [launchComplicationProviderChooser] to
  * configure the watch face and call [close] when done. This reports the updated [EditorState] to
- * the [EditorObserverCallback]s registered via [EditorServiceClient.registerObserver].
+ * the [EditorListener]s registered via [EditorServiceClient.addListener].
  */
 public abstract class EditorSession : AutoCloseable {
     /** The [ComponentName] of the watch face being edited. */
@@ -76,7 +78,8 @@
      * beyond, it's `null` on Android P and earlier. Note each distinct [ComponentName] can have
      * multiple instances.
      */
-    public abstract val instanceId: String?
+    @get:RequiresApi(Build.VERSION_CODES.R)
+    public abstract val watchFaceId: WatchFaceId
 
     /** The current [UserStyle]. Assigning to this will cause the style to update. */
     public abstract var userStyle: UserStyle
@@ -91,7 +94,7 @@
      * Map of complication ids to [ComplicationState] for each complication slot. Note
      * [ComplicationState] can change, typically in response to styling.
      */
-    public abstract val complicationState: Map<Int, ComplicationState>
+    public abstract val complicationsState: Map<Int, ComplicationState>
 
     /**
      * Whether any changes should be committed when the session is closed (defaults to `true`).
@@ -105,17 +108,20 @@
      * their own config (e.g. the world clock has a timezone setting) and that config currently
      * can't be reverted.
      */
+    @get:UiThread
     @get:JvmName("isCommitChangesOnClose")
+    @set:UiThread
     public var commitChangesOnClose: Boolean = true
 
     /**
      * Returns a map of complication ids to preview [ComplicationData] suitable for use in rendering
      * the watch face. Note if a slot is configured to be empty then it will not appear in the map,
      * however disabled complications are included. Note also unlike live data this is static per
-     * provider, but it may change (on the UIThread) as a result of
+     * provider, but it may update (on the UiThread) as a result of
      * [launchComplicationProviderChooser].
      */
-    public abstract suspend fun getComplicationPreviewData(): Map<Int, ComplicationData>
+    @UiThread
+    public abstract suspend fun getComplicationsPreviewData(): Map<Int, ComplicationData>
 
     /** The ID of the background complication or `null` if there isn't one. */
     @get:SuppressWarnings("AutoBoxing")
@@ -127,14 +133,14 @@
     public abstract fun getComplicationIdAt(@Px x: Int, @Px y: Int): Int?
 
     /**
-     * Takes a screen shot of the watch face using the current [userStyle].
+     * Renders the watch face to a [Bitmap] using the current [userStyle].
      *
      * @param renderParameters The [RenderParameters] to render with
      * @param calendarTimeMillis The UTC time in milliseconds since the epoch to render with
      * @param idToComplicationData The [ComplicationData] for each complication to render with
      */
     @UiThread
-    public abstract fun takeWatchFaceScreenshot(
+    public abstract fun renderWatchFaceToBitmap(
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         idToComplicationData: Map<Int, ComplicationData>?
@@ -142,7 +148,8 @@
 
     /**
      * Launches the complication provider chooser and returns `true` if the user made a selection or
-     * `false` if the activity was canceled.
+     * `false` if the activity was canceled. If the complication provider was changed then the map
+     * returned by [getComplicationsPreviewData] is updated (on the UiThread).
      */
     @UiThread
     public abstract suspend fun launchComplicationProviderChooser(complicationId: Int): Boolean
@@ -152,15 +159,17 @@
          * Constructs an [EditorSession] for an on watch face editor. This registers an activity
          * result handler and so it must be called during an Activity or Fragment initialization
          * path.
+         *
+         * @param activity The [ComponentActivity] associated with the [EditorSession].
+         * @param editIntent The [Intent] sent by SysUI to launch the editing session.
+         * @return Deferred<EditorSession?> which is resolved with either the [EditorSession] or
+         *    `null` if it can't be constructed.
          */
         @SuppressWarnings("ExecutorRegistration")
         @JvmStatic
         @UiThread
         public fun createOnWatchEditingSessionAsync(
-            /** The [ComponentActivity] associated with the EditorSession. */
             activity: ComponentActivity,
-
-            /** [Intent] sent by SysUI to launch the editing session. */
             editIntent: Intent
         ): Deferred<EditorSession?> = createOnWatchEditingSessionAsyncImpl(
             activity,
@@ -185,7 +194,7 @@
                 val session = OnWatchFaceEditorSessionImpl(
                     activity,
                     editorRequest.watchFaceComponentName,
-                    editorRequest.watchFaceInstanceId,
+                    editorRequest.watchFaceId,
                     editorRequest.initialUserStyle,
                     providerInfoRetrieverProvider,
                     coroutineScope
@@ -206,17 +215,20 @@
             } ?: CompletableDeferred(null)
         }
 
-        /** Constructs an [EditorSession] for a remote watch face editor. */
+        /**
+         * Constructs an [EditorSession] for a remote watch face editor.
+         *
+         * @param activity The [ComponentActivity] associated with the EditorSession.
+         * @param editIntent The [Intent] sent by SysUI to launch the editing session.
+         * @param headlessWatchFaceClient The [HeadlessWatchFaceClient] to use for rendering etc...
+         * @return The [EditorSession] or `null` if it could not be constructed.
+         */
         @JvmStatic
         @RequiresApi(27)
         @UiThread
         public fun createHeadlessEditingSession(
-            /** The [ComponentActivity] associated with the EditorSession. */
             activity: ComponentActivity,
-
-            /** [Intent] sent by SysUI to launch the editing session. */
             editIntent: Intent,
-
             headlessWatchFaceClient: HeadlessWatchFaceClient
         ): EditorSession? = TraceEvent("EditorSession.createHeadlessEditingSession").use {
             EditorRequest.createFromIntent(editIntent)?.let {
@@ -224,7 +236,7 @@
                     activity,
                     headlessWatchFaceClient,
                     it.watchFaceComponentName,
-                    it.watchFaceInstanceId,
+                    it.watchFaceId,
                     it.initialUserStyle!!,
                     object : ProviderInfoRetrieverProvider {
                         override fun getProviderInfoRetriever() = ProviderInfoRetriever(activity)
@@ -271,7 +283,7 @@
     private val deferredComplicationPreviewDataMap =
         CompletableDeferred<MutableMap<Int, ComplicationData>>()
 
-    override suspend fun getComplicationPreviewData(): Map<Int, ComplicationData> {
+    override suspend fun getComplicationsPreviewData(): Map<Int, ComplicationData> {
         return deferredComplicationPreviewDataMap.await()
     }
 
@@ -311,27 +323,27 @@
         "BaseEditorSession.launchComplicationProviderChooser $complicationId"
     ).use {
         requireNotClosed()
-        require(!complicationState[complicationId]!!.fixedComplicationProvider) {
+        require(!complicationsState[complicationId]!!.fixedComplicationProvider) {
             "Can't configure fixed complication ID $complicationId"
         }
         pendingComplicationProviderChooserResult = CompletableDeferred<Boolean>()
         pendingComplicationProviderId = complicationId
         chooseComplicationProvider.launch(
-            ComplicationProviderChooserRequest(this, complicationId, instanceId)
+            ComplicationProviderChooserRequest(this, complicationId, watchFaceId.id)
         )
         return pendingComplicationProviderChooserResult!!.await()
     }
 
     override val backgroundComplicationId: Int? by lazy {
         requireNotClosed()
-        complicationState.entries.firstOrNull {
+        complicationsState.entries.firstOrNull {
             it.value.boundsType == ComplicationBoundsType.BACKGROUND
         }?.key
     }
 
     override fun getComplicationIdAt(@Px x: Int, @Px y: Int): Int? {
         requireNotClosed()
-        return complicationState.entries.firstOrNull {
+        return complicationsState.entries.firstOrNull {
             it.value.isEnabled && when (it.value.boundsType) {
                 ComplicationBoundsType.ROUND_RECT -> it.value.bounds.contains(x, y)
                 ComplicationBoundsType.BACKGROUND -> false
@@ -397,7 +409,7 @@
             // better to crash and start over.
             val providerInfoArray = providerInfoRetriever.retrieveProviderInfo(
                 watchFaceComponentName,
-                complicationState.keys.toIntArray()
+                complicationsState.keys.toIntArray()
             )
             deferredComplicationPreviewDataMap.complete(
                 // Parallel fetch preview ComplicationData.
@@ -425,9 +437,9 @@
         EditorService.globalEditorService.removeCloseCallback(closeCallback)
         coroutineScope.launchWithTracing("BaseEditorSession.close") {
             val editorState = EditorStateWireFormat(
-                instanceId,
+                watchFaceId.id,
                 userStyle.toWireFormat(),
-                getComplicationPreviewData().map {
+                getComplicationsPreviewData().map {
                     IdAndComplicationDataWireFormat(
                         it.key,
                         it.value.asWireComplicationData()
@@ -442,6 +454,7 @@
         }
     }
 
+    @UiThread
     internal fun forceClose() {
         commitChangesOnClose = false
         closed = true
@@ -458,13 +471,14 @@
         }
     }
 
+    @UiThread
     protected abstract fun releaseResources()
 }
 
 internal class OnWatchFaceEditorSessionImpl(
     activity: ComponentActivity,
     override val watchFaceComponentName: ComponentName,
-    override val instanceId: String?,
+    override val watchFaceId: WatchFaceId,
     private val initialEditorUserStyle: Map<String, String>?,
     providerInfoRetrieverProvider: ProviderInfoRetrieverProvider,
     coroutineScope: CoroutineScope
@@ -478,7 +492,7 @@
 
     override val previewReferenceTimeMillis by lazy { editorDelegate.previewReferenceTimeMillis }
 
-    override val complicationState
+    override val complicationsState
         get() = editorDelegate.complicationsManager.complications.mapValues {
             requireNotClosed()
             ComplicationState(
@@ -515,13 +529,13 @@
 
     private lateinit var previousWatchFaceUserStyle: UserStyle
 
-    override fun takeWatchFaceScreenshot(
+    override fun renderWatchFaceToBitmap(
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         idToComplicationData: Map<Int, ComplicationData>?
     ): Bitmap {
         requireNotClosed()
-        return editorDelegate.takeScreenshot(
+        return editorDelegate.renderWatchFaceToBitmap(
             renderParameters,
             calendarTimeMillis,
             idToComplicationData
@@ -529,7 +543,9 @@
     }
 
     override fun releaseResources() {
-        editorDelegate.onDestroy()
+        if (this::editorDelegate.isInitialized) {
+            editorDelegate.onDestroy()
+        }
         // Revert any changes to the UserStyle if needed.
         if (!commitChangesOnClose) {
             userStyle = previousWatchFaceUserStyle
@@ -557,7 +573,7 @@
     activity: ComponentActivity,
     private val headlessWatchFaceClient: HeadlessWatchFaceClient,
     override val watchFaceComponentName: ComponentName,
-    override val instanceId: String?,
+    override val watchFaceId: WatchFaceId,
     initialUserStyle: Map<String, String>,
     providerInfoRetrieverProvider: ProviderInfoRetrieverProvider,
     coroutineScope: CoroutineScope,
@@ -568,15 +584,15 @@
 
     override val previewReferenceTimeMillis = headlessWatchFaceClient.previewReferenceTimeMillis
 
-    override val complicationState = headlessWatchFaceClient.complicationState
+    override val complicationsState = headlessWatchFaceClient.complicationsState
 
-    override fun takeWatchFaceScreenshot(
+    override fun renderWatchFaceToBitmap(
         renderParameters: RenderParameters,
         calendarTimeMillis: Long,
         idToComplicationData: Map<Int, ComplicationData>?
     ): Bitmap {
         requireNotClosed()
-        return headlessWatchFaceClient.takeWatchFaceScreenshot(
+        return headlessWatchFaceClient.renderWatchFaceToBitmap(
             renderParameters,
             calendarTimeMillis,
             userStyle,
@@ -618,10 +634,10 @@
             context,
             input.editorSession.watchFaceComponentName,
             input.complicationId,
-            input.editorSession.complicationState[input.complicationId]!!.supportedTypes,
+            input.editorSession.complicationsState[input.complicationId]!!.supportedTypes,
             input.instanceId
         )
-        val complicationState = input.editorSession.complicationState[input.complicationId]!!
+        val complicationState = input.editorSession.complicationsState[input.complicationId]!!
         intent.replaceExtras(
             Bundle(complicationState.complicationConfigExtras).apply { putAll(intent.extras!!) }
         )

wear/wear-watchface-editor/src/main/java/androidx/wear/watchface/editor/WatchFaceEditorContract.kt

diff --git a/wear/wear-watchface-editor/src/main/java/androidx/wear/watchface/editor/WatchFaceEditorContract.kt b/wear/wear-watchface-editor/src/main/java/androidx/wear/watchface/editor/WatchFaceEditorContract.kt
index 50792d7..750d3c2 100644
--- a/wear/wear-watchface-editor/src/main/java/androidx/wear/watchface/editor/WatchFaceEditorContract.kt
+++ b/wear/wear-watchface-editor/src/main/java/androidx/wear/watchface/editor/WatchFaceEditorContract.kt
@@ -16,6 +16,7 @@
 
 package androidx.wear.watchface.editor
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
@@ -23,9 +24,11 @@
 import android.os.Build
 import android.support.wearable.watchface.Constants
 import androidx.activity.result.contract.ActivityResultContract
+import androidx.annotation.RequiresApi
 import androidx.wear.watchface.client.EditorServiceClient
 import androidx.wear.watchface.client.EditorState
 import androidx.wear.watchface.client.WatchFaceControlClient
+import androidx.wear.watchface.client.WatchFaceId
 import androidx.wear.watchface.style.UserStyle
 
 internal const val INSTANCE_ID_KEY: String = "INSTANCE_ID_KEY"
@@ -33,36 +36,58 @@
 internal const val USER_STYLE_KEY: String = "USER_STYLE_KEY"
 internal const val USER_STYLE_VALUES: String = "USER_STYLE_VALUES"
 
-/** The request sent by [WatchFaceEditorContract.createIntent]. */
-public class EditorRequest(
-    /** The [ComponentName] of the watch face being edited. */
+/**
+ * The request sent by [WatchFaceEditorContract.createIntent].
+ *
+ * @param watchFaceComponentName The [ComponentName] of the watch face being edited.
+ * @param editorPackageName The package name of the watch face editor APK.
+ * @param initialUserStyle The initial [UserStyle], only required for a headless [EditorSession].
+ * @param watchFaceId Unique ID for the instance of the watch face being edited, only
+ *     defined for Android R and beyond, it's `null` on Android P and earlier. Note each distinct
+ *     [ComponentName] can have multiple instances.
+ */
+public class EditorRequest @RequiresApi(Build.VERSION_CODES.R) constructor(
     public val watchFaceComponentName: ComponentName,
-
-    /** The package name of the watch face editor APK. */
     public val editorPackageName: String,
+    public val initialUserStyle: Map<String, String>?,
 
-    /**
-     * Unique ID for the instance of the watch face being edited, only defined for Android R and
-     * beyond, it's `null` on Android P and earlier. Note each distinct [ComponentName] can have
-     * multiple instances.
-     */
-    public val watchFaceInstanceId: String?,
-
-    /** The initial [UserStyle], only required for a headless [EditorSession]. */
-    public val initialUserStyle: Map<String, String>?
+    @get:RequiresApi(Build.VERSION_CODES.R)
+    @RequiresApi(Build.VERSION_CODES.R)
+    public val watchFaceId: WatchFaceId
 ) {
+    /**
+     * Constructs an [EditorRequest] without a [WatchFaceId]. This is for use pre-android R.
+     *
+     * @param watchFaceComponentName The [ComponentName] of the watch face being edited.
+     * @param editorPackageName The package name of the watch face editor APK.
+     * @param initialUserStyle The initial [UserStyle], only required for a headless
+     * [EditorSession].
+     */
+    @SuppressLint("NewApi")
+    public constructor(
+        watchFaceComponentName: ComponentName,
+        editorPackageName: String,
+        initialUserStyle: Map<String, String>?
+    ) : this(
+        watchFaceComponentName,
+        editorPackageName,
+        initialUserStyle,
+        WatchFaceId("")
+    )
+
     public companion object {
         /**
          * Returns an [EditorRequest] saved to a [Intent] by [WatchFaceEditorContract.createIntent]
          * if there is one or `null` otherwise. Intended for use by the watch face editor activity.
          */
+        @SuppressLint("NewApi")
         @JvmStatic
         public fun createFromIntent(intent: Intent): EditorRequest? {
             val componentName =
                 intent.getParcelableExtra<ComponentName>(COMPONENT_NAME_KEY)
                     ?: intent.getParcelableExtra(Constants.EXTRA_WATCH_FACE_COMPONENT)
             val editorPackageName = intent.getPackage() ?: ""
-            val instanceId = intent.getStringExtra(INSTANCE_ID_KEY)
+            val instanceId = WatchFaceId(intent.getStringExtra(INSTANCE_ID_KEY) ?: "")
             val userStyleKey = intent.getStringArrayExtra(USER_STYLE_KEY)
             val userStyleValue = intent.getStringArrayExtra(USER_STYLE_VALUES)
             return componentName?.let {
@@ -72,15 +97,15 @@
                     EditorRequest(
                         componentName,
                         editorPackageName,
-                        instanceId,
                         HashMap<String, String>().apply {
                             for (i in userStyleKey.indices) {
                                 put(userStyleKey[i], userStyleValue[i])
                             }
-                        }
+                        },
+                        instanceId
                     )
                 } else {
-                    EditorRequest(componentName, editorPackageName, instanceId, null)
+                    EditorRequest(componentName, editorPackageName, null, instanceId)
                 }
             }
         }
@@ -92,7 +117,7 @@
  * by SysUI and the normal activity result isn't used for returning [EditorState] because
  * [Activity.onStop] isn't guaranteed to be called when SysUI UX needs it to. Instead [EditorState]
  * is broadcast by the editor using[EditorSession.close], to observe these broadcasts use
- * [WatchFaceControlClient.getEditorServiceClient] and [EditorServiceClient.registerObserver].
+ * [WatchFaceControlClient.getEditorServiceClient] and [EditorServiceClient.addListener].
  */
 public open class WatchFaceEditorContract : ActivityResultContract<EditorRequest, Unit>() {
 
@@ -101,23 +126,14 @@
             "androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR"
     }
 
-    // Required for testing.
-    internal open fun nullWatchFaceInstanceIdOK() =
-        Build.VERSION.SDK_INT < Build.VERSION_CODES.R
-
     override fun createIntent(
         context: Context,
         input: EditorRequest
     ): Intent {
-        require(
-            input.watchFaceInstanceId != null || nullWatchFaceInstanceIdOK()
-        ) {
-            "watchFaceInstanceId must be set from Android R and above"
-        }
         return Intent(ACTION_WATCH_FACE_EDITOR).apply {
             setPackage(input.editorPackageName)
             putExtra(COMPONENT_NAME_KEY, input.watchFaceComponentName)
-            putExtra(INSTANCE_ID_KEY, input.watchFaceInstanceId)
+            putExtra(INSTANCE_ID_KEY, input.watchFaceId.id)
             input.initialUserStyle?.let {
                 putExtra(USER_STYLE_KEY, it.keys.toTypedArray())
                 putExtra(USER_STYLE_VALUES, it.values.toTypedArray())

wear/wear-watchface-style/api/current.txt

diff --git a/wear/wear-watchface-style/api/current.txt b/wear/wear-watchface-style/api/current.txt
index 93e065c..f37e1ab 100644
--- a/wear/wear-watchface-style/api/current.txt
+++ b/wear/wear-watchface-style/api/current.txt
@@ -1,6 +1,21 @@
 // Signature format: 4.0
 package androidx.wear.watchface.style {
 
+  public final class CurrentUserStyleRepository {
+    ctor public CurrentUserStyleRepository(androidx.wear.watchface.style.UserStyleSchema schema);
+    method @UiThread public void addUserStyleChangeListener(androidx.wear.watchface.style.CurrentUserStyleRepository.UserStyleChangeListener userStyleChangeListener);
+    method public androidx.wear.watchface.style.UserStyleSchema getSchema();
+    method @UiThread public androidx.wear.watchface.style.UserStyle getUserStyle();
+    method @UiThread public void removeUserStyleChangeListener(androidx.wear.watchface.style.CurrentUserStyleRepository.UserStyleChangeListener userStyleChangeListener);
+    method @UiThread public void setUserStyle(androidx.wear.watchface.style.UserStyle style);
+    property public final androidx.wear.watchface.style.UserStyleSchema schema;
+    property @UiThread public final androidx.wear.watchface.style.UserStyle userStyle;
+  }
+
+  public static interface CurrentUserStyleRepository.UserStyleChangeListener {
+    method @UiThread public void onUserStyleChanged(androidx.wear.watchface.style.UserStyle userStyle);
+  }
+
   public enum Layer {
     enum_constant public static final androidx.wear.watchface.style.Layer BASE_LAYER;
     enum_constant public static final androidx.wear.watchface.style.Layer COMPLICATIONS;
@@ -17,21 +32,6 @@
     property public final java.util.Map<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option> selectedOptions;
   }
 
-  public final class UserStyleRepository {
-    ctor public UserStyleRepository(androidx.wear.watchface.style.UserStyleSchema schema);
-    method @UiThread public void addUserStyleListener(androidx.wear.watchface.style.UserStyleRepository.UserStyleListener userStyleListener);
-    method public androidx.wear.watchface.style.UserStyleSchema getSchema();
-    method @UiThread public androidx.wear.watchface.style.UserStyle getUserStyle();
-    method @UiThread public void removeUserStyleListener(androidx.wear.watchface.style.UserStyleRepository.UserStyleListener userStyleListener);
-    method @UiThread public void setUserStyle(androidx.wear.watchface.style.UserStyle style);
-    property public final androidx.wear.watchface.style.UserStyleSchema schema;
-    property @UiThread public final androidx.wear.watchface.style.UserStyle userStyle;
-  }
-
-  public static interface UserStyleRepository.UserStyleListener {
-    method @UiThread public void onUserStyleChanged(androidx.wear.watchface.style.UserStyle userStyle);
-  }
-
   public final class UserStyleSchema {
     ctor public UserStyleSchema(java.util.List<? extends androidx.wear.watchface.style.UserStyleSetting> userStyleSettings);
     method public java.util.List<androidx.wear.watchface.style.UserStyleSetting> getUserStyleSettings();
@@ -39,7 +39,7 @@
   }
 
   public abstract sealed class UserStyleSetting {
-    method public final java.util.Collection<androidx.wear.watchface.style.Layer> getAffectsLayers();
+    method public final java.util.Collection<androidx.wear.watchface.style.Layer> getAffectedLayers();
     method public final androidx.wear.watchface.style.UserStyleSetting.Option getDefaultOption();
     method public final int getDefaultOptionIndex();
     method public final CharSequence getDescription();
@@ -48,7 +48,7 @@
     method public final String getId();
     method public androidx.wear.watchface.style.UserStyleSetting.Option getOptionForId(String optionId);
     method public final java.util.List<androidx.wear.watchface.style.UserStyleSetting.Option> getOptions();
-    property public final java.util.Collection<androidx.wear.watchface.style.Layer> affectsLayers;
+    property public final java.util.Collection<androidx.wear.watchface.style.Layer> affectedLayers;
     property public final int defaultOptionIndex;
     property public final CharSequence description;
     property public final CharSequence displayName;

wear/wear-watchface-style/api/public_plus_experimental_current.txt

diff --git a/wear/wear-watchface-style/api/public_plus_experimental_current.txt b/wear/wear-watchface-style/api/public_plus_experimental_current.txt
index f92f80a..c296e9d 100644
--- a/wear/wear-watchface-style/api/public_plus_experimental_current.txt
+++ b/wear/wear-watchface-style/api/public_plus_experimental_current.txt
@@ -1,6 +1,21 @@
 // Signature format: 4.0
 package androidx.wear.watchface.style {
 
+  public final class CurrentUserStyleRepository {
+    ctor public CurrentUserStyleRepository(androidx.wear.watchface.style.UserStyleSchema schema);
+    method @UiThread public void addUserStyleChangeListener(androidx.wear.watchface.style.CurrentUserStyleRepository.UserStyleChangeListener userStyleChangeListener);
+    method public androidx.wear.watchface.style.UserStyleSchema getSchema();
+    method @UiThread public androidx.wear.watchface.style.UserStyle getUserStyle();
+    method @UiThread public void removeUserStyleChangeListener(androidx.wear.watchface.style.CurrentUserStyleRepository.UserStyleChangeListener userStyleChangeListener);
+    method @UiThread public void setUserStyle(androidx.wear.watchface.style.UserStyle style);
+    property public final androidx.wear.watchface.style.UserStyleSchema schema;
+    property @UiThread public final androidx.wear.watchface.style.UserStyle userStyle;
+  }
+
+  public static interface CurrentUserStyleRepository.UserStyleChangeListener {
+    method @UiThread public void onUserStyleChanged(androidx.wear.watchface.style.UserStyle userStyle);
+  }
+
   public enum Layer {
     enum_constant public static final androidx.wear.watchface.style.Layer BASE_LAYER;
     enum_constant public static final androidx.wear.watchface.style.Layer COMPLICATIONS;
@@ -17,21 +32,6 @@
     property public final java.util.Map<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option> selectedOptions;
   }
 
-  public final class UserStyleRepository {
-    ctor public UserStyleRepository(androidx.wear.watchface.style.UserStyleSchema schema);
-    method @UiThread public void addUserStyleListener(androidx.wear.watchface.style.UserStyleRepository.UserStyleListener userStyleListener);
-    method public androidx.wear.watchface.style.UserStyleSchema getSchema();
-    method @UiThread public androidx.wear.watchface.style.UserStyle getUserStyle();
-    method @UiThread public void removeUserStyleListener(androidx.wear.watchface.style.UserStyleRepository.UserStyleListener userStyleListener);
-    method @UiThread public void setUserStyle(androidx.wear.watchface.style.UserStyle style);
-    property public final androidx.wear.watchface.style.UserStyleSchema schema;
-    property @UiThread public final androidx.wear.watchface.style.UserStyle userStyle;
-  }
-
-  public static interface UserStyleRepository.UserStyleListener {
-    method @UiThread public void onUserStyleChanged(androidx.wear.watchface.style.UserStyle userStyle);
-  }
-
   public final class UserStyleSchema {
     ctor public UserStyleSchema(java.util.List<? extends androidx.wear.watchface.style.UserStyleSetting> userStyleSettings);
     method public java.util.List<androidx.wear.watchface.style.UserStyleSetting> getUserStyleSettings();
@@ -39,7 +39,7 @@
   }
 
   public abstract sealed class UserStyleSetting {
-    method public final java.util.Collection<androidx.wear.watchface.style.Layer> getAffectsLayers();
+    method public final java.util.Collection<androidx.wear.watchface.style.Layer> getAffectedLayers();
     method public final androidx.wear.watchface.style.UserStyleSetting.Option getDefaultOption();
     method public final int getDefaultOptionIndex();
     method public final CharSequence getDescription();
@@ -48,7 +48,7 @@
     method public final String getId();
     method public androidx.wear.watchface.style.UserStyleSetting.Option getOptionForId(String optionId);
     method public final java.util.List<androidx.wear.watchface.style.UserStyleSetting.Option> getOptions();
-    property public final java.util.Collection<androidx.wear.watchface.style.Layer> affectsLayers;
+    property public final java.util.Collection<androidx.wear.watchface.style.Layer> affectedLayers;
     property public final int defaultOptionIndex;
     property public final CharSequence description;
     property public final CharSequence displayName;

wear/wear-watchface-style/api/restricted_current.txt

diff --git a/wear/wear-watchface-style/api/restricted_current.txt b/wear/wear-watchface-style/api/restricted_current.txt
index a9db649..e013e49 100644
--- a/wear/wear-watchface-style/api/restricted_current.txt
+++ b/wear/wear-watchface-style/api/restricted_current.txt
@@ -1,6 +1,21 @@
 // Signature format: 4.0
 package androidx.wear.watchface.style {
 
+  public final class CurrentUserStyleRepository {
+    ctor public CurrentUserStyleRepository(androidx.wear.watchface.style.UserStyleSchema schema);
+    method @UiThread public void addUserStyleChangeListener(androidx.wear.watchface.style.CurrentUserStyleRepository.UserStyleChangeListener userStyleChangeListener);
+    method public androidx.wear.watchface.style.UserStyleSchema getSchema();
+    method @UiThread public androidx.wear.watchface.style.UserStyle getUserStyle();
+    method @UiThread public void removeUserStyleChangeListener(androidx.wear.watchface.style.CurrentUserStyleRepository.UserStyleChangeListener userStyleChangeListener);
+    method @UiThread public void setUserStyle(androidx.wear.watchface.style.UserStyle style);
+    property public final androidx.wear.watchface.style.UserStyleSchema schema;
+    property @UiThread public final androidx.wear.watchface.style.UserStyle userStyle;
+  }
+
+  public static interface CurrentUserStyleRepository.UserStyleChangeListener {
+    method @UiThread public void onUserStyleChanged(androidx.wear.watchface.style.UserStyle userStyle);
+  }
+
   public enum Layer {
     enum_constant public static final androidx.wear.watchface.style.Layer BASE_LAYER;
     enum_constant public static final androidx.wear.watchface.style.Layer COMPLICATIONS;
@@ -19,21 +34,6 @@
     property public final java.util.Map<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option> selectedOptions;
   }
 
-  public final class UserStyleRepository {
-    ctor public UserStyleRepository(androidx.wear.watchface.style.UserStyleSchema schema);
-    method @UiThread public void addUserStyleListener(androidx.wear.watchface.style.UserStyleRepository.UserStyleListener userStyleListener);
-    method public androidx.wear.watchface.style.UserStyleSchema getSchema();
-    method @UiThread public androidx.wear.watchface.style.UserStyle getUserStyle();
-    method @UiThread public void removeUserStyleListener(androidx.wear.watchface.style.UserStyleRepository.UserStyleListener userStyleListener);
-    method @UiThread public void setUserStyle(androidx.wear.watchface.style.UserStyle style);
-    property public final androidx.wear.watchface.style.UserStyleSchema schema;
-    property @UiThread public final androidx.wear.watchface.style.UserStyle userStyle;
-  }
-
-  public static interface UserStyleRepository.UserStyleListener {
-    method @UiThread public void onUserStyleChanged(androidx.wear.watchface.style.UserStyle userStyle);
-  }
-
   public final class UserStyleSchema {
     ctor public UserStyleSchema(java.util.List<? extends androidx.wear.watchface.style.UserStyleSetting> userStyleSettings);
     ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public UserStyleSchema(androidx.wear.watchface.style.data.UserStyleSchemaWireFormat wireFormat);
@@ -43,7 +43,7 @@
   }
 
   public abstract sealed class UserStyleSetting {
-    method public final java.util.Collection<androidx.wear.watchface.style.Layer> getAffectsLayers();
+    method public final java.util.Collection<androidx.wear.watchface.style.Layer> getAffectedLayers();
     method public final androidx.wear.watchface.style.UserStyleSetting.Option getDefaultOption();
     method public final int getDefaultOptionIndex();
     method public final CharSequence getDescription();
@@ -54,7 +54,7 @@
     method public final java.util.List<androidx.wear.watchface.style.UserStyleSetting.Option> getOptions();
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final java.util.List<androidx.wear.watchface.style.data.OptionWireFormat> getWireFormatOptionsList();
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public abstract androidx.wear.watchface.style.data.UserStyleSettingWireFormat toWireFormat();
-    property public final java.util.Collection<androidx.wear.watchface.style.Layer> affectsLayers;
+    property public final java.util.Collection<androidx.wear.watchface.style.Layer> affectedLayers;
     property public final int defaultOptionIndex;
     property public final CharSequence description;
     property public final CharSequence displayName;

wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/CurrentUserStyleRepository.kt

diff --git a/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleRepository.kt b/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/CurrentUserStyleRepository.kt
similarity index 76%
rename from wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleRepository.kt
rename to wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/CurrentUserStyleRepository.kt
index 0f82e81..7327339 100644
--- a/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleRepository.kt
+++ b/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/CurrentUserStyleRepository.kt
@@ -25,17 +25,28 @@
 /**
  * The users style choices represented as a map of [UserStyleSetting] to
  * [UserStyleSetting.Option].
+ *
+ * @param selectedOptions The [UserStyleSetting.Option] selected for each [UserStyleSetting]
  */
 public class UserStyle(
     public val selectedOptions: Map<UserStyleSetting, UserStyleSetting.Option>
 ) {
-    /** Constructs a UserStyle with a deep copy of the [selectedOptions]. */
+    /**
+     * Constructs a UserStyle with a deep copy of the [selectedOptions].
+     *
+     * @param userStyle The [UserStyle] to copy.
+     */
     public constructor(userStyle: UserStyle) : this(HashMap(userStyle.selectedOptions))
 
     /**
      * Constructs a [UserStyle] from a Map<String, String> and the [UserStyleSchema]. Unrecognized
      * style settings will be ignored. Unlisted style settings will be initialized with that
      * settings default option.
+     *
+     * @param userStyle The [UserStyle] represented as a Map<String, String> of
+     *     [UserStyleSetting.id] to [UserStyleSetting.Option.id]
+     * @param styleSchema The [UserStyleSchema] for this UserStyle, describes how we interpret
+     *     [userStyle].
      */
     public constructor(
         userStyle: Map<String, String>,
@@ -79,12 +90,13 @@
         ) + "]"
 }
 
-/** Describes the list of [UserStyleSetting]s the user can configure. */
+/**
+ * Describes the list of [UserStyleSetting]s the user can configure.
+ *
+ * @param userStyleSettings The user configurable style categories associated with this watch
+ *     face. Empty if the watch face doesn't support user styling.
+ */
 public class UserStyleSchema(
-    /**
-     * The user configurable style categories associated with this watch face. Empty if the watch
-     * face doesn't support user styling.
-     */
     public val userStyleSettings: List<UserStyleSetting>
 ) {
     init {
@@ -119,31 +131,30 @@
 }
 
 /**
- * An in memory storage for user style choices represented as [UserStyle], listeners can be
- * registered to observe style changes. The UserStyleRepository is initialized with a
+ * In memory storage for the current user style choices represented as [UserStyle], listeners can be
+ * registered to observe style changes. The CurrentUserStyleRepository is initialized with a
  * [UserStyleSchema].
+ *
+ * @param schema The [UserStyleSchema] for this CurrentUserStyleRepository which describes the
+ *     available style categories.
  */
-public class UserStyleRepository(
-    /**
-     * The [UserStyleSchema] for this UserStyleRepository which describes the available style
-     * categories.
-     */
+public class CurrentUserStyleRepository(
     public val schema: UserStyleSchema
 ) {
     /** A listener for observing [UserStyle] changes. */
-    public interface UserStyleListener {
+    public interface UserStyleChangeListener {
         /** Called whenever the [UserStyle] changes. */
         @UiThread
         public fun onUserStyleChanged(userStyle: UserStyle)
     }
 
-    private val styleListeners = HashSet<UserStyleListener>()
+    private val styleListeners = HashSet<UserStyleChangeListener>()
 
     private val idToStyleSetting = schema.userStyleSettings.associateBy { it.id }
 
     /**
-     * The current [UserStyle]. Assigning to this property triggers immediate [UserStyleListener]
-     * callbacks if if any options have changed.
+     * The current [UserStyle]. Assigning to this property triggers immediate
+     * [UserStyleChangeListener] callbacks if if any options have changed.
      */
     public var userStyle: UserStyle = UserStyle(
         HashMap<UserStyleSetting, UserStyleSetting.Option>().apply {
@@ -179,19 +190,19 @@
         }
 
     /**
-     * Adds a [UserStyleListener] which is called immediately and whenever the style changes.
+     * Adds a [UserStyleChangeListener] which is called immediately and whenever the style changes.
      */
     @UiThread
     @SuppressLint("ExecutorRegistration")
-    public fun addUserStyleListener(userStyleListener: UserStyleListener) {
-        styleListeners.add(userStyleListener)
-        userStyleListener.onUserStyleChanged(userStyle)
+    public fun addUserStyleChangeListener(userStyleChangeListener: UserStyleChangeListener) {
+        styleListeners.add(userStyleChangeListener)
+        userStyleChangeListener.onUserStyleChanged(userStyle)
     }
 
-    /** Removes a [UserStyleListener] previously added by [addUserStyleListener]. */
+    /** Removes a [UserStyleChangeListener] previously added by [addUserStyleChangeListener]. */
     @UiThread
     @SuppressLint("ExecutorRegistration")
-    public fun removeUserStyleListener(userStyleListener: UserStyleListener) {
-        styleListeners.remove(userStyleListener)
+    public fun removeUserStyleChangeListener(userStyleChangeListener: UserStyleChangeListener) {
+        styleListeners.remove(userStyleChangeListener)
     }
 }

wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/Layer.kt

diff --git a/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/Layer.kt b/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/Layer.kt
index f59ebc3..a23719d 100644
--- a/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/Layer.kt
+++ b/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/Layer.kt
@@ -16,6 +16,7 @@
 
 package androidx.wear.watchface.style
 
+/** Describes part of watchface. Used as a parameter for rendering. */
 public enum class Layer {
     BASE_LAYER,
     COMPLICATIONS,

wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleSetting.kt

diff --git a/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleSetting.kt b/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleSetting.kt
index 067bee8..e096d2b 100644
--- a/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleSetting.kt
+++ b/wear/wear-watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleSetting.kt
@@ -21,7 +21,6 @@
 import androidx.wear.complications.ComplicationBounds
 import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting.ComplicationOverlay
 import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting.ComplicationsOption
-import androidx.wear.watchface.style.UserStyleSetting.Option.Companion.maxIdLength
 import androidx.wear.watchface.style.data.BooleanOptionWireFormat
 import androidx.wear.watchface.style.data.BooleanUserStyleSettingWireFormat
 import androidx.wear.watchface.style.data.ComplicationOverlayWireFormat
@@ -49,40 +48,31 @@
  *
  * Styling data gets shared with the companion phone to support editors (typically over bluetooth),
  * as a result the size of serialized UserStyleSettings could become an issue if large.
+ *
+ * @param id Identifier for the element, must be unique. Styling data gets shared with the companion
+ *     (typically via bluetooth) so size is a consideration and short ids are encouraged. There is a
+ *     maximum length see [maxIdLength].
+ * @param displayName Localized human readable name for the element, used in the userStyle selection
+ *     UI.
+ * @param description Localized description string displayed under the displayName.
+ * @param icon Icon for use in the style selection UI.
+ * @param options List of options for this UserStyleSetting. Depending on the type of
+ *     UserStyleSetting this may be an exhaustive list, or just examples to populate a ListView
+ *     in case the UserStyleSetting isn't supported by the UI (e.g. a new WatchFace with an old
+ *     Companion).
+ * @param defaultOptionIndex The default option index, used if nothing has been selected within the
+ *     [options] list.
+ * @param affectedLayers Used by the style configuration UI. Describes which rendering layers this
+ *     style affects.
  */
 public sealed class UserStyleSetting(
-    /**
-     * Identifier for the element, must be unique. Styling data gets shared with the companion
-     * (typically via bluetooth) so size is a consideration and short ids are encouraged. There is a
-     * maximum length see [maxIdLength].
-     */
     public val id: String,
-
-    /** Localized human readable name for the element, used in the userStyle selection UI. */
     public val displayName: CharSequence,
-
-    /** Localized description string displayed under the displayName. */
     public val description: CharSequence,
-
-    /** Icon for use in the style selection UI. */
     public val icon: Icon?,
-
-    /**
-     * List of options for this UserStyleSetting. Depending on the type of UserStyleSetting this
-     * may be an exhaustive list, or just examples to populate a ListView in case the
-     * UserStyleSetting isn't supported by the UI (e.g. a new WatchFace with an old Companion).
-     */
     public val options: List<Option>,
-
-    /**
-     * The default option index, used if nothing has been selected within the [options] list.
-     */
     public val defaultOptionIndex: Int,
-
-    /**
-     * Used by the style configuration UI. Describes which rendering layers this style affects.
-     */
-    public val affectsLayers: Collection<Layer>
+    public val affectedLayers: Collection<Layer>
 ) {
     public companion object {
         /** Maximum length of the [id] field. */
@@ -156,16 +146,12 @@
      * Represents a choice within a style setting which can either be an option from the list or a
      * an arbitrary value depending on the nature of the style setting.
      *
-     * @property id Machine readable identifier for the style setting.
+     * @property id Machine readable identifier for the style setting. Identifier for the option
+     *     (or the option itself for [CustomValueUserStyleSetting.CustomValueOption]), must be
+     *     unique within the UserStyleSetting. Short ids are encouraged. There is a maximum
+     *     length see [maxIdLength].
      */
-    public abstract class Option(
-        /**
-         * Identifier for the option (or the option itself for
-         * [CustomValueUserStyleSetting.CustomValueOption]), must be unique within the
-         * UserStyleSetting. Short ids are encouraged. There is a maximum length see [maxIdLength].
-         */
-        public val id: String
-    ) {
+    public abstract class Option(public val id: String) {
         init {
             require(id.length <= maxIdLength) {
                 "UserStyleSetting.Option id length must not exceed $maxIdLength"
@@ -272,28 +258,24 @@
     /** A BooleanUserStyleSetting represents a setting with a true and a false setting. */
     public class BooleanUserStyleSetting : UserStyleSetting {
 
+        /**
+         * Constructs a [BooleanUserStyleSetting].
+         *
+         * @param id Identifier for the element, must be unique.
+         * @param displayName Localized human readable name for the element, used in the userStyle
+         *     selection UI.
+         * @param description Localized description string displayed under the displayName.
+         * @param icon [Icon] for use in the userStyle selection UI.
+         * @param affectsLayers Used by the style configuration UI. Describes which rendering
+         *     layers this style affects.
+         * @param defaultValue The default value for this BooleanUserStyleSetting.
+         */
         public constructor (
-            /** Identifier for the element, must be unique. */
             id: String,
-
-            /**
-             * Localized human readable name for the element, used in the userStyle selection UI.
-             */
             displayName: CharSequence,
-
-            /** Localized description string displayed under the displayName. */
             description: CharSequence,
-
-            /** Icon for use in the userStyle selection UI. */
             icon: Icon?,
-
-            /**
-             * Used by the style configuration UI. Describes which rendering layers this style
-             * affects.
-             */
             affectsLayers: Collection<Layer>,
-
-            /** The default value for this BooleanUserStyleSetting. */
             defaultValue: Boolean
         ) : super(
             id,
@@ -320,7 +302,7 @@
                 icon,
                 getWireFormatOptionsList(),
                 defaultOptionIndex,
-                affectsLayers.map { it.ordinal }
+                affectedLayers.map { it.ordinal }
             )
 
         /** Returns the default value. */
@@ -366,22 +348,17 @@
         /**
          * Overrides to be applied to the corresponding complication's initial config (as specified
          * in [androidx.wear.watchface.Complication]) when the setting is selected.
+         *
+         * @param complicationId The id of the complication to configure.
+         * @param enabled If non null, whether the complication should be enabled for this
+         *     configuration. If null then no changes are made.
+         * @param complicationBounds If non null, the new [ComplicationBounds] for this
+         *     configuration. If null then no changes are made.
          */
         public class ComplicationOverlay constructor(
-            /** The id of the complication to configure. */
             public val complicationId: Int,
-
-            /**
-             * If non null, whether the complication should be enabled for this configuration. If
-             * null then no changes are made.
-             */
             @get:JvmName("isEnabled")
             public val enabled: Boolean? = null,
-
-            /**
-             * If non null, the new [ComplicationBounds] for this configuration. If null then no
-             * changes are made.
-             */
             public val complicationBounds: ComplicationBounds? = null
         ) {
             public class Builder(
@@ -436,32 +413,28 @@
                 )
         }
 
+        /**
+         * Constructs a [ComplicationsUserStyleSetting].
+         *
+         * @param id Identifier for the element, must be unique.
+         * @param displayName Localized human readable name for the element, used in the userStyle
+         *     selection UI.
+         * @param description Localized description string displayed under the displayName.
+         * @param icon [Icon] for use in the userStyle selection UI.
+         * @param complicationConfig The configuration for affected complications.
+         * @param affectsLayers Used by the style configuration UI. Describes which rendering layers
+         *     this style affects, must include [Layer.COMPLICATIONS].
+         * @param defaultOption The default option, used when data isn't persisted. Optional
+         *     parameter which defaults to the first element of [complicationConfig].
+         */
         @JvmOverloads
         public constructor (
-            /** Identifier for the element, must be unique. */
             id: String,
-
-            /**
-             * Localized human readable name for the element, used in the userStyle selection UI.
-             */
             displayName: CharSequence,
-
-            /** Localized description string displayed under the displayName. */
             description: CharSequence,
-
-            /** Icon for use in the userStyle selection UI. */
             icon: Icon?,
-
-            /** The configuration for affected complications. */
             complicationConfig: List<ComplicationsOption>,
-
-            /**
-             * Used by the style configuration UI. Describes which rendering layers this style
-             * affects, must include [Layer.COMPLICATIONS].
-             */
             affectsLayers: Collection<Layer>,
-
-            /** The default option, used when data isn't persisted. */
             defaultOption: ComplicationsOption = complicationConfig.first()
         ) : super(
             id,
@@ -489,7 +462,7 @@
                 icon,
                 getWireFormatOptionsList(),
                 defaultOptionIndex,
-                affectsLayers.map { it.ordinal }
+                affectedLayers.map { it.ordinal }
             )
 
         /** Represents an override to the initial complication configuration. */
@@ -506,6 +479,17 @@
             /** Icon for use in the style selection UI. */
             public val icon: Icon?
 
+            /**
+             * Constructs a [ComplicationsUserStyleSetting].
+             *
+             * @param id Identifier for the element, must be unique.
+             * @param displayName Localized human readable name for the element, used in the
+             *     userStyle selection UI.
+             * @param icon [Icon] for use in the style selection UI.
+             * @param complicationOverlays Overlays to be applied when this ComplicationsOption is
+             *     selected. If this is empty then the net result is the initial complication
+             *     configuration.
+             */
             public constructor(
                 id: String,
                 displayName: CharSequence,
@@ -567,34 +551,28 @@
             }
         }
 
+        /**
+         * Constructs a [DoubleRangeUserStyleSetting].
+         *
+         * @param id Identifier for the element, must be unique.
+         * @param displayName Localized human readable name for the element, used in the
+         *     userStyle selection UI.
+         * @param description Localized description string displayed under the displayName.
+         * @param icon [Icon] for use in the style selection UI.
+         * @param minimumValue Minimum value (inclusive).
+         * @param maximumValue Maximum value (inclusive).
+         * @param affectsLayers Used by the style configuration UI. Describes which rendering layers
+         *     this style affects.
+         * @param defaultValue The default value for this DoubleRangeUserStyleSetting.
+         */
         public constructor (
-            /** Identifier for the element, must be unique. */
             id: String,
-
-            /**
-             * Localized human readable name for the element, used in the userStyle selection UI.
-             */
             displayName: CharSequence,
-
-            /** Localized description string displayed under the displayName. */
             description: CharSequence,
-
-            /** Icon for use in the userStyle selection UI. */
             icon: Icon?,
-
-            /** Minimum value (inclusive). */
             minimumValue: Double,
-
-            /** Maximum value (inclusive). */
             maximumValue: Double,
-
-            /**
-             * Used by the style configuration UI. Describes which rendering layers this style
-             * affects.
-             */
             affectsLayers: Collection<Layer>,
-
-            /** The default value for this DoubleRangeUserStyleSetting. */
             defaultValue: Double
         ) : super(
             id,
@@ -622,7 +600,7 @@
                 icon,
                 getWireFormatOptionsList(),
                 defaultOptionIndex,
-                affectsLayers.map { it.ordinal }
+                affectedLayers.map { it.ordinal }
             )
 
         /** Represents an option as a [Double] in the range [minimumValue .. maximumValue]. */
@@ -630,14 +608,15 @@
             /* The value for this option. Must be within the range [minimumValue .. maximumValue].*/
             public val value: Double
 
+            /**
+             * Constructs a [DoubleRangeOption].
+             *
+             * @param value The value of this [DoubleRangeOption]
+             */
             public constructor(value: Double) : super(value.toString()) {
                 this.value = value
             }
 
-            internal companion object {
-                internal const val KEY_DOUBLE_VALUE = "KEY_DOUBLE_VALUE"
-            }
-
             internal constructor(
                 wireFormat: DoubleRangeOptionWireFormat
             ) : super(wireFormat.mId) {
@@ -684,30 +663,27 @@
     /** A ListStyleCategory represents a setting with options selected from a List. */
     public open class ListUserStyleSetting : UserStyleSetting {
 
+        /**
+         * Constructs a [ListUserStyleSetting].
+         *
+         * @param id Identifier for the element, must be unique.
+         * @param displayName Localized human readable name for the element, used in the userStyle
+         *     selection UI.
+         * @param description Localized description string displayed under the displayName.
+         * @param icon [Icon] for use in the userStyle selection UI.
+         * @param options List of all options for this ListUserStyleSetting.
+         * @param affectsLayers Used by the style configuration UI. Describes which rendering layers
+         *     this style affects.
+         * @param defaultOption The default option, used when data isn't persisted.
+         */
         @JvmOverloads
         public constructor (
-            /** Identifier for the element, must be unique. */
             id: String,
-
-            /** Localized human readable name for the element, used in the userStyle selection UI.*/
             displayName: CharSequence,
-
-            /** Localized description string displayed under the displayName. */
             description: CharSequence,
-
-            /** Icon for use in the userStyle selection UI. */
             icon: Icon?,
-
-            /** List of all options for this ListUserStyleSetting. */
             options: List<ListOption>,
-
-            /**
-             * Used by the style configuration UI. Describes which rendering layers this style
-             * affects.
-             */
             affectsLayers: Collection<Layer>,
-
-            /** The default option, used when data isn't persisted. */
             defaultOption: ListOption = options.first()
         ) : super(
             id,
@@ -731,7 +707,7 @@
                 icon,
                 getWireFormatOptionsList(),
                 defaultOptionIndex,
-                affectsLayers.map { it.ordinal }
+                affectedLayers.map { it.ordinal }
             )
 
         /**
@@ -744,6 +720,15 @@
             /** Icon for use in the style selection UI. */
             public val icon: Icon?
 
+            /**
+             * Constructs a [ListOption].
+             *
+             * @param id The id of this [ListOption], must be unique within the
+             *     [ListUserStyleSetting].
+             * @param displayName Localized human readable name for the setting, used in the style
+             *     selection UI.
+             * @param icon [Icon] for use in the style selection UI.
+             */
             public constructor(id: String, displayName: CharSequence, icon: Icon?) : super(id) {
                 this.displayName = displayName
                 this.icon = icon
@@ -798,32 +783,28 @@
             }
         }
 
+        /**
+         * Constructs a [LongRangeUserStyleSetting].
+         *
+         * @param id Identifier for the element, must be unique.
+         * @param displayName Localized human readable name for the element, used in the userStyle
+         *     selection UI.
+         * @param description Localized description string displayed under the displayName.
+         * @param icon [Icon] for use in the userStyle selection UI.
+         * @param minimumValue Minimum value (inclusive).
+         * @param maximumValue Maximum value (inclusive).
+         * @param affectsLayers Used by the style configuration UI. Describes which rendering layers
+         *     this style affects.
+         * @param defaultValue The default value for this LongRangeUserStyleSetting.
+         */
         public constructor (
-            /** Identifier for the element, must be unique. */
             id: String,
-
-            /** Localized human readable name for the element, used in the userStyle selection UI.*/
             displayName: CharSequence,
-
-            /** Localized description string displayed under the displayName. */
             description: CharSequence,
-
-            /** Icon for use in the userStyle selection UI. */
             icon: Icon?,
-
-            /** Minimum value (inclusive). */
             minimumValue: Long,
-
-            /** Maximum value (inclusive). */
             maximumValue: Long,
-
-            /**
-             * Used by the style configuration UI. Describes which rendering layers this style
-             * affects.
-             */
             affectsLayers: Collection<Layer>,
-
-            /** The default value for this LongRangeUserStyleSetting. */
             defaultValue: Long
         ) : super(
             id,
@@ -851,7 +832,7 @@
                 icon,
                 getWireFormatOptionsList(),
                 defaultOptionIndex,
-                affectsLayers.map { it.ordinal }
+                affectedLayers.map { it.ordinal }
             )
 
         /**
@@ -861,14 +842,15 @@
             /* The value for this option. Must be within the range [minimumValue..maximumValue]. */
             public val value: Long
 
+            /**
+             * Constructs a [LongRangeOption].
+             *
+             * @param value The value of this [LongRangeOption]
+             */
             public constructor(value: Long) : super(value.toString()) {
                 this.value = value
             }
 
-            internal companion object {
-                internal const val KEY_LONG_VALUE = "KEY_LONG_VALUE"
-            }
-
             internal constructor(
                 wireFormat: LongRangeOptionWireFormat
             ) : super(wireFormat.mId) {
@@ -928,14 +910,15 @@
             internal const val CUSTOM_VALUE_USER_STYLE_SETTING_ID = "CustomValue"
         }
 
+        /**
+         * Constructs a [CustomValueUserStyleSetting].
+         *
+         * @param affectsLayers Used by the style configuration UI. Describes which rendering layers
+         *     this style affects.
+         * @param defaultValue The default value.
+         */
         public constructor (
-            /**
-             * Used by the style configuration UI. Describes which rendering layers this style
-             * affects.
-             */
             affectsLayers: Collection<Layer>,
-
-            /** The default value. */
             defaultValue: String
         ) : super(
             CUSTOM_VALUE_USER_STYLE_SETTING_ID,
@@ -958,15 +941,23 @@
                 description,
                 icon,
                 getWireFormatOptionsList(),
-                affectsLayers.map { it.ordinal }
+                affectedLayers.map { it.ordinal }
             )
 
-        /** An application specific custom value.  */
+        /**
+         * An application specific custom value. NB the [CustomValueOption.customValue] is the
+         * same as the [CustomValueOption.id].
+         */
         public class CustomValueOption : Option {
-            /* The value for this option. */
+            /* The value for this option which is the same as the [id]. */
             public val customValue: String
                 get() = id
 
+            /**
+             * Constructs a [CustomValueOption].
+             *
+             * @param customValue The [id] and value of this [CustomValueOption].
+             */
             public constructor(customValue: String) : super(customValue)
 
             internal constructor(

wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/CurrentUserStyleRepositoryTest.kt

diff --git a/wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/UserStyleRepositoryTest.kt b/wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/CurrentUserStyleRepositoryTest.kt
similarity index 91%
rename from wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/UserStyleRepositoryTest.kt
rename to wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/CurrentUserStyleRepositoryTest.kt
index 3efa3ea..9c15227 100644
--- a/wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/UserStyleRepositoryTest.kt
+++ b/wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/CurrentUserStyleRepositoryTest.kt
@@ -26,7 +26,7 @@
 import org.mockito.Mockito
 
 @RunWith(StyleTestRunner::class)
-class UserStyleRepositoryTest {
+class CurrentUserStyleRepositoryTest {
     private val redStyleOption =
         ListUserStyleSetting.ListOption("red_style", "Red", icon = null)
 
@@ -79,12 +79,15 @@
             0.75
         )
 
-    private val mockListener1 = Mockito.mock(UserStyleRepository.UserStyleListener::class.java)
-    private val mockListener2 = Mockito.mock(UserStyleRepository.UserStyleListener::class.java)
-    private val mockListener3 = Mockito.mock(UserStyleRepository.UserStyleListener::class.java)
+    private val mockListener1 =
+        Mockito.mock(CurrentUserStyleRepository.UserStyleChangeListener::class.java)
+    private val mockListener2 =
+        Mockito.mock(CurrentUserStyleRepository.UserStyleChangeListener::class.java)
+    private val mockListener3 =
+        Mockito.mock(CurrentUserStyleRepository.UserStyleChangeListener::class.java)
 
     private val userStyleRepository =
-        UserStyleRepository(
+        CurrentUserStyleRepository(
             UserStyleSchema(
                 listOf(colorStyleSetting, watchHandStyleSetting, watchHandLengthStyleSetting)
             )
@@ -92,15 +95,15 @@
 
     @Test
     fun addUserStyleListener_firesImmediately() {
-        userStyleRepository.addUserStyleListener(mockListener1)
+        userStyleRepository.addUserStyleChangeListener(mockListener1)
         Mockito.verify(mockListener1).onUserStyleChanged(userStyleRepository.userStyle)
     }
 
     @Test
     fun assigning_userStyle_firesListeners() {
-        userStyleRepository.addUserStyleListener(mockListener1)
-        userStyleRepository.addUserStyleListener(mockListener2)
-        userStyleRepository.addUserStyleListener(mockListener3)
+        userStyleRepository.addUserStyleChangeListener(mockListener1)
+        userStyleRepository.addUserStyleChangeListener(mockListener2)
+        userStyleRepository.addUserStyleChangeListener(mockListener3)
 
         Mockito.verify(mockListener1).onUserStyleChanged(userStyleRepository.userStyle)
         Mockito.verify(mockListener2).onUserStyleChanged(userStyleRepository.userStyle)
@@ -230,7 +233,7 @@
             "default"
         )
 
-        val userStyleRepository = UserStyleRepository(
+        val userStyleRepository = CurrentUserStyleRepository(
             UserStyleSchema(
                 listOf(customStyleSetting)
             )
@@ -279,7 +282,7 @@
             "default"
         )
 
-        val userStyleRepository = UserStyleRepository(
+        val userStyleRepository = CurrentUserStyleRepository(
             UserStyleSchema(
                 listOf(customStyleSetting)
             )

wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/StyleParcelableTest.kt

diff --git a/wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/StyleParcelableTest.kt b/wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/StyleParcelableTest.kt
index 57b4cdc..e1f68b8 100644
--- a/wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/StyleParcelableTest.kt
+++ b/wear/wear-watchface-style/src/test/java/androidx/wear/watchface/style/StyleParcelableTest.kt
@@ -76,8 +76,8 @@
         assertThat(unparceled.displayName).isEqualTo("displayName")
         assertThat(unparceled.description).isEqualTo("description")
         assertThat(unparceled.icon!!.uri.toString()).isEqualTo("settingIcon")
-        assertThat(unparceled.affectsLayers.size).isEqualTo(1)
-        assertThat(unparceled.affectsLayers.first()).isEqualTo(Layer.BASE_LAYER)
+        assertThat(unparceled.affectedLayers.size).isEqualTo(1)
+        assertThat(unparceled.affectedLayers.first()).isEqualTo(Layer.BASE_LAYER)
         val optionArray =
             unparceled.options.filterIsInstance<ListUserStyleSetting.ListOption>()
                 .toTypedArray()
@@ -173,8 +173,8 @@
         assertThat(schema.userStyleSettings[0].displayName).isEqualTo("displayName1")
         assertThat(schema.userStyleSettings[0].description).isEqualTo("description1")
         assertThat(schema.userStyleSettings[0].icon!!.uri.toString()).isEqualTo("settingIcon1")
-        assertThat(schema.userStyleSettings[0].affectsLayers.size).isEqualTo(1)
-        assertThat(schema.userStyleSettings[0].affectsLayers.first()).isEqualTo(Layer.BASE_LAYER)
+        assertThat(schema.userStyleSettings[0].affectedLayers.size).isEqualTo(1)
+        assertThat(schema.userStyleSettings[0].affectedLayers.first()).isEqualTo(Layer.BASE_LAYER)
         val optionArray1 =
             schema.userStyleSettings[0].options.filterIsInstance<ListUserStyleSetting.ListOption>()
                 .toTypedArray()
@@ -191,8 +191,8 @@
         assertThat(schema.userStyleSettings[1].displayName).isEqualTo("displayName2")
         assertThat(schema.userStyleSettings[1].description).isEqualTo("description2")
         assertThat(schema.userStyleSettings[1].icon!!.uri.toString()).isEqualTo("settingIcon2")
-        assertThat(schema.userStyleSettings[1].affectsLayers.size).isEqualTo(1)
-        assertThat(schema.userStyleSettings[1].affectsLayers.first()).isEqualTo(Layer.TOP_LAYER)
+        assertThat(schema.userStyleSettings[1].affectedLayers.size).isEqualTo(1)
+        assertThat(schema.userStyleSettings[1].affectedLayers.first()).isEqualTo(Layer.TOP_LAYER)
         val optionArray2 =
             schema.userStyleSettings[1].options.filterIsInstance<ListUserStyleSetting.ListOption>()
                 .toTypedArray()
@@ -209,13 +209,13 @@
         assertThat(schema.userStyleSettings[2].displayName).isEqualTo("displayName3")
         assertThat(schema.userStyleSettings[2].description).isEqualTo("description3")
         assertThat(schema.userStyleSettings[2].icon).isEqualTo(null)
-        assertThat(schema.userStyleSettings[2].affectsLayers.size).isEqualTo(1)
-        assertThat(schema.userStyleSettings[2].affectsLayers.first()).isEqualTo(Layer.BASE_LAYER)
+        assertThat(schema.userStyleSettings[2].affectedLayers.size).isEqualTo(1)
+        assertThat(schema.userStyleSettings[2].affectedLayers.first()).isEqualTo(Layer.BASE_LAYER)
 
         assert(schema.userStyleSettings[3] is CustomValueUserStyleSetting)
         assertThat(schema.userStyleSettings[3].getDefaultOption().id).isEqualTo("default")
-        assertThat(schema.userStyleSettings[3].affectsLayers.size).isEqualTo(1)
-        assertThat(schema.userStyleSettings[3].affectsLayers.first()).isEqualTo(Layer.BASE_LAYER)
+        assertThat(schema.userStyleSettings[3].affectedLayers.size).isEqualTo(1)
+        assertThat(schema.userStyleSettings[3].affectedLayers.first()).isEqualTo(Layer.BASE_LAYER)
     }
 
     @Test

wear/wear-watchface/api/current.txt

diff --git a/wear/wear-watchface/api/current.txt b/wear/wear-watchface/api/current.txt
index 45f5082..a489434 100644
--- a/wear/wear-watchface/api/current.txt
+++ b/wear/wear-watchface/api/current.txt
@@ -1,42 +1,32 @@
 // Signature format: 4.0
 package androidx.wear.watchface {
 
-  public interface CanvasComplication {
-    method public androidx.wear.complications.data.ComplicationData? getData();
-    method public boolean isHighlighted();
-    method @UiThread public void onAttach(androidx.wear.watchface.Complication complication);
-    method @UiThread public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters, int complicationId);
-    method public void setData(androidx.wear.complications.data.ComplicationData? complicationData, boolean loadDrawablesAsynchronous);
-    method public void setIsHighlighted(boolean p);
-    property public abstract boolean isHighlighted;
-  }
-
-  public class CanvasComplicationDrawable implements androidx.wear.watchface.CanvasComplication {
-    ctor public CanvasComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable, androidx.wear.watchface.WatchState watchState);
+  public class CanvasComplicationDrawable {
+    ctor public CanvasComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable _drawable, androidx.wear.watchface.WatchState watchState);
     method public void drawOutline(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, @ColorInt int color);
-    method public androidx.wear.complications.data.ComplicationData? getData();
+    method public final androidx.wear.complications.data.ComplicationData? getData();
     method public final androidx.wear.watchface.complications.rendering.ComplicationDrawable getDrawable();
-    method @UiThread public boolean isHighlighted();
-    method public void onAttach(androidx.wear.watchface.Complication complication);
-    method public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters, int complicationId);
-    method public void setData(androidx.wear.complications.data.ComplicationData? complicationData, boolean loadDrawablesAsynchronous);
+    method @UiThread public final boolean isHighlighted();
+    method @CallSuper public void loadData(androidx.wear.complications.data.ComplicationData? complicationData, boolean loadDrawablesAsynchronous);
+    method @UiThread public final void onAttach(androidx.wear.watchface.Complication complication);
+    method @UiThread public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters, int complicationId);
     method public final void setDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable value);
-    method @UiThread public void setIsHighlighted(boolean value);
+    method @UiThread public final void setIsHighlighted(boolean value);
     property public final androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable;
-    property @UiThread public boolean isHighlighted;
+    property @UiThread public final boolean isHighlighted;
   }
 
   public final class Complication {
     method public android.graphics.Rect computeBounds(android.graphics.Rect screen);
-    method public static androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
-    method public static androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
+    method public static androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
+    method public static androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
     method public int getBoundsType();
     method @UiThread public androidx.wear.complications.ComplicationBounds getComplicationBounds();
     method public androidx.wear.watchface.ObservableWatchData<androidx.wear.complications.data.ComplicationData> getComplicationData();
     method public android.os.Bundle getConfigExtras();
     method @UiThread public androidx.wear.complications.DefaultComplicationProviderPolicy getDefaultProviderPolicy();
     method @UiThread public androidx.wear.complications.data.ComplicationType getDefaultProviderType();
-    method public androidx.wear.watchface.CanvasComplication getRenderer();
+    method public androidx.wear.watchface.CanvasComplicationDrawable getRenderer();
     method @UiThread public java.util.List<androidx.wear.complications.data.ComplicationType> getSupportedTypes();
     method public void invalidate();
     method public boolean isActiveAt(long dateTimeMillis);
@@ -53,7 +43,7 @@
     property @UiThread public final boolean enabled;
     property public final boolean fixedComplicationProvider;
     property public final boolean initiallyEnabled;
-    property public final androidx.wear.watchface.CanvasComplication renderer;
+    property public final androidx.wear.watchface.CanvasComplicationDrawable renderer;
     property @UiThread public final java.util.List<androidx.wear.complications.data.ComplicationType> supportedTypes;
     field public static final androidx.wear.watchface.Complication.Companion Companion;
   }
@@ -67,8 +57,8 @@
   }
 
   public static final class Complication.Companion {
-    method public androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
-    method public androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
+    method public androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
+    method public androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
   }
 
   public final class ComplicationOutlineRenderer {
@@ -82,9 +72,9 @@
   }
 
   public final class ComplicationsManager {
-    ctor public ComplicationsManager(java.util.Collection<androidx.wear.watchface.Complication> complicationCollection, androidx.wear.watchface.style.UserStyleRepository userStyleRepository);
+    ctor public ComplicationsManager(java.util.Collection<androidx.wear.watchface.Complication> complicationCollection, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
     method @UiThread public void addTapListener(androidx.wear.watchface.ComplicationsManager.TapCallback tapCallback);
-    method @UiThread public void bringAttentionToComplication(int complicationId);
+    method @UiThread public void displayPressedAnimation(int complicationId);
     method public operator androidx.wear.watchface.Complication? get(int id);
     method public androidx.wear.watchface.Complication? getBackgroundComplication();
     method public androidx.wear.watchface.Complication? getComplicationAt(@Px int x, @Px int y);
@@ -108,12 +98,12 @@
   }
 
   public final class GlesTextureComplication {
-    ctor public GlesTextureComplication(androidx.wear.watchface.CanvasComplication canvasComplication, @Px int textureWidth, @Px int textureHeight, int textureType, int id);
+    ctor public GlesTextureComplication(androidx.wear.watchface.CanvasComplicationDrawable canvasComplication, @Px int textureWidth, @Px int textureHeight, int textureType, int id);
     method public void bind();
-    method public androidx.wear.watchface.CanvasComplication getCanvasComplication();
+    method public androidx.wear.watchface.CanvasComplicationDrawable getCanvasComplication();
     method public int getId();
     method public void renderToTexture(android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters);
-    property public final androidx.wear.watchface.CanvasComplication canvasComplication;
+    property public final androidx.wear.watchface.CanvasComplicationDrawable canvasComplication;
     property public final int id;
   }
 
@@ -186,14 +176,14 @@
   }
 
   public abstract static class Renderer.CanvasRenderer extends androidx.wear.watchface.Renderer {
-    ctor public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
+    ctor public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
     method @UiThread public abstract void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar);
   }
 
   public abstract static class Renderer.GlesRenderer extends androidx.wear.watchface.Renderer {
-    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList);
-    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList);
-    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
+    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList);
+    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList);
+    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
     method public final android.opengl.EGLConfig getEglConfig();
     method public final android.opengl.EGLContext? getEglContext();
     method public final android.opengl.EGLDisplay? getEglDisplay();
@@ -213,18 +203,18 @@
   }
 
   public final class WatchFace {
-    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.Renderer renderer, optional androidx.wear.watchface.ComplicationsManager complicationsManager);
-    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.Renderer renderer);
+    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.Renderer renderer, optional androidx.wear.watchface.ComplicationsManager complicationsManager);
+    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.Renderer renderer);
+    method public androidx.wear.watchface.style.CurrentUserStyleRepository getCurrentUserStyleRepository();
     method public androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle getLegacyWatchFaceStyle();
     method public Long? getOverridePreviewReferenceTimeMillis();
-    method public androidx.wear.watchface.style.UserStyleRepository getUserStyleRepository();
     method public static boolean isLegacyWatchFaceOverlayStyleSupported();
     method public androidx.wear.watchface.WatchFace setLegacyWatchFaceStyle(androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle);
     method public androidx.wear.watchface.WatchFace setOverridePreviewReferenceTimeMillis(@IntRange(from=0) long previewReferenceTimeMillis);
     method public androidx.wear.watchface.WatchFace setTapListener(androidx.wear.watchface.WatchFace.TapListener? tapListener);
+    property public final androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository;
     property public final androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle;
     property public final Long? overridePreviewReferenceTimeMillis;
-    property public final androidx.wear.watchface.style.UserStyleRepository userStyleRepository;
     field public static final androidx.wear.watchface.WatchFace.Companion Companion;
   }
 
@@ -254,7 +244,7 @@
 
   public abstract class WatchFaceService extends android.service.wallpaper.WallpaperService {
     ctor public WatchFaceService();
-    method protected abstract suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace> p);
+    method @UiThread protected abstract suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace> p);
     method public final android.service.wallpaper.WallpaperService.Engine onCreateEngine();
   }
 
@@ -283,17 +273,3 @@
 
 }
 
-package androidx.wear.watchface.control {
-
-  @RequiresApi(27) public final class WatchFaceControlServiceFactory {
-    ctor public WatchFaceControlServiceFactory();
-    method public static androidx.wear.watchface.control.IWatchFaceControlService createWatchFaceControlService(android.content.Context context, android.os.Handler uiThreadHandler);
-    field public static final androidx.wear.watchface.control.WatchFaceControlServiceFactory.Companion Companion;
-  }
-
-  public static final class WatchFaceControlServiceFactory.Companion {
-    method public androidx.wear.watchface.control.IWatchFaceControlService createWatchFaceControlService(android.content.Context context, android.os.Handler uiThreadHandler);
-  }
-
-}
-

wear/wear-watchface/api/public_plus_experimental_current.txt

diff --git a/wear/wear-watchface/api/public_plus_experimental_current.txt b/wear/wear-watchface/api/public_plus_experimental_current.txt
index 45f5082..a489434 100644
--- a/wear/wear-watchface/api/public_plus_experimental_current.txt
+++ b/wear/wear-watchface/api/public_plus_experimental_current.txt
@@ -1,42 +1,32 @@
 // Signature format: 4.0
 package androidx.wear.watchface {
 
-  public interface CanvasComplication {
-    method public androidx.wear.complications.data.ComplicationData? getData();
-    method public boolean isHighlighted();
-    method @UiThread public void onAttach(androidx.wear.watchface.Complication complication);
-    method @UiThread public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters, int complicationId);
-    method public void setData(androidx.wear.complications.data.ComplicationData? complicationData, boolean loadDrawablesAsynchronous);
-    method public void setIsHighlighted(boolean p);
-    property public abstract boolean isHighlighted;
-  }
-
-  public class CanvasComplicationDrawable implements androidx.wear.watchface.CanvasComplication {
-    ctor public CanvasComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable, androidx.wear.watchface.WatchState watchState);
+  public class CanvasComplicationDrawable {
+    ctor public CanvasComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable _drawable, androidx.wear.watchface.WatchState watchState);
     method public void drawOutline(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, @ColorInt int color);
-    method public androidx.wear.complications.data.ComplicationData? getData();
+    method public final androidx.wear.complications.data.ComplicationData? getData();
     method public final androidx.wear.watchface.complications.rendering.ComplicationDrawable getDrawable();
-    method @UiThread public boolean isHighlighted();
-    method public void onAttach(androidx.wear.watchface.Complication complication);
-    method public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters, int complicationId);
-    method public void setData(androidx.wear.complications.data.ComplicationData? complicationData, boolean loadDrawablesAsynchronous);
+    method @UiThread public final boolean isHighlighted();
+    method @CallSuper public void loadData(androidx.wear.complications.data.ComplicationData? complicationData, boolean loadDrawablesAsynchronous);
+    method @UiThread public final void onAttach(androidx.wear.watchface.Complication complication);
+    method @UiThread public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters, int complicationId);
     method public final void setDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable value);
-    method @UiThread public void setIsHighlighted(boolean value);
+    method @UiThread public final void setIsHighlighted(boolean value);
     property public final androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable;
-    property @UiThread public boolean isHighlighted;
+    property @UiThread public final boolean isHighlighted;
   }
 
   public final class Complication {
     method public android.graphics.Rect computeBounds(android.graphics.Rect screen);
-    method public static androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
-    method public static androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
+    method public static androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
+    method public static androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
     method public int getBoundsType();
     method @UiThread public androidx.wear.complications.ComplicationBounds getComplicationBounds();
     method public androidx.wear.watchface.ObservableWatchData<androidx.wear.complications.data.ComplicationData> getComplicationData();
     method public android.os.Bundle getConfigExtras();
     method @UiThread public androidx.wear.complications.DefaultComplicationProviderPolicy getDefaultProviderPolicy();
     method @UiThread public androidx.wear.complications.data.ComplicationType getDefaultProviderType();
-    method public androidx.wear.watchface.CanvasComplication getRenderer();
+    method public androidx.wear.watchface.CanvasComplicationDrawable getRenderer();
     method @UiThread public java.util.List<androidx.wear.complications.data.ComplicationType> getSupportedTypes();
     method public void invalidate();
     method public boolean isActiveAt(long dateTimeMillis);
@@ -53,7 +43,7 @@
     property @UiThread public final boolean enabled;
     property public final boolean fixedComplicationProvider;
     property public final boolean initiallyEnabled;
-    property public final androidx.wear.watchface.CanvasComplication renderer;
+    property public final androidx.wear.watchface.CanvasComplicationDrawable renderer;
     property @UiThread public final java.util.List<androidx.wear.complications.data.ComplicationType> supportedTypes;
     field public static final androidx.wear.watchface.Complication.Companion Companion;
   }
@@ -67,8 +57,8 @@
   }
 
   public static final class Complication.Companion {
-    method public androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
-    method public androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
+    method public androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
+    method public androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
   }
 
   public final class ComplicationOutlineRenderer {
@@ -82,9 +72,9 @@
   }
 
   public final class ComplicationsManager {
-    ctor public ComplicationsManager(java.util.Collection<androidx.wear.watchface.Complication> complicationCollection, androidx.wear.watchface.style.UserStyleRepository userStyleRepository);
+    ctor public ComplicationsManager(java.util.Collection<androidx.wear.watchface.Complication> complicationCollection, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
     method @UiThread public void addTapListener(androidx.wear.watchface.ComplicationsManager.TapCallback tapCallback);
-    method @UiThread public void bringAttentionToComplication(int complicationId);
+    method @UiThread public void displayPressedAnimation(int complicationId);
     method public operator androidx.wear.watchface.Complication? get(int id);
     method public androidx.wear.watchface.Complication? getBackgroundComplication();
     method public androidx.wear.watchface.Complication? getComplicationAt(@Px int x, @Px int y);
@@ -108,12 +98,12 @@
   }
 
   public final class GlesTextureComplication {
-    ctor public GlesTextureComplication(androidx.wear.watchface.CanvasComplication canvasComplication, @Px int textureWidth, @Px int textureHeight, int textureType, int id);
+    ctor public GlesTextureComplication(androidx.wear.watchface.CanvasComplicationDrawable canvasComplication, @Px int textureWidth, @Px int textureHeight, int textureType, int id);
     method public void bind();
-    method public androidx.wear.watchface.CanvasComplication getCanvasComplication();
+    method public androidx.wear.watchface.CanvasComplicationDrawable getCanvasComplication();
     method public int getId();
     method public void renderToTexture(android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters);
-    property public final androidx.wear.watchface.CanvasComplication canvasComplication;
+    property public final androidx.wear.watchface.CanvasComplicationDrawable canvasComplication;
     property public final int id;
   }
 
@@ -186,14 +176,14 @@
   }
 
   public abstract static class Renderer.CanvasRenderer extends androidx.wear.watchface.Renderer {
-    ctor public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
+    ctor public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
     method @UiThread public abstract void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar);
   }
 
   public abstract static class Renderer.GlesRenderer extends androidx.wear.watchface.Renderer {
-    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList);
-    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList);
-    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
+    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList);
+    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList);
+    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
     method public final android.opengl.EGLConfig getEglConfig();
     method public final android.opengl.EGLContext? getEglContext();
     method public final android.opengl.EGLDisplay? getEglDisplay();
@@ -213,18 +203,18 @@
   }
 
   public final class WatchFace {
-    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.Renderer renderer, optional androidx.wear.watchface.ComplicationsManager complicationsManager);
-    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.Renderer renderer);
+    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.Renderer renderer, optional androidx.wear.watchface.ComplicationsManager complicationsManager);
+    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.Renderer renderer);
+    method public androidx.wear.watchface.style.CurrentUserStyleRepository getCurrentUserStyleRepository();
     method public androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle getLegacyWatchFaceStyle();
     method public Long? getOverridePreviewReferenceTimeMillis();
-    method public androidx.wear.watchface.style.UserStyleRepository getUserStyleRepository();
     method public static boolean isLegacyWatchFaceOverlayStyleSupported();
     method public androidx.wear.watchface.WatchFace setLegacyWatchFaceStyle(androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle);
     method public androidx.wear.watchface.WatchFace setOverridePreviewReferenceTimeMillis(@IntRange(from=0) long previewReferenceTimeMillis);
     method public androidx.wear.watchface.WatchFace setTapListener(androidx.wear.watchface.WatchFace.TapListener? tapListener);
+    property public final androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository;
     property public final androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle;
     property public final Long? overridePreviewReferenceTimeMillis;
-    property public final androidx.wear.watchface.style.UserStyleRepository userStyleRepository;
     field public static final androidx.wear.watchface.WatchFace.Companion Companion;
   }
 
@@ -254,7 +244,7 @@
 
   public abstract class WatchFaceService extends android.service.wallpaper.WallpaperService {
     ctor public WatchFaceService();
-    method protected abstract suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace> p);
+    method @UiThread protected abstract suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace> p);
     method public final android.service.wallpaper.WallpaperService.Engine onCreateEngine();
   }
 
@@ -283,17 +273,3 @@
 
 }
 
-package androidx.wear.watchface.control {
-
-  @RequiresApi(27) public final class WatchFaceControlServiceFactory {
-    ctor public WatchFaceControlServiceFactory();
-    method public static androidx.wear.watchface.control.IWatchFaceControlService createWatchFaceControlService(android.content.Context context, android.os.Handler uiThreadHandler);
-    field public static final androidx.wear.watchface.control.WatchFaceControlServiceFactory.Companion Companion;
-  }
-
-  public static final class WatchFaceControlServiceFactory.Companion {
-    method public androidx.wear.watchface.control.IWatchFaceControlService createWatchFaceControlService(android.content.Context context, android.os.Handler uiThreadHandler);
-  }
-
-}
-

wear/wear-watchface/api/restricted_current.txt

diff --git a/wear/wear-watchface/api/restricted_current.txt b/wear/wear-watchface/api/restricted_current.txt
index 5455d63..33f3560 100644
--- a/wear/wear-watchface/api/restricted_current.txt
+++ b/wear/wear-watchface/api/restricted_current.txt
@@ -1,42 +1,32 @@
 // Signature format: 4.0
 package androidx.wear.watchface {
 
-  public interface CanvasComplication {
-    method public androidx.wear.complications.data.ComplicationData? getData();
-    method public boolean isHighlighted();
-    method @UiThread public void onAttach(androidx.wear.watchface.Complication complication);
-    method @UiThread public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters, int complicationId);
-    method public void setData(androidx.wear.complications.data.ComplicationData? complicationData, boolean loadDrawablesAsynchronous);
-    method public void setIsHighlighted(boolean p);
-    property public abstract boolean isHighlighted;
-  }
-
-  public class CanvasComplicationDrawable implements androidx.wear.watchface.CanvasComplication {
-    ctor public CanvasComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable, androidx.wear.watchface.WatchState watchState);
+  public class CanvasComplicationDrawable {
+    ctor public CanvasComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable _drawable, androidx.wear.watchface.WatchState watchState);
     method public void drawOutline(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, @ColorInt int color);
-    method public androidx.wear.complications.data.ComplicationData? getData();
+    method public final androidx.wear.complications.data.ComplicationData? getData();
     method public final androidx.wear.watchface.complications.rendering.ComplicationDrawable getDrawable();
-    method @UiThread public boolean isHighlighted();
-    method public void onAttach(androidx.wear.watchface.Complication complication);
-    method public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters, int complicationId);
-    method public void setData(androidx.wear.complications.data.ComplicationData? complicationData, boolean loadDrawablesAsynchronous);
+    method @UiThread public final boolean isHighlighted();
+    method @CallSuper public void loadData(androidx.wear.complications.data.ComplicationData? complicationData, boolean loadDrawablesAsynchronous);
+    method @UiThread public final void onAttach(androidx.wear.watchface.Complication complication);
+    method @UiThread public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters, int complicationId);
     method public final void setDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable value);
-    method @UiThread public void setIsHighlighted(boolean value);
+    method @UiThread public final void setIsHighlighted(boolean value);
     property public final androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable;
-    property @UiThread public boolean isHighlighted;
+    property @UiThread public final boolean isHighlighted;
   }
 
   public final class Complication {
     method public android.graphics.Rect computeBounds(android.graphics.Rect screen);
-    method public static androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
-    method public static androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
+    method public static androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
+    method public static androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
     method public int getBoundsType();
     method @UiThread public androidx.wear.complications.ComplicationBounds getComplicationBounds();
     method public androidx.wear.watchface.ObservableWatchData<androidx.wear.complications.data.ComplicationData> getComplicationData();
     method public android.os.Bundle getConfigExtras();
     method @UiThread public androidx.wear.complications.DefaultComplicationProviderPolicy getDefaultProviderPolicy();
     method @UiThread public androidx.wear.complications.data.ComplicationType getDefaultProviderType();
-    method public androidx.wear.watchface.CanvasComplication getRenderer();
+    method public androidx.wear.watchface.CanvasComplicationDrawable getRenderer();
     method @UiThread public java.util.List<androidx.wear.complications.data.ComplicationType> getSupportedTypes();
     method public void invalidate();
     method public boolean isActiveAt(long dateTimeMillis);
@@ -53,7 +43,7 @@
     property @UiThread public final boolean enabled;
     property public final boolean fixedComplicationProvider;
     property public final boolean initiallyEnabled;
-    property public final androidx.wear.watchface.CanvasComplication renderer;
+    property public final androidx.wear.watchface.CanvasComplicationDrawable renderer;
     property @UiThread public final java.util.List<androidx.wear.complications.data.ComplicationType> supportedTypes;
     field public static final androidx.wear.watchface.Complication.Companion Companion;
   }
@@ -67,8 +57,8 @@
   }
 
   public static final class Complication.Companion {
-    method public androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
-    method public androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplication renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
+    method public androidx.wear.watchface.Complication.Builder createBackgroundComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy);
+    method public androidx.wear.watchface.Complication.Builder createRoundRectComplicationBuilder(int id, androidx.wear.watchface.CanvasComplicationDrawable renderer, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.ComplicationBounds bounds);
   }
 
   public final class ComplicationOutlineRenderer {
@@ -82,9 +72,9 @@
   }
 
   public final class ComplicationsManager {
-    ctor public ComplicationsManager(java.util.Collection<androidx.wear.watchface.Complication> complicationCollection, androidx.wear.watchface.style.UserStyleRepository userStyleRepository);
+    ctor public ComplicationsManager(java.util.Collection<androidx.wear.watchface.Complication> complicationCollection, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
     method @UiThread public void addTapListener(androidx.wear.watchface.ComplicationsManager.TapCallback tapCallback);
-    method @UiThread public void bringAttentionToComplication(int complicationId);
+    method @UiThread public void displayPressedAnimation(int complicationId);
     method public operator androidx.wear.watchface.Complication? get(int id);
     method public androidx.wear.watchface.Complication? getBackgroundComplication();
     method public androidx.wear.watchface.Complication? getComplicationAt(@Px int x, @Px int y);
@@ -108,12 +98,12 @@
   }
 
   public final class GlesTextureComplication {
-    ctor public GlesTextureComplication(androidx.wear.watchface.CanvasComplication canvasComplication, @Px int textureWidth, @Px int textureHeight, int textureType, int id);
+    ctor public GlesTextureComplication(androidx.wear.watchface.CanvasComplicationDrawable canvasComplication, @Px int textureWidth, @Px int textureHeight, int textureType, int id);
     method public void bind();
-    method public androidx.wear.watchface.CanvasComplication getCanvasComplication();
+    method public androidx.wear.watchface.CanvasComplicationDrawable getCanvasComplication();
     method public int getId();
     method public void renderToTexture(android.icu.util.Calendar calendar, androidx.wear.watchface.RenderParameters renderParameters);
-    property public final androidx.wear.watchface.CanvasComplication canvasComplication;
+    property public final androidx.wear.watchface.CanvasComplicationDrawable canvasComplication;
     property public final int id;
   }
 
@@ -216,14 +206,14 @@
   }
 
   public abstract static class Renderer.CanvasRenderer extends androidx.wear.watchface.Renderer {
-    ctor public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
+    ctor public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
     method @UiThread public abstract void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, android.icu.util.Calendar calendar);
   }
 
   public abstract static class Renderer.GlesRenderer extends androidx.wear.watchface.Renderer {
-    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList);
-    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList);
-    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
+    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList);
+    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList);
+    ctor public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0, to=60000) long interactiveDrawModeUpdateDelayMillis);
     method public final android.opengl.EGLConfig getEglConfig();
     method public final android.opengl.EGLContext? getEglContext();
     method public final android.opengl.EGLDisplay? getEglDisplay();
@@ -243,21 +233,21 @@
   }
 
   public final class WatchFace {
-    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.Renderer renderer, optional androidx.wear.watchface.ComplicationsManager complicationsManager);
-    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.UserStyleRepository userStyleRepository, androidx.wear.watchface.Renderer renderer);
+    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.Renderer renderer, optional androidx.wear.watchface.ComplicationsManager complicationsManager);
+    ctor public WatchFace(int watchFaceType, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.Renderer renderer);
+    method public androidx.wear.watchface.style.CurrentUserStyleRepository getCurrentUserStyleRepository();
     method public androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle getLegacyWatchFaceStyle();
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @UiThread public static kotlinx.coroutines.CompletableDeferred<androidx.wear.watchface.WatchFace.EditorDelegate> getOrCreateEditorDelegate(android.content.ComponentName componentName);
     method public Long? getOverridePreviewReferenceTimeMillis();
-    method public androidx.wear.watchface.style.UserStyleRepository getUserStyleRepository();
     method public static boolean isLegacyWatchFaceOverlayStyleSupported();
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @UiThread public static void registerEditorDelegate(android.content.ComponentName componentName, androidx.wear.watchface.WatchFace.EditorDelegate editorDelegate);
     method public androidx.wear.watchface.WatchFace setLegacyWatchFaceStyle(androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle);
     method public androidx.wear.watchface.WatchFace setOverridePreviewReferenceTimeMillis(@IntRange(from=0) long previewReferenceTimeMillis);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.wear.watchface.WatchFace setSystemTimeProvider(androidx.wear.watchface.WatchFace.SystemTimeProvider systemTimeProvider);
     method public androidx.wear.watchface.WatchFace setTapListener(androidx.wear.watchface.WatchFace.TapListener? tapListener);
+    property public final androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository;
     property public final androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle;
     property public final Long? overridePreviewReferenceTimeMillis;
-    property public final androidx.wear.watchface.style.UserStyleRepository userStyleRepository;
     field public static final androidx.wear.watchface.WatchFace.Companion Companion;
   }
 
@@ -274,8 +264,8 @@
     method public androidx.wear.watchface.style.UserStyle getUserStyle();
     method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
     method public void onDestroy();
+    method public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     method public void setUserStyle(androidx.wear.watchface.style.UserStyle p);
-    method public android.graphics.Bitmap takeScreenshot(androidx.wear.watchface.RenderParameters renderParameters, long calendarTimeMillis, java.util.Map<java.lang.Integer,? extends androidx.wear.complications.data.ComplicationData>? idToComplicationData);
     property public abstract androidx.wear.watchface.ComplicationsManager complicationsManager;
     property public abstract long previewReferenceTimeMillis;
     property public abstract android.graphics.Rect screenBounds;
@@ -320,7 +310,7 @@
 
   public abstract class WatchFaceService extends android.service.wallpaper.WallpaperService {
     ctor public WatchFaceService();
-    method protected abstract suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace> p);
+    method @UiThread protected abstract suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace> p);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.view.SurfaceHolder? getWallpaperSurfaceHolderOverride();
     method public final android.service.wallpaper.WallpaperService.Engine onCreateEngine();
   }
@@ -358,8 +348,7 @@
     field public static final String ACTION_WATCHFACE_CONTROL_SERVICE = "com.google.android.wearable.action.WATCH_FACE_CONTROL";
   }
 
-  @RequiresApi(27) public final class WatchFaceControlServiceFactory {
-    ctor public WatchFaceControlServiceFactory();
+  @RequiresApi(27) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class WatchFaceControlServiceFactory {
     method public static androidx.wear.watchface.control.IWatchFaceControlService createWatchFaceControlService(android.content.Context context, android.os.Handler uiThreadHandler);
     field public static final androidx.wear.watchface.control.WatchFaceControlServiceFactory.Companion Companion;
   }

wear/wear-watchface/guava/src/androidTest/java/AsyncListenableWatchFaceServiceTest.kt

diff --git a/wear/wear-watchface/guava/src/androidTest/java/AsyncListenableWatchFaceServiceTest.kt b/wear/wear-watchface/guava/src/androidTest/java/AsyncListenableWatchFaceServiceTest.kt
index 1736917..3b2d55e 100644
--- a/wear/wear-watchface/guava/src/androidTest/java/AsyncListenableWatchFaceServiceTest.kt
+++ b/wear/wear-watchface/guava/src/androidTest/java/AsyncListenableWatchFaceServiceTest.kt
@@ -27,7 +27,7 @@
 import androidx.wear.watchface.WatchFace
 import androidx.wear.watchface.WatchFaceType
 import androidx.wear.watchface.WatchState
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import com.google.common.truth.Truth.assertThat
 import com.google.common.util.concurrent.ListenableFuture
@@ -41,10 +41,10 @@
 private class FakeRenderer(
     surfaceHolder: SurfaceHolder,
     watchState: WatchState,
-    userStyleRepository: UserStyleRepository
+    currentUserStyleRepository: CurrentUserStyleRepository
 ) : Renderer.CanvasRenderer(
     surfaceHolder,
-    userStyleRepository,
+    currentUserStyleRepository,
     watchState,
     CanvasType.SOFTWARE,
     16
@@ -60,7 +60,7 @@
         watchState: WatchState
     ): ListenableFuture<WatchFace> {
         val future = SettableFuture.create<WatchFace>()
-        val userStyleRepository = UserStyleRepository(
+        val userStyleRepository = CurrentUserStyleRepository(
             UserStyleSchema(emptyList())
         )
         // Post a task to resolve the future.

wear/wear-watchface/guava/src/test/java/androidx/wear/watchface/ListenableWatchFaceServiceTest.kt

diff --git a/wear/wear-watchface/guava/src/test/java/androidx/wear/watchface/ListenableWatchFaceServiceTest.kt b/wear/wear-watchface/guava/src/test/java/androidx/wear/watchface/ListenableWatchFaceServiceTest.kt
index 272465f..489aaac 100644
--- a/wear/wear-watchface/guava/src/test/java/androidx/wear/watchface/ListenableWatchFaceServiceTest.kt
+++ b/wear/wear-watchface/guava/src/test/java/androidx/wear/watchface/ListenableWatchFaceServiceTest.kt
@@ -20,7 +20,7 @@
 import android.graphics.Rect
 import android.icu.util.Calendar
 import android.view.SurfaceHolder
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import com.google.common.truth.Truth.assertThat
 import com.google.common.util.concurrent.Futures
@@ -42,7 +42,7 @@
         watchState: WatchState
     ): ListenableFuture<WatchFace> {
         val userStyleRepository =
-            UserStyleRepository(UserStyleSchema(emptyList()))
+            CurrentUserStyleRepository(UserStyleSchema(emptyList()))
         return Futures.immediateFuture(
             WatchFace(
                 WatchFaceType.DIGITAL, userStyleRepository,

wear/wear-watchface/samples/minimal/src/main/java/androidx/wear/watchface/samples/minimal/WatchFaceRenderer.java

diff --git a/wear/wear-watchface/samples/minimal/src/main/java/androidx/wear/watchface/samples/minimal/WatchFaceRenderer.java b/wear/wear-watchface/samples/minimal/src/main/java/androidx/wear/watchface/samples/minimal/WatchFaceRenderer.java
index 5271dda..2becac8 100644
--- a/wear/wear-watchface/samples/minimal/src/main/java/androidx/wear/watchface/samples/minimal/WatchFaceRenderer.java
+++ b/wear/wear-watchface/samples/minimal/src/main/java/androidx/wear/watchface/samples/minimal/WatchFaceRenderer.java
@@ -27,7 +27,7 @@
 import androidx.wear.watchface.CanvasType;
 import androidx.wear.watchface.Renderer;
 import androidx.wear.watchface.WatchState;
-import androidx.wear.watchface.style.UserStyleRepository;
+import androidx.wear.watchface.style.CurrentUserStyleRepository;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -47,9 +47,9 @@
 
     public WatchFaceRenderer(
             @NotNull SurfaceHolder surfaceHolder,
-            @NotNull UserStyleRepository userStyleRepository,
+            @NotNull CurrentUserStyleRepository currentUserStyleRepository,
             @NotNull WatchState watchState) {
-        super(surfaceHolder, userStyleRepository, watchState, CanvasType.HARDWARE,
+        super(surfaceHolder, currentUserStyleRepository, watchState, CanvasType.HARDWARE,
                 UPDATE_DELAY_MILLIS);
         mPaint = new Paint();
         mPaint.setTextAlign(Align.CENTER);

wear/wear-watchface/samples/minimal/src/main/java/androidx/wear/watchface/samples/minimal/WatchFaceService.java

diff --git a/wear/wear-watchface/samples/minimal/src/main/java/androidx/wear/watchface/samples/minimal/WatchFaceService.java b/wear/wear-watchface/samples/minimal/src/main/java/androidx/wear/watchface/samples/minimal/WatchFaceService.java
index 5ceede1..5f00cde 100644
--- a/wear/wear-watchface/samples/minimal/src/main/java/androidx/wear/watchface/samples/minimal/WatchFaceService.java
+++ b/wear/wear-watchface/samples/minimal/src/main/java/androidx/wear/watchface/samples/minimal/WatchFaceService.java
@@ -25,7 +25,7 @@
 import androidx.wear.watchface.WatchFace;
 import androidx.wear.watchface.WatchFaceType;
 import androidx.wear.watchface.WatchState;
-import androidx.wear.watchface.style.UserStyleRepository;
+import androidx.wear.watchface.style.CurrentUserStyleRepository;
 import androidx.wear.watchface.style.UserStyleSchema;
 import androidx.wear.watchface.style.UserStyleSetting;
 
@@ -43,15 +43,16 @@
     @Override
     protected ListenableFuture<WatchFace> createWatchFaceFuture(
             @NotNull SurfaceHolder surfaceHolder, @NotNull WatchState watchState) {
-        UserStyleRepository userStyleRepository =
-                new UserStyleRepository(
+        CurrentUserStyleRepository currentUserStyleRepository =
+                new CurrentUserStyleRepository(
                         new UserStyleSchema(Collections.<UserStyleSetting>emptyList()));
         ComplicationsManager complicationManager =
                 new ComplicationsManager(Collections.<Complication>emptyList(),
-                        userStyleRepository);
-        Renderer renderer = new WatchFaceRenderer(surfaceHolder, userStyleRepository, watchState);
+                        currentUserStyleRepository);
+        Renderer renderer =
+                new WatchFaceRenderer(surfaceHolder, currentUserStyleRepository, watchState);
         return Futures.immediateFuture(
-                new WatchFace(WatchFaceType.DIGITAL, userStyleRepository, renderer,
+                new WatchFace(WatchFaceType.DIGITAL, currentUserStyleRepository, renderer,
                         complicationManager));
     }
 }

wear/wear-watchface/samples/src/main/AndroidManifest.xml

diff --git a/wear/wear-watchface/samples/src/main/AndroidManifest.xml b/wear/wear-watchface/samples/src/main/AndroidManifest.xml
index 202b8d4..7112ec9 100644
--- a/wear/wear-watchface/samples/src/main/AndroidManifest.xml
+++ b/wear/wear-watchface/samples/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
 
     <!-- Required for complications to receive complication data and open the provider chooser. -->
     <uses-feature android:name="android.hardware.type.watch" />
+    <meta-data android:name="com.google.android.wearable.standalone" android:value="true" />
 
     <uses-permission android:name="com.google.android.permission.PROVIDE_BACKGROUND"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
@@ -44,21 +45,12 @@
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="com.google.android.wearable.libraries.steampack.watchface.MockTime" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-
-            <meta-data
-                android:name="com.google.android.wearable.standalone"
-                android:value="true" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/watch_preview" />
+                android:resource="@drawable/analog_preview" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/watch_preview" />
+                android:resource="@drawable/analog_preview" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.wearableConfigurationAction"
                 android:value="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR"/>
@@ -78,21 +70,12 @@
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="com.google.android.wearable.libraries.steampack.watchface.MockTime" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-
-            <meta-data
-                android:name="com.google.android.wearable.standalone"
-                android:value="true" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/watch_preview" />
+                android:resource="@drawable/digital_preview" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/watch_preview" />
+                android:resource="@drawable/digital_preview" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.wearableConfigurationAction"
                 android:value="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR"/>
@@ -112,21 +95,12 @@
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="com.google.android.wearable.libraries.steampack.watchface.MockTime" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-
-            <meta-data
-                android:name="com.google.android.wearable.standalone"
-                android:value="true" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/watch_preview" />
+                android:resource="@drawable/gl_preview" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/watch_preview" />
+                android:resource="@drawable/gl_preview" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.wearableConfigurationAction"
                 android:value="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR"/>
@@ -146,21 +120,12 @@
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="com.google.android.wearable.libraries.steampack.watchface.MockTime" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-
-            <meta-data
-                android:name="com.google.android.wearable.standalone"
-                android:value="true" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/watch_preview" />
+                android:resource="@drawable/gl_background_preview" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/watch_preview" />
+                android:resource="@drawable/gl_background_preview" />
             <meta-data
                 android:name="com.google.android.wearable.watchface.wearableConfigurationAction"
                 android:value="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR"/>

wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleCanvasAnalogWatchFaceService.kt

diff --git a/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleCanvasAnalogWatchFaceService.kt b/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleCanvasAnalogWatchFaceService.kt
index 9ffabd80..9ebf7c3 100644
--- a/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleCanvasAnalogWatchFaceService.kt
+++ b/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleCanvasAnalogWatchFaceService.kt
@@ -43,7 +43,7 @@
 import androidx.wear.watchface.WatchState
 import androidx.wear.watchface.style.Layer
 import androidx.wear.watchface.style.UserStyle
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting
 import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting
@@ -207,7 +207,7 @@
         ),
         listOf(Layer.COMPLICATIONS)
     )
-    val userStyleRepository = UserStyleRepository(
+    val userStyleRepository = CurrentUserStyleRepository(
         UserStyleSchema(
             listOf(
                 colorStyleSetting,
@@ -272,7 +272,7 @@
     surfaceHolder: SurfaceHolder,
     private val context: Context,
     private var watchFaceColorStyle: WatchFaceColorStyle,
-    userStyleRepository: UserStyleRepository,
+    currentUserStyleRepository: CurrentUserStyleRepository,
     watchState: WatchState,
     private val colorStyleSetting: ListUserStyleSetting,
     private val drawPipsStyleSetting: BooleanUserStyleSetting,
@@ -280,7 +280,7 @@
     private val complicationsManager: ComplicationsManager
 ) : Renderer.CanvasRenderer(
     surfaceHolder,
-    userStyleRepository,
+    currentUserStyleRepository,
     watchState,
     CanvasType.HARDWARE,
     FRAME_PERIOD_MS
@@ -315,8 +315,8 @@
     private var watchHandScale = 1.0f
 
     init {
-        userStyleRepository.addUserStyleListener(
-            object : UserStyleRepository.UserStyleListener {
+        currentUserStyleRepository.addUserStyleChangeListener(
+            object : CurrentUserStyleRepository.UserStyleChangeListener {
                 @SuppressLint("SyntheticAccessor")
                 override fun onUserStyleChanged(userStyle: UserStyle) {
                     watchFaceColorStyle =
@@ -329,8 +329,7 @@
                     // the styles are defined in XML so we need to replace the complication's
                     // drawables.
                     for ((_, complication) in complicationsManager.complications) {
-                        (complication.renderer as CanvasComplicationDrawable).drawable =
-                            watchFaceColorStyle.getDrawable(context)!!
+                        complication.renderer.drawable = watchFaceColorStyle.getDrawable(context)!!
                     }
 
                     val drawPipsOption = userStyle[drawPipsStyleSetting]?.toBooleanOption()!!

wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleCanvasDigitalWatchFaceService.kt

diff --git a/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleCanvasDigitalWatchFaceService.kt b/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleCanvasDigitalWatchFaceService.kt
index 21f17bb..bc3c7fd 100644
--- a/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleCanvasDigitalWatchFaceService.kt
+++ b/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleCanvasDigitalWatchFaceService.kt
@@ -56,7 +56,7 @@
 import androidx.wear.watchface.WatchState
 import androidx.wear.watchface.style.Layer
 import androidx.wear.watchface.style.UserStyle
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import androidx.wear.watchface.style.UserStyleSetting
 import kotlin.math.max
@@ -494,7 +494,7 @@
             ),
             listOf(Layer.BASE_LAYER, Layer.COMPLICATIONS, Layer.TOP_LAYER)
         )
-        val userStyleRepository = UserStyleRepository(
+        val userStyleRepository = CurrentUserStyleRepository(
             UserStyleSchema(listOf(colorStyleSetting))
         )
         val leftComplication = Complication.createRoundRectComplicationBuilder(
@@ -622,7 +622,7 @@
             renderer.oldBounds.set(0, 0, 0, 0)
         }
         return WatchFace(
-            WatchFaceType.ANALOG,
+            WatchFaceType.DIGITAL,
             userStyleRepository,
             renderer,
             complicationsManager
@@ -634,13 +634,13 @@
     surfaceHolder: SurfaceHolder,
     private val context: Context,
     private var watchFaceColorStyle: WatchFaceColorStyle,
-    userStyleRepository: UserStyleRepository,
+    currentUserStyleRepository: CurrentUserStyleRepository,
     watchState: WatchState,
     private val colorStyleSetting: UserStyleSetting.ListUserStyleSetting,
     private val complicationsManager: ComplicationsManager
 ) : Renderer.CanvasRenderer(
     surfaceHolder,
-    userStyleRepository,
+    currentUserStyleRepository,
     watchState,
     CanvasType.HARDWARE,
     INTERACTIVE_UPDATE_RATE_MS
@@ -649,6 +649,7 @@
 
     private fun getBaseDigitPaint() = Paint().apply {
         typeface = Typeface.create(DIGITAL_TYPE_FACE, Typeface.NORMAL)
+        isAntiAlias = true
     }
 
     private val digitTextHoursPaint = getBaseDigitPaint()
@@ -746,8 +747,8 @@
 
     init {
         // Listen for style changes.
-        userStyleRepository.addUserStyleListener(
-            object : UserStyleRepository.UserStyleListener {
+        currentUserStyleRepository.addUserStyleChangeListener(
+            object : CurrentUserStyleRepository.UserStyleChangeListener {
                 @SuppressLint("SyntheticAccessor")
                 override fun onUserStyleChanged(userStyle: UserStyle) {
                     watchFaceColorStyle =
@@ -760,8 +761,7 @@
                     // the styles are defined in XML so we need to replace the complication's
                     // drawables.
                     for ((_, complication) in complicationsManager.complications) {
-                        (complication.renderer as CanvasComplicationDrawable).drawable =
-                            watchFaceColorStyle.getDrawable(context)!!
+                        complication.renderer.drawable = watchFaceColorStyle.getDrawable(context)!!
                     }
 
                     clearDigitBitmapCache()
@@ -778,6 +778,10 @@
 
             // Trigger recomputation of bounds.
             oldBounds.set(0, 0, 0, 0)
+            val antiAlias = !(it && watchState.hasLowBitAmbient)
+            digitTextHoursPaint.setAntiAlias(antiAlias)
+            digitTextMinutesPaint.setAntiAlias(antiAlias)
+            digitTextSecondsPaint.setAntiAlias(antiAlias)
         }
     }
 

wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleOpenGLBackgroundInitWatchFaceService.kt

diff --git a/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleOpenGLBackgroundInitWatchFaceService.kt b/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleOpenGLBackgroundInitWatchFaceService.kt
index c6e47e1..d229d3b 100644
--- a/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleOpenGLBackgroundInitWatchFaceService.kt
+++ b/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleOpenGLBackgroundInitWatchFaceService.kt
@@ -30,7 +30,7 @@
 import androidx.wear.watchface.WatchFaceService
 import androidx.wear.watchface.WatchFaceType
 import androidx.wear.watchface.WatchState
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.android.asCoroutineDispatcher
@@ -56,7 +56,7 @@
         surfaceHolder: SurfaceHolder,
         watchState: WatchState
     ): WatchFace {
-        val styleRepository = UserStyleRepository(UserStyleSchema(emptyList()))
+        val styleRepository = CurrentUserStyleRepository(UserStyleSchema(emptyList()))
 
         // Create the renderer on the main thread. It's EGLContext is bound to this thread.
         val renderer = MainThreadRenderer(surfaceHolder, styleRepository, watchState)
@@ -154,9 +154,9 @@
 
 internal class MainThreadRenderer(
     surfaceHolder: SurfaceHolder,
-    userStyleRepository: UserStyleRepository,
+    currentUserStyleRepository: CurrentUserStyleRepository,
     watchState: WatchState
-) : Renderer.GlesRenderer(surfaceHolder, userStyleRepository, watchState, FRAME_PERIOD_MS) {
+) : Renderer.GlesRenderer(surfaceHolder, currentUserStyleRepository, watchState, FRAME_PERIOD_MS) {
 
     internal var watchBodyTexture: Int = -1
     internal var watchHandTexture: Int = -1

wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleOpenGLWatchFaceService.kt

diff --git a/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleOpenGLWatchFaceService.kt b/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleOpenGLWatchFaceService.kt
index 21a2e63..f5d2c34 100644
--- a/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleOpenGLWatchFaceService.kt
+++ b/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/ExampleOpenGLWatchFaceService.kt
@@ -43,7 +43,7 @@
 import androidx.wear.watchface.WatchFaceType
 import androidx.wear.watchface.WatchState
 import androidx.wear.watchface.style.Layer
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting
 import java.nio.ByteBuffer
@@ -110,7 +110,7 @@
         ),
         listOf(Layer.BASE_LAYER, Layer.TOP_LAYER)
     )
-    val userStyleRepository = UserStyleRepository(UserStyleSchema(listOf(colorStyleSetting)))
+    val userStyleRepository = CurrentUserStyleRepository(UserStyleSchema(listOf(colorStyleSetting)))
     val complicationsManager = ComplicationsManager(
         listOf(
             Complication.createRoundRectComplicationBuilder(
@@ -154,11 +154,11 @@
 
 class ExampleOpenGLRenderer(
     surfaceHolder: SurfaceHolder,
-    private val userStyleRepository: UserStyleRepository,
+    private val currentUserStyleRepository: CurrentUserStyleRepository,
     watchState: WatchState,
     private val colorStyleSetting: ListUserStyleSetting,
     private val complication: Complication
-) : Renderer.GlesRenderer(surfaceHolder, userStyleRepository, watchState, FRAME_PERIOD_MS) {
+) : Renderer.GlesRenderer(surfaceHolder, currentUserStyleRepository, watchState, FRAME_PERIOD_MS) {
 
     /** Projection transformation matrix. Converts from 3D to 2D.  */
     private val projectionMatrix = FloatArray(16)
@@ -576,7 +576,7 @@
             GLES20.glClearColor(0f, 0f, 0f, 1f)
             ambientVpMatrix
         } else {
-            when (userStyleRepository.userStyle[colorStyleSetting]!!.id) {
+            when (currentUserStyleRepository.userStyle[colorStyleSetting]!!.id) {
                 "red_style" -> GLES20.glClearColor(0.5f, 0.2f, 0.2f, 1f)
                 "green_style" -> GLES20.glClearColor(0.2f, 0.5f, 0.2f, 1f)
             }
@@ -643,7 +643,7 @@
                     0
                 )
                 secondHandTriangleMap[
-                    userStyleRepository.userStyle[colorStyleSetting]!!.id
+                    currentUserStyleRepository.userStyle[colorStyleSetting]!!.id
                 ]
                     ?.draw(mvpMatrix)
             }

wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/KDocExampleWatchFace.kt

diff --git a/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/KDocExampleWatchFace.kt b/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/KDocExampleWatchFace.kt
index 8df800e..e766443 100644
--- a/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/KDocExampleWatchFace.kt
+++ b/wear/wear-watchface/samples/src/main/java/androidx/wear/watchface/samples/KDocExampleWatchFace.kt
@@ -40,7 +40,7 @@
 import androidx.wear.watchface.WatchState
 import androidx.wear.watchface.style.Layer
 import androidx.wear.watchface.style.UserStyle
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting
 
@@ -52,7 +52,7 @@
             surfaceHolder: SurfaceHolder,
             watchState: WatchState
         ): WatchFace {
-            val userStyleRepository = UserStyleRepository(
+            val userStyleRepository = CurrentUserStyleRepository(
                 UserStyleSchema(
                     listOf(
                         ListUserStyleSetting(
@@ -150,8 +150,8 @@
                 /* interactiveUpdateRateMillis */ 16,
             ) {
                 init {
-                    userStyleRepository.addUserStyleListener(
-                        object : UserStyleRepository.UserStyleListener {
+                    userStyleRepository.addUserStyleChangeListener(
+                        object : CurrentUserStyleRepository.UserStyleChangeListener {
                             override fun onUserStyleChanged(userStyle: UserStyle) {
                                 // `userStyle` will contain two userStyle categories with options
                                 // from the lists above. ...

wear/wear-watchface/samples/src/main/res/drawable-nodpi/analog_preview.png

diff --git a/wear/wear-watchface/samples/src/main/res/drawable-nodpi/watch_preview.png b/wear/wear-watchface/samples/src/main/res/drawable-nodpi/analog_preview.png
similarity index 100%
rename from wear/wear-watchface/samples/src/main/res/drawable-nodpi/watch_preview.png
rename to wear/wear-watchface/samples/src/main/res/drawable-nodpi/analog_preview.png
Binary files differ

wear/wear-watchface/samples/src/main/res/drawable-nodpi/digital_preview.png

diff --git a/wear/wear-watchface/samples/src/main/res/drawable-nodpi/digital_preview.png b/wear/wear-watchface/samples/src/main/res/drawable-nodpi/digital_preview.png
new file mode 100644
index 0000000..5344bf5
--- /dev/null
+++ b/wear/wear-watchface/samples/src/main/res/drawable-nodpi/digital_preview.png
Binary files differ

wear/wear-watchface/samples/src/main/res/drawable-nodpi/gl_background_preview.png

diff --git a/wear/wear-watchface/samples/src/main/res/drawable-nodpi/gl_background_preview.png b/wear/wear-watchface/samples/src/main/res/drawable-nodpi/gl_background_preview.png
new file mode 100644
index 0000000..484797d
--- /dev/null
+++ b/wear/wear-watchface/samples/src/main/res/drawable-nodpi/gl_background_preview.png
Binary files differ

wear/wear-watchface/samples/src/main/res/drawable-nodpi/gl_preview.png

diff --git a/wear/wear-watchface/samples/src/main/res/drawable-nodpi/gl_preview.png b/wear/wear-watchface/samples/src/main/res/drawable-nodpi/gl_preview.png
new file mode 100644
index 0000000..993076c
--- /dev/null
+++ b/wear/wear-watchface/samples/src/main/res/drawable-nodpi/gl_preview.png
Binary files differ

wear/wear-watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlServiceTest.kt

diff --git a/wear/wear-watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlServiceTest.kt b/wear/wear-watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlServiceTest.kt
index b82b434..afdb21f 100644
--- a/wear/wear-watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlServiceTest.kt
+++ b/wear/wear-watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlServiceTest.kt
@@ -33,9 +33,9 @@
 import androidx.wear.watchface.control.IHeadlessWatchFace
 import androidx.wear.watchface.control.IWatchFaceControlService
 import androidx.wear.watchface.control.WatchFaceControlService
-import androidx.wear.watchface.control.data.ComplicationScreenshotParams
+import androidx.wear.watchface.control.data.ComplicationRenderParams
 import androidx.wear.watchface.control.data.HeadlessWatchFaceInstanceParams
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams
+import androidx.wear.watchface.control.data.WatchFaceRenderParams
 import androidx.wear.watchface.data.DeviceConfig
 import androidx.wear.watchface.data.IdAndComplicationDataWireFormat
 import androidx.wear.watchface.samples.EXAMPLE_CANVAS_WATCHFACE_LEFT_COMPLICATION_ID
@@ -112,8 +112,8 @@
     fun createHeadlessWatchFaceInstance() {
         val instance = createInstance(100, 100)
         val bitmap = SharedMemoryImage.ashmemReadImageBundle(
-            instance.takeWatchFaceScreenshot(
-                WatchfaceScreenshotParams(
+            instance.renderWatchFaceToBitmap(
+                WatchFaceRenderParams(
                     RenderParameters(
                         DrawMode.INTERACTIVE,
                         RenderParameters.DRAW_ALL_LAYERS,
@@ -155,8 +155,8 @@
     fun createHeadlessOpenglWatchFaceInstance() {
         val instance = createOpenGlInstance(400, 400)
         val bitmap = SharedMemoryImage.ashmemReadImageBundle(
-            instance.takeWatchFaceScreenshot(
-                WatchfaceScreenshotParams(
+            instance.renderWatchFaceToBitmap(
+                WatchFaceRenderParams(
                     RenderParameters(
                         DrawMode.INTERACTIVE,
                         RenderParameters.DRAW_ALL_LAYERS,
@@ -189,8 +189,8 @@
     fun testCommandTakeComplicationScreenShot() {
         val instance = createInstance(400, 400)
         val bitmap = SharedMemoryImage.ashmemReadImageBundle(
-            instance.takeComplicationScreenshot(
-                ComplicationScreenshotParams(
+            instance.renderComplicationToBitmap(
+                ComplicationRenderParams(
                     EXAMPLE_CANVAS_WATCHFACE_LEFT_COMPLICATION_ID,
                     RenderParameters(
                         DrawMode.AMBIENT,
@@ -215,4 +215,4 @@
 
         instance.release()
     }
-}
\ No newline at end of file
+}

wear/wear-watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt

diff --git a/wear/wear-watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt b/wear/wear-watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt
index ab591af..514346a 100644
--- a/wear/wear-watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt
+++ b/wear/wear-watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt
@@ -49,7 +49,7 @@
 import androidx.wear.watchface.control.IPendingInteractiveWatchFaceWCS
 import androidx.wear.watchface.control.InteractiveInstanceManager
 import androidx.wear.watchface.control.data.WallpaperInteractiveWatchFaceInstanceParams
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams
+import androidx.wear.watchface.control.data.WatchFaceRenderParams
 import androidx.wear.watchface.data.DeviceConfig
 import androidx.wear.watchface.data.IdAndComplicationDataWireFormat
 import androidx.wear.watchface.data.SystemState
@@ -328,8 +328,8 @@
         var bitmap: Bitmap? = null
         handler.post {
             bitmap = SharedMemoryImage.ashmemReadImageBundle(
-                interactiveWatchFaceInstanceWCS.takeWatchFaceScreenshot(
-                    WatchfaceScreenshotParams(
+                interactiveWatchFaceInstanceWCS.renderWatchFaceToBitmap(
+                    WatchFaceRenderParams(
                         RenderParameters(
                             DrawMode.AMBIENT,
                             RenderParameters.DRAW_ALL_LAYERS,
@@ -361,8 +361,8 @@
         var bitmap: Bitmap? = null
         handler.post {
             bitmap = SharedMemoryImage.ashmemReadImageBundle(
-                interactiveWatchFaceInstanceWCS.takeWatchFaceScreenshot(
-                    WatchfaceScreenshotParams(
+                interactiveWatchFaceInstanceWCS.renderWatchFaceToBitmap(
+                    WatchFaceRenderParams(
                         RenderParameters(
                             DrawMode.INTERACTIVE,
                             RenderParameters.DRAW_ALL_LAYERS,
@@ -390,7 +390,7 @@
         handler.post(this::initCanvasWatchFace)
         initLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)
         handler.post {
-            interactiveWatchFaceInstanceWCS.updateInstance(
+            interactiveWatchFaceInstanceWCS.updateWatchfaceInstance(
                 "newId",
                 UserStyleWireFormat(mapOf(COLOR_STYLE_SETTING to GREEN_STYLE))
             )
@@ -411,8 +411,8 @@
         var bitmap: Bitmap? = null
         handler.post {
             bitmap = SharedMemoryImage.ashmemReadImageBundle(
-                interactiveWatchFaceInstanceWCS.takeWatchFaceScreenshot(
-                    WatchfaceScreenshotParams(
+                interactiveWatchFaceInstanceWCS.renderWatchFaceToBitmap(
+                    WatchFaceRenderParams(
                         RenderParameters(
                             DrawMode.INTERACTIVE,
                             mapOf(
@@ -448,8 +448,8 @@
         var bitmap: Bitmap? = null
         handler.post {
             bitmap = SharedMemoryImage.ashmemReadImageBundle(
-                interactiveWatchFaceInstanceWCS.takeWatchFaceScreenshot(
-                    WatchfaceScreenshotParams(
+                interactiveWatchFaceInstanceWCS.renderWatchFaceToBitmap(
+                    WatchFaceRenderParams(
                         RenderParameters(
                             DrawMode.INTERACTIVE,
                             mapOf(
@@ -503,8 +503,8 @@
         var bitmap: Bitmap? = null
         handler.post {
             bitmap = SharedMemoryImage.ashmemReadImageBundle(
-                interactiveWatchFaceInstanceWCS.takeWatchFaceScreenshot(
-                    WatchfaceScreenshotParams(
+                interactiveWatchFaceInstanceWCS.renderWatchFaceToBitmap(
+                    WatchFaceRenderParams(
                         RenderParameters(
                             DrawMode.INTERACTIVE,
                             RenderParameters.DRAW_ALL_LAYERS,
@@ -598,7 +598,7 @@
             interactiveWatchFaceInstanceSysUi.sendTouchEvent(
                 85,
                 165,
-                TapType.TAP
+                TapType.UP
             )
             interactiveWatchFaceInstanceSysUi.release()
         }

wear/wear-watchface/src/main/AndroidManifest.xml

diff --git a/wear/wear-watchface/src/main/AndroidManifest.xml b/wear/wear-watchface/src/main/AndroidManifest.xml
index d9ccca9..d41e9a8 100644
--- a/wear/wear-watchface/src/main/AndroidManifest.xml
+++ b/wear/wear-watchface/src/main/AndroidManifest.xml
@@ -15,6 +15,13 @@
   limitations under the License.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="androidx.wear.watchface">
+  <queries>
+    <intent>
+      <!-- Needed to have visibility on complication providers installed on the device. -->
+      <action
+          android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST"/>
+    </intent>
+  </queries>
   <application>
     <uses-library android:name="com.google.android.wearable" android:required="false" />
     <service

wear/wear-watchface/src/main/java/androidx/wear/watchface/Complication.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/Complication.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/Complication.kt
index aac8b57..b791f20 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/Complication.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/Complication.kt
@@ -23,10 +23,10 @@
 import android.graphics.drawable.Drawable
 import android.icu.util.Calendar
 import android.os.Bundle
+import androidx.annotation.CallSuper
 import androidx.annotation.ColorInt
 import androidx.annotation.UiThread
 import androidx.wear.complications.ComplicationBounds
-import androidx.wear.complications.ComplicationHelperActivity
 import androidx.wear.complications.DefaultComplicationProviderPolicy
 import androidx.wear.complications.data.ComplicationType
 import androidx.wear.complications.data.ComplicationData
@@ -36,79 +36,21 @@
 import androidx.wear.watchface.style.Layer
 import androidx.wear.watchface.style.UserStyleSetting
 import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting
-import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting.ComplicationOverlay
-
-/** Interface for rendering complications onto a [Canvas]. */
-public interface CanvasComplication {
-    /**
-     * Called when the CanvasComplication attaches to a [Complication]. This will get called during
-     * [Complication] initialization and if [Complication.renderer] is assigned with this
-     * CanvasComplication.
-     */
-    @UiThread
-    public fun onAttach(complication: Complication)
-
-    /**
-     * Draws the complication defined by [getData] into the canvas with the specified bounds.
-     * This will usually be called by user watch face drawing code, but the system may also call it
-     * for complication selection UI rendering. The width and height will be the same as that
-     * computed by computeBounds but the translation and canvas size may differ.
-     *
-     * @param canvas The [Canvas] to render into
-     * @param bounds A [Rect] describing the bounds of the complication
-     * @param calendar The current [Calendar]
-     * @param renderParameters The current [RenderParameters]
-     * @param complicationId The Id of the parent [Complication]
-     */
-    @UiThread
-    public fun render(
-        canvas: Canvas,
-        bounds: Rect,
-        calendar: Calendar,
-        renderParameters: RenderParameters,
-        complicationId: Int
-    )
-
-    /**
-     * Whether the complication should be drawn highlighted. This is to provide visual feedback when
-     * the user taps on a complication.
-     */
-    @Suppress("INAPPLICABLE_JVM_NAME") // https://stackoverflow.com/questions/47504279
-    @get:JvmName("isHighlighted")
-    @set:JvmName("setIsHighlighted")
-    public var isHighlighted: Boolean
-
-    /** Returns the [ComplicationData] to render with. */
-    public fun getData(): ComplicationData?
-
-    /**
-     * Sets the [ComplicationData] to render with. Note ComplicationData may reference one or
-     * more [Drawable]s which get loaded as a side effect, you can choose whether this is done
-     * synchronously or asynchronously via [loadDrawablesAsynchronous].
-     *
-     * @param complicationData The [ComplicationData] to render with
-     * @param loadDrawablesAsynchronous Whether or not any drawables should be loaded asynchronously
-     */
-    public fun setData(complicationData: ComplicationData?, loadDrawablesAsynchronous: Boolean)
-}
 
 /**
  * A complication rendered with [ComplicationDrawable] which renders complications in a material
  * design style. This renderer can't be shared by multiple complications.
+ *
+ * @param _drawable The [ComplicationDrawable] to render with.
+ * @param watchState The watch's [WatchState] which contains details pertaining to (low-bit) ambient
+ *     mode and burn in protection needed to render correctly.
  */
 public open class CanvasComplicationDrawable(
-    /** The [ComplicationDrawable] to render with. */
-    drawable: ComplicationDrawable,
-
-    /**
-     * The watch's [WatchState] which contains details pertaining to (low-bit) ambient mode and
-     * burn in protection needed to render correctly.
-     */
+    _drawable: ComplicationDrawable,
     private val watchState: WatchState
-) : CanvasComplication {
-
+) {
     init {
-        drawable.callback = object :
+        _drawable.callback = object :
             Drawable.Callback {
             override fun unscheduleDrawable(who: Drawable, what: Runnable) {}
 
@@ -122,7 +64,7 @@
     }
 
     /** The [ComplicationDrawable] to render with. */
-    public var drawable: ComplicationDrawable = drawable
+    public var drawable: ComplicationDrawable = _drawable
         set(value) {
             // Copy the ComplicationData otherwise the complication will be blank until the next
             // update.
@@ -141,14 +83,31 @@
 
     private var attachedComplication: Complication? = null
 
-    /** {@inheritDoc} */
-    override fun onAttach(complication: Complication) {
+    /**
+     * Called when the CanvasComplication attaches to a [Complication]. This will get called during
+     * [Complication] initialization and if [Complication.renderer] is assigned with this
+     * CanvasComplication.
+     */
+    @UiThread
+    public fun onAttach(complication: Complication) {
         attachedComplication = complication
         watchState.isAmbient.addObserver(isAmbientObserver)
     }
 
-    /** {@inheritDoc} */
-    override fun render(
+    /**
+     * Draws the complication defined by [getData] into the canvas with the specified bounds.
+     * This will usually be called by user watch face drawing code, but the system may also call it
+     * for complication selection UI rendering. The width and height will be the same as that
+     * computed by computeBounds but the translation and canvas size may differ.
+     *
+     * @param canvas The [Canvas] to render into
+     * @param bounds A [Rect] describing the bounds of the complication
+     * @param calendar The current [Calendar]
+     * @param renderParameters The current [RenderParameters]
+     * @param complicationId The Id of the parent [Complication]
+     */
+    @UiThread
+    public open fun render(
         canvas: Canvas,
         bounds: Rect,
         calendar: Calendar,
@@ -198,15 +157,13 @@
     }
 
     /**
-     * Whether or not the complication should be drawn highlighted. Used to provide visual feedback
-     * when the complication is tapped.
+     * Whether the complication should be drawn highlighted. This is to provide visual feedback when
+     * the user taps on a complication.
      */
-    override var isHighlighted: Boolean
-        @Suppress("INAPPLICABLE_JVM_NAME") // https://stackoverflow.com/questions/47504279
+    public var isHighlighted: Boolean
         @JvmName("isHighlighted")
         @UiThread
         get() = drawable.isHighlighted
-        @Suppress("INAPPLICABLE_JVM_NAME") // https://stackoverflow.com/questions/47504279
         @JvmName("setIsHighlighted")
         @UiThread
         set(value) {
@@ -215,9 +172,19 @@
 
     private var _data: ComplicationData? = null
 
-    override fun getData(): ComplicationData? = _data
+    /** Returns the [ComplicationData] to render with. */
+    public fun getData(): ComplicationData? = _data
 
-    override fun setData(
+    /**
+     * Sets the [ComplicationData] to render with and loads any [Drawable]s contained within the
+     * ComplicationData. You can choose whether this is done synchronously or asynchronously via
+     * [loadDrawablesAsynchronous].
+     *
+     * @param complicationData The [ComplicationData] to render with
+     * @param loadDrawablesAsynchronous Whether or not any drawables should be loaded asynchronously
+     */
+    @CallSuper
+    public open fun loadData(
         complicationData: ComplicationData?,
         loadDrawablesAsynchronous: Boolean
     ): Unit = TraceEvent("CanvasComplicationDrawable.setIdAndData").use {
@@ -233,30 +200,38 @@
  * Represents a individual complication on the screen. The number of complications is fixed
  * (see [ComplicationsManager]) but complications can be enabled or disabled via
  * [UserStyleSetting.ComplicationsUserStyleSetting].
+ *
+ * @param id The Watch Face's ID for the complication.
+ * @param boundsType The [ComplicationBoundsType] of the complication.
+ * @param bounds The complication's [ComplicationBounds].
+ * @param renderer The [CanvasComplicationDrawable] used to render the complication.
+ * @param supportedTypes The list of [ComplicationType]s accepted by this complication. Passed
+ *     into [ComplicationHelperActivity.createProviderChooserHelperIntent] during complication
+ *     configuration. This list should be non-empty.
+ * @param defaultProviderPolicy The [DefaultComplicationProviderPolicy] which controls the initial
+ *     provider when the watch face is first installed.
+ * @param defaultProviderType The default [ComplicationType] for the default provider.
+ * @param initiallyEnabled At creation a complication is either enabled or disabled. This can be
+ *     overridden by a [ComplicationsUserStyleSetting] (see [ComplicationOverlay.enabled]).
+ *     Editors need to know the initial state of a complication to predict the effects of making a
+ *     style change.
+ * @param configExtras Extras to be merged into the Intent sent when invoking the provider chooser
+ *     activity.
+ * @param fixedComplicationProvider  Whether or not the complication provider is fixed (i.e.
+ *     can't be changed by the user).  This is useful for watch faces built around specific
+ *     complications.
  */
 public class Complication internal constructor(
     internal val id: Int,
     @ComplicationBoundsType public val boundsType: Int,
     bounds: ComplicationBounds,
-    /** The [CanvasComplication] used to render the complication. */
-    public val renderer: CanvasComplication,
+    public val renderer: CanvasComplicationDrawable,
     supportedTypes: List<ComplicationType>,
     defaultProviderPolicy: DefaultComplicationProviderPolicy,
     defaultProviderType: ComplicationType,
-    /**
-     * At creation a complication is either enabled or disabled. This can be overridden by a
-     * [ComplicationsUserStyleSetting] (see [ComplicationOverlay.enabled]).
-     *
-     * Editors need to know the initial state of a complication to predict the effects of making a
-     * style change.
-     */
     @get:JvmName("isInitiallyEnabled")
     public val initiallyEnabled: Boolean,
-
-    /** Extras to be merged into the Intent sent when invoking the provider chooser activity. */
     public val configExtras: Bundle,
-
-    /** Whether or not the complication provider is fixed. */
     @get:JvmName("isFixedComplicationProvider")
     public val fixedComplicationProvider: Boolean
 ) {
@@ -268,35 +243,24 @@
          * [ComplicationBoundsType.ROUND_RECT]. This is the most common type of complication.
          * These can be single tapped by the user to either trigger the associated intent or
          * double tapped to open the provider selector.
+         *
+         * @param id The watch face's ID for this complication. Can be any integer but should be
+         *     unique within the watch face.
+         * @param renderer The [CanvasComplicationDrawable] to use for rendering. Note renderers
+         *     should not be shared between complications.
+         * @param supportedTypes The types of complication supported by this Complication. Passed
+         *     into [ComplicationHelperActivity.createProviderChooserHelperIntent] during
+         *     complication configuration. This list should be non-empty.
+         * @param defaultProviderPolicy The [DefaultComplicationProviderPolicy] used to select
+         *     the initial complication provider when the watch is first installed.
+         * @param bounds The complication's [ComplicationBounds].
          */
         @JvmStatic
         public fun createRoundRectComplicationBuilder(
-            /**
-             * The watch face's ID for this complication. Can be any integer but should be unique
-             * within the watch face.
-             */
             id: Int,
-
-            /**
-             * The [CanvasComplication] to use for rendering. Note renderers should not be shared
-             * between complications.
-             */
-            renderer: CanvasComplication,
-
-            /**
-             * The types of complication supported by this Complication. Passed into
-             * [ComplicationHelperActivity.createProviderChooserHelperIntent] during complication
-             * configuration. This list should be non-empty.
-             */
+            renderer: CanvasComplicationDrawable,
             supportedTypes: List<ComplicationType>,
-
-            /**
-             * The [DefaultComplicationProviderPolicy] used to select the initial complication
-             * provider.
-             */
             defaultProviderPolicy: DefaultComplicationProviderPolicy,
-
-            /** The initial [ComplicationBounds]. */
             bounds: ComplicationBounds
         ): Builder = Builder(
             id,
@@ -313,32 +277,22 @@
          * complication is for watch faces that wish to have a full screen user selectable
          * backdrop. This sort of complication isn't clickable and at most one may be present in
          * the list of complications.
+         *
+         * @param id The watch face's ID for this complication. Can be any integer but should be
+         *     unique within the watch face.
+         * @param renderer The [CanvasComplicationDrawable] to use for rendering. Note renderers
+         *     should not be shared between complications.
+         * @param supportedTypes The types of complication supported by this Complication. Passed
+         *     into [ComplicationHelperActivity.createProviderChooserHelperIntent] during
+         *     complication configuration. This list should be non-empty.
+         * @param defaultProviderPolicy The [DefaultComplicationProviderPolicy] used to select
+         *     the initial complication provider when the watch is first installed.
          */
         @JvmStatic
         public fun createBackgroundComplicationBuilder(
-            /**
-             * The watch face's ID for this complication. Can be any integer but should be unique
-             * within the watch face.
-             */
             id: Int,
-
-            /**
-             * The [CanvasComplication] to use for rendering. Note renderers should not be shared
-             * between complications.
-             */
-            renderer: CanvasComplication,
-
-            /**
-             * The types of complication supported by this Complication. Passed into
-             * [ComplicationHelperActivity.createProviderChooserHelperIntent] during complication
-             * configuration. This list should be non-empty.
-             */
+            renderer: CanvasComplicationDrawable,
             supportedTypes: List<ComplicationType>,
-
-            /**
-             * The [DefaultComplicationProviderPolicy] used to select the initial complication
-             * provider.
-             */
             defaultProviderPolicy: DefaultComplicationProviderPolicy
         ): Builder = Builder(
             id,
@@ -350,10 +304,24 @@
         )
     }
 
-    /** Builder for constructing [Complication]s. */
+    /**
+     * Builder for constructing [Complication]s.
+     *
+     * @param id The watch face's ID for this complication. Can be any integer but should be unique
+     *     within the watch face.
+     * @param renderer The [CanvasComplicationDrawable] to use for rendering. Note renderers should
+     *     not be shared between complications.
+     * @param supportedTypes The types of complication supported by this Complication. Passed into
+     *     [ComplicationHelperActivity.createProviderChooserHelperIntent] during complication
+     *     configuration. This list should be non-empty.
+     * @param defaultProviderPolicy The [DefaultComplicationProviderPolicy] used to select
+     *     the initial complication provider when the watch is first installed.
+     * @param boundsType The [ComplicationBoundsType] of the complication.
+     * @param bounds The complication's [ComplicationBounds].
+     */
     public class Builder internal constructor(
         private val id: Int,
-        private val renderer: CanvasComplication,
+        private val renderer: CanvasComplicationDrawable,
         private val supportedTypes: List<ComplicationType>,
         private val defaultProviderPolicy: DefaultComplicationProviderPolicy,
         @ComplicationBoundsType private val boundsType: Int,

wear/wear-watchface/src/main/java/androidx/wear/watchface/ComplicationsManager.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/ComplicationsManager.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/ComplicationsManager.kt
index c0f3c35..f39f8e4 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/ComplicationsManager.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/ComplicationsManager.kt
@@ -33,7 +33,7 @@
 import androidx.wear.complications.data.EmptyComplicationData
 import androidx.wear.watchface.data.ComplicationBoundsType
 import androidx.wear.watchface.style.UserStyle
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting
 import java.lang.ref.WeakReference
 
@@ -45,16 +45,14 @@
 /**
  * The [Complication]s associated with the [WatchFace]. Dynamic creation of complications isn't
  * supported, however complications can be enabled and disabled by [ComplicationsUserStyleSetting].
+ *
+ * @param complicationCollection The complications associated with the watch face, may be empty.
+ * @param currentUserStyleRepository The [CurrentUserStyleRepository] used to listen for
+ *     [ComplicationsUserStyleSetting] changes and apply them.
  */
 public class ComplicationsManager(
-    /** The complications associated with the watch face, may be empty. */
     complicationCollection: Collection<Complication>,
-
-    /**
-     * The [UserStyleRepository] used to listen for [ComplicationsUserStyleSetting] changes and
-     * apply them.
-     */
-    private val userStyleRepository: UserStyleRepository
+    private val currentUserStyleRepository: CurrentUserStyleRepository
 ) {
     /**
      * Interface used to report user taps on the complication. See [addTapListener] and
@@ -102,9 +100,9 @@
     @VisibleForTesting
     internal constructor(
         complicationCollection: Collection<Complication>,
-        userStyleRepository: UserStyleRepository,
+        currentUserStyleRepository: CurrentUserStyleRepository,
         renderer: Renderer
-    ) : this(complicationCollection, userStyleRepository) {
+    ) : this(complicationCollection, currentUserStyleRepository) {
         this.renderer = renderer
     }
 
@@ -124,7 +122,7 @@
         }
 
         val complicationsStyleCategory =
-            userStyleRepository.schema.userStyleSettings.firstOrNull {
+            currentUserStyleRepository.schema.userStyleSettings.firstOrNull {
                 it is ComplicationsUserStyleSetting
             }
 
@@ -133,8 +131,8 @@
         if (complicationsStyleCategory != null) {
             // Ensure we apply any initial StyleCategoryOption overlay by initializing with null.
             var previousOption: ComplicationsUserStyleSetting.ComplicationsOption? = null
-            userStyleRepository.addUserStyleListener(
-                object : UserStyleRepository.UserStyleListener {
+            currentUserStyleRepository.addUserStyleChangeListener(
+                object : CurrentUserStyleRepository.UserStyleChangeListener {
                     override fun onUserStyleChanged(userStyle: UserStyle) {
                         val newlySelectedOption =
                             userStyle[complicationsStyleCategory]?.toComplicationsOption()!!
@@ -232,7 +230,7 @@
                         complication.id,
                         complication.defaultProviderPolicy.providersAsList(),
                         complication.defaultProviderPolicy.systemProviderFallback,
-                        complication.defaultProviderType.asWireComplicationType()
+                        complication.defaultProviderType.toWireComplicationType()
                     )
                 }
 
@@ -272,7 +270,7 @@
         val complication = complications[watchFaceComplicationId] ?: return
         complication.dataDirty = complication.dataDirty ||
             (complication.renderer.getData() != data)
-        complication.renderer.setData(data, true)
+        complication.renderer.loadData(data, true)
         (complication.complicationData as MutableObservableWatchData<ComplicationData>).value =
             data
     }
@@ -280,20 +278,20 @@
     @UiThread
     internal fun clearComplicationData() {
         for ((_, complication) in complications) {
-            complication.renderer.setData(null, false)
+            complication.renderer.loadData(null, false)
             (complication.complicationData as MutableObservableWatchData).value =
                 EmptyComplicationData()
         }
     }
 
     /**
-     * Brings attention to the complication by briefly highlighting it to provide visual feedback
+     * Starts a short animation, briefly highlighting the complication to provide visual feedback
      * when the user has tapped on it.
      *
      * @param complicationId The watch face's ID of the complication to briefly highlight
      */
     @UiThread
-    public fun bringAttentionToComplication(complicationId: Int) {
+    public fun displayPressedAnimation(complicationId: Int) {
         val complication = requireNotNull(complications[complicationId]) {
             "No complication found with ID $complicationId"
         }

wear/wear-watchface/src/main/java/androidx/wear/watchface/GlesTextureComplication.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/GlesTextureComplication.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/GlesTextureComplication.kt
index a71b06a..efe23e4 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/GlesTextureComplication.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/GlesTextureComplication.kt
@@ -26,25 +26,20 @@
 import androidx.annotation.Px
 
 /**
- * Helper for rendering a [CanvasComplication] to a GLES20 texture. To use call [renderToTexture]
- * and then [bind] before drawing.
+ * Helper for rendering a [CanvasComplicationDrawable] to a GLES20 texture. To use call
+ * [renderToTexture] and then [bind] before drawing.
+ *
+ * @param canvasComplication The [CanvasComplicationDrawable] to render to texture.
+ * @param textureWidth The width of the texture in pixels to create.
+ * @param textureHeight The height of the texture in pixels to create.
+ * @param textureType The texture type, e.g. [GLES20.GL_TEXTURE_2D].
+ * @param id The id of the associated [Complication].
  */
 public class GlesTextureComplication(
-    /** The [CanvasComplication] to render to texture. */
-    public val canvasComplication: CanvasComplication,
-
-    /** The width of the texture to create. */
-    @Px
-    textureWidth: Int,
-
-    /** The height of the texture to create. */
-    @Px
-    textureHeight: Int,
-
-    /** The texture type, e.g. GLES20.GL_TEXTURE_2D */
+    public val canvasComplication: CanvasComplicationDrawable,
+    @Px textureWidth: Int,
+    @Px textureHeight: Int,
     private val textureType: Int,
-
-    /** The id of the associated [Complication]. */
     public val id: Int
 ) {
     private val texture = createTexture(textureType)
@@ -100,4 +95,4 @@
         )
         return handle[0]
     }
-}
\ No newline at end of file
+}

wear/wear-watchface/src/main/java/androidx/wear/watchface/ObservableWatchData.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/ObservableWatchData.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/ObservableWatchData.kt
index 0ae9d02..ba4ac3f 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/ObservableWatchData.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/ObservableWatchData.kt
@@ -21,7 +21,8 @@
 /**
  * An observable UI thread only data holder class (see [Observer]).
  *
- * @param T The type of data held by this instance
+ * @param T The type of data held by this instance.
+ * @param _value The initial value or `null` if there isn't an initial value.
  */
 public open class ObservableWatchData<T : Any> internal constructor(internal var _value: T?) {
 

wear/wear-watchface/src/main/java/androidx/wear/watchface/RenderParameters.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/RenderParameters.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/RenderParameters.kt
index 8d9b8ad..d31294a 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/RenderParameters.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/RenderParameters.kt
@@ -65,27 +65,23 @@
     HIDE
 }
 
-/** Used to parameterize watch face rendering. */
+/**
+ * Used to parameterize watch face rendering.
+ *
+ * @param drawMode The overall drawing parameters based on system state.
+ * @param layerParameters Parameters for rendering individual layers. Generally these will all be
+ *     [LayerMode#DRAW] in normal operation, but the editor may make more complicated requests
+ *     which need to be honored to function properly.
+ * @param selectedComplicationId Optional parameter which if non null specifies that a particular
+ *     complication should be drawn with a special highlight to indicate it's been selected.
+ * @param outlineTint Specifies the tint should be used with [LayerMode.DRAW_OUTLINED]
+ */
 public class RenderParameters constructor(
-    /** The overall drawing parameters based on system state. */
     public val drawMode: DrawMode,
-
-    /**
-     * Parameters for rendering individual layers. Generally these will all be [LayerMode#DRAW]
-     * in normal operation, but the editor may make more complicated requests which need to be
-     * honored to function properly.
-     */
     public val layerParameters: Map<Layer, LayerMode>,
-
-    /**
-     * Optional parameter which if non null specifies that a particular complication should be
-     * drawn with a special highlight to indicate it's been selected.
-     */
     @SuppressWarnings("AutoBoxing")
     @get:SuppressWarnings("AutoBoxing")
     public val selectedComplicationId: Int?,
-
-    /** Specifies the tint should be used with [LayerMode.DRAW_OUTLINED] .*/
     @ColorInt
     @get:ColorInt
     public val outlineTint: Int
@@ -93,22 +89,18 @@
     /**
      * Constructs [RenderParameters] without an explicit [outlineTint]. This constructor doesn't
      * support [LayerMode.DRAW_OUTLINED].
+     *
+     * @param drawMode The overall drawing parameters based on system state.
+     * @param layerParameters Parameters for rendering individual layers. Generally these will all
+     *     be [LayerMode#DRAW] in normal operation, but the editor may make more complicated
+     *     requests which need to be honored to function properly.
+     * @param selectedComplicationId Optional parameter which if non null specifies that a
+     *     particular complication should be drawn with a special highlight to indicate it's been
+     *     selected.
      */
     public constructor(
-        /** The overall drawing parameters based on system state. */
         drawMode: DrawMode,
-
-        /**
-         * Parameters for rendering individual layers. Generally these will all be [LayerMode#DRAW]
-         * in normal operation, but the editor may make more complicated requests which need to be
-         * honored to function properly.
-         */
         layerParameters: Map<Layer, LayerMode>,
-
-        /**
-         * Optional parameter which if non null specifies that a particular complication should be
-         * drawn with a special highlight to indicate it's been selected.
-         */
         @SuppressWarnings("AutoBoxing")
         selectedComplicationId: Int?,
     ) : this(drawMode, layerParameters, selectedComplicationId, Color.RED) {

wear/wear-watchface/src/main/java/androidx/wear/watchface/Renderer.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/Renderer.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/Renderer.kt
index 558ff6a..92fd683 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/Renderer.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/Renderer.kt
@@ -39,7 +39,7 @@
 import androidx.wear.utility.TraceEvent
 import androidx.wear.watchface.Renderer.CanvasRenderer
 import androidx.wear.watchface.Renderer.GlesRenderer
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import java.nio.ByteBuffer
 
 /**
@@ -88,24 +88,23 @@
 
 internal val EGL_SURFACE_ATTRIB_LIST = intArrayOf(EGL14.EGL_NONE)
 
-/** The base class for [CanvasRenderer] and [GlesRenderer]. */
+/**
+ * The base class for [CanvasRenderer] and [GlesRenderer].
+ *
+ * @param surfaceHolder The [SurfaceHolder] that [renderInternal] will draw into.
+ * @param currentUserStyleRepository The associated [CurrentUserStyleRepository].
+ * @param watchState The associated [WatchState].
+ * @param interactiveDrawModeUpdateDelayMillis The interval in milliseconds between frames in
+ *     interactive [DrawMode]s. To render at 60hz set to 16. Note when battery is low, the frame
+ *     rate will be clamped to 10fps. Watch faces are recommended to use lower frame rates if
+ *     possible for better battery life. Variable frame rates can also help preserve battery
+ *     life, e.g. if a watch face has a short animation once per second it can adjust the frame
+ *     rate inorder to sleep when not animating.
+ */
 public sealed class Renderer(
-    /** The [SurfaceHolder] that [renderInternal] will draw into. */
     public val surfaceHolder: SurfaceHolder,
-
-    /** The associated [UserStyleRepository]. */
-    private val userStyleRepository: UserStyleRepository,
-
-    /** The associated [WatchState]. */
+    private val currentUserStyleRepository: CurrentUserStyleRepository,
     internal val watchState: WatchState,
-
-    /**
-     * The interval in milliseconds between frames in interactive [DrawMode]s. To render at 60hz
-     * set to 16. Note when battery is low, the frame rate will be clamped to 10fps. Watch faces are
-     * recommended to use lower frame rates if possible for better battery life. Variable frame
-     * rates can also help preserve battery life, e.g. if a watch face has a short animation once
-     * per second it can adjust the frame rate inorder to sleep when not animating.
-     */
     @IntRange(from = 0, to = 60000)
     public var interactiveDrawModeUpdateDelayMillis: Long,
 ) {
@@ -170,7 +169,7 @@
 
     /**
      * Renders the watch face into the [surfaceHolder] using the current [renderParameters]
-     * with the user style specified by the [userStyleRepository].
+     * with the user style specified by the [currentUserStyleRepository].
      *
      * @param calendar The Calendar to use when rendering the watch face
      * @return A [Bitmap] containing a screenshot of the watch face
@@ -181,7 +180,7 @@
 
     /**
      * Renders the watch face into a Bitmap with the user style specified by the
-     * [userStyleRepository].
+     * [currentUserStyleRepository].
      *
      * @param calendar The Calendar to use when rendering the watch face
      * @param renderParameters The [RenderParameters] to use when rendering the watch face
@@ -263,39 +262,32 @@
 
     /**
      * Watch faces that require [Canvas] rendering should extend their [Renderer] from this class.
+     *
+     * @param surfaceHolder The [SurfaceHolder] from which a [Canvas] to will be obtained and passed
+     *     into [render].
+     * @param currentUserStyleRepository The watch face's associated [CurrentUserStyleRepository].
+     * @param watchState The watch face's associated [WatchState].
+     * @param canvasType The type of canvas to request.
+     * @param interactiveDrawModeUpdateDelayMillis The interval in milliseconds between frames in
+     *     interactive [DrawMode]s. To render at 60hz set to 16. Note when battery is low, the
+     *     frame rate will be clamped to 10fps. Watch faces are recommended to use lower frame
+     *     rates if possible for better battery life. Variable frame rates can also help preserve
+     *     battery life, e.g. if a watch face has a short animation once per second it can adjust
+     *     the frame rate inorder to sleep when not animating.
      */
     public abstract class CanvasRenderer(
-        /**
-         * The [SurfaceHolder] from which a [Canvas] to will be obtained and passed into [render].
-         */
         surfaceHolder: SurfaceHolder,
-
-        /** The watch face's associated [UserStyleRepository]. */
-        userStyleRepository: UserStyleRepository,
-
-        /** The watch face's associated [WatchState]. */
+        currentUserStyleRepository: CurrentUserStyleRepository,
         watchState: WatchState,
-
-        /** The type of canvas to request. */
         @CanvasType private val canvasType: Int,
-
-        /**
-         * The interval in milliseconds between frames in interactive [DrawMode]s. To render at 60hz
-         * set to 16. Note when battery is low, the frame rate will be clamped to 10fps. Watch faces
-         * are recommended to use lower frame rates if possible for better battery life. Variable
-         * frame  rates can also help preserve battery life, e.g. if a watch face has a short
-         * animation once per second it can adjust the frame rate inorder to sleep when not
-         * animating.
-         */
         @IntRange(from = 0, to = 60000)
         interactiveDrawModeUpdateDelayMillis: Long
     ) : Renderer(
         surfaceHolder,
-        userStyleRepository,
+        currentUserStyleRepository,
         watchState,
         interactiveDrawModeUpdateDelayMillis
     ) {
-
         @SuppressWarnings("UnsafeNewApiCall") // We check if the SDK is new enough.
         internal override fun renderInternal(
             calendar: Calendar
@@ -369,40 +361,33 @@
     /**
      * Watch faces that require [GLES20] rendering should extend their [Renderer] from this class.
      * Before passing to the [WatchFace] constructor [initOpenGlContext] must be called.
+     *
+     * @param surfaceHolder The [SurfaceHolder] whose [android.view.Surface] [render] will draw
+     *     into.
+     * @param currentUserStyleRepository The associated [CurrentUserStyleRepository].
+     * @param watchState The associated [WatchState].
+     * @param interactiveDrawModeUpdateDelayMillis The interval in milliseconds between frames in
+     *     interactive [DrawMode]s. To render at 60hz set to 16. Note when battery is low, the
+     *     frame rate will be clamped to 10fps. Watch faces are recommended to use lower frame
+     *     rates if possible for better battery life. Variable frame rates can also help preserve
+     *     battery life, e.g. if a watch face has a short animation once per second it can adjust
+     *     the frame rate inorder to sleep when not animating.
+     * @param eglConfigAttribList Attributes for [EGL14.eglChooseConfig]. By default this selects an
+     *     RGBA8888 back buffer.
+     * @param eglSurfaceAttribList The attributes to be passed to [EGL14.eglCreateWindowSurface]. By
+     *     default this is empty.
      */
     public abstract class GlesRenderer @JvmOverloads constructor(
-        /** The [SurfaceHolder] whose [android.view.Surface] [render] will draw into. */
         surfaceHolder: SurfaceHolder,
-
-        /** The associated [UserStyleRepository]. */
-        userStyleRepository: UserStyleRepository,
-
-        /** The associated [WatchState]. */
+        currentUserStyleRepository: CurrentUserStyleRepository,
         watchState: WatchState,
-
-        /**
-         * The interval in milliseconds between frames in interactive [DrawMode]s. To render at 60hz
-         * set to 16. Note when battery is low, the frame rate will be clamped to 10fps. Watch faces
-         * are recommended to use lower frame rates if possible for better battery life. Variable
-         * frame rates can also help preserve battery life, e.g. if a watch face has a short
-         * animation once per second it can adjust the frame rate inorder to sleep when not
-         * animating.
-         */
         @IntRange(from = 0, to = 60000)
         interactiveDrawModeUpdateDelayMillis: Long,
-
-        /**
-         * Attributes for [EGL14.eglChooseConfig]. By default this selects an RGBA8888 back buffer.
-         */
         private val eglConfigAttribList: IntArray = EGL_CONFIG_ATTRIB_LIST,
-
-        /**
-         * The attributes to be passed to [EGL14.eglCreateWindowSurface]. By default this is empty.
-         */
         private val eglSurfaceAttribList: IntArray = EGL_SURFACE_ATTRIB_LIST
     ) : Renderer(
         surfaceHolder,
-        userStyleRepository,
+        currentUserStyleRepository,
         watchState,
         interactiveDrawModeUpdateDelayMillis
     ) {

wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchFace.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchFace.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchFace.kt
index a3bbab5..e8e2398 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchFace.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchFace.kt
@@ -44,9 +44,8 @@
 import androidx.wear.utility.TraceEvent
 import androidx.wear.complications.SystemProviders
 import androidx.wear.complications.data.ComplicationData
-import androidx.wear.watchface.control.IInteractiveWatchFaceSysUI
 import androidx.wear.watchface.style.UserStyle
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import androidx.wear.watchface.style.data.UserStyleWireFormat
 import kotlinx.coroutines.CompletableDeferred
@@ -114,23 +113,19 @@
 /**
  * The return value of [WatchFaceService.createWatchFace] which brings together rendering, styling,
  * complications and state observers.
+ *
+ * @param watchFaceType The type of watch face, whether it's digital or analog. Used to determine
+ *     the default time for editor preview screenshots.
+ * @param currentUserStyleRepository The [CurrentUserStyleRepository] for this WatchFace.
+ * @param renderer The [Renderer] for this WatchFace.
+ * @param complicationsManager The [ComplicationsManager] for this WatchFace.
  */
 public class WatchFace @JvmOverloads constructor(
-    /**
-     * The type of watch face, whether it's digital or analog. Used to determine the
-     * default time for editor preview screenshots.
-     */
     @WatchFaceType internal var watchFaceType: Int,
-
-    /** The [UserStyleRepository] for this WatchFace. */
-    public val userStyleRepository: UserStyleRepository,
-
-    /** The [Renderer] for this WatchFace. */
+    public val currentUserStyleRepository: CurrentUserStyleRepository,
     internal val renderer: Renderer,
-
-    /** The [ComplicationsManager] for this WatchFace. */
     internal var complicationsManager: ComplicationsManager =
-        ComplicationsManager(emptyList(), userStyleRepository)
+        ComplicationsManager(emptyList(), currentUserStyleRepository)
 ) {
     internal var tapListener: TapListener? = null
 
@@ -225,8 +220,8 @@
         /** The UTC reference time to use for previews in milliseconds since the epoch. */
         public val previewReferenceTimeMillis: Long
 
-        /** Takes a screenshot with the [UserStyleRepository]'s [UserStyle]. */
-        public fun takeScreenshot(
+        /** Renders the watchface to a [Bitmap] with the [CurrentUserStyleRepository]'s [UserStyle]. */
+        public fun renderWatchFaceToBitmap(
             renderParameters: RenderParameters,
             calendarTimeMillis: Long,
             idToComplicationData: Map<Int, ComplicationData>?
@@ -260,44 +255,30 @@
     /**
      * Legacy Wear 2.0 watch face styling. These settings will be ignored on Wear 3.0 devices.
      *
+     * @param viewProtectionMode The view protection mode bit field, must be a combination of
+     *     zero or more of [PROTECT_STATUS_BAR], [PROTECT_HOTWORD_INDICATOR],
+     *     [PROTECT_WHOLE_SCREEN].
+     * @param statusBarGravity Controls the position of status icons (battery state, lack of
+     *     connection) on the screen. This must be any combination of horizontal Gravity constant:
+     *         ([Gravity.LEFT], [Gravity.CENTER_HORIZONTAL], [Gravity.RIGHT])
+     *         and vertical Gravity constants ([Gravity.TOP], [Gravity,CENTER_VERTICAL},
+     *         [Gravity,BOTTOM]), e.g. {@code Gravity.LEFT | Gravity.BOTTOM}. On circular screens,
+     *          only the vertical gravity is respected.
+     * @param tapEventsAccepted Controls whether this watch face accepts tap events. Watchfaces
+     *     that set this {@code true} are indicating they are prepared to receive
+     *     [IInteractiveWatchFaceSysUI.TAP_TYPE_DOWN],
+     *     [IInteractiveWatchFaceSysUI.TAP_TYPE_CANCEL], and
+     *     [IInteractiveWatchFaceSysUI.TAP_TYPE_UP] events.
+     * @param accentColor The accent color which will be used when drawing the unread notification
+     *     indicator. Default color is white.
      * @throws IllegalArgumentException if [viewProtectionMode] has an unexpected value
      */
     public class LegacyWatchFaceOverlayStyle @JvmOverloads constructor(
-        /**
-         * The view protection mode bit field, must be a combination of
-         *     zero or more of [PROTECT_STATUS_BAR], [PROTECT_HOTWORD_INDICATOR],
-         *     [PROTECT_WHOLE_SCREEN].
-         */
         public val viewProtectionMode: Int,
-
-        /**
-         * Controls the position of status icons (battery state, lack of connection) on the screen.
-         *
-         * This must be any combination of horizontal Gravity constant
-         *     ([Gravity.LEFT], [Gravity.CENTER_HORIZONTAL], [Gravity.RIGHT])
-         *     and vertical Gravity constants ([Gravity.TOP], [Gravity,CENTER_VERTICAL},
-         *     [Gravity,BOTTOM]), e.g. {@code Gravity.LEFT | Gravity.BOTTOM}. On circular screens,
-         *     only the vertical gravity is respected.
-         */
         public val statusBarGravity: Int,
-
-        /**
-         * Controls whether this watch face accepts tap events.
-         *
-         * Watchfaces that set this {@code true} are indicating they are prepared to receive
-         * [IInteractiveWatchFaceSysUI.TAP_TYPE_TOUCH],
-         * [IInteractiveWatchFaceSysUI.TAP_TYPE_TOUCH_CANCEL], and
-         * [IInteractiveWatchFaceSysUI.TAP_TYPE_TAP] events.
-         */
         @get:JvmName("isTapEventsAccepted")
         public val tapEventsAccepted: Boolean,
-
-        /**
-         * The accent color which will be used when drawing the unread notification indicator.
-         * Default color is white.
-         */
-        @ColorInt
-        public val accentColor: Int = WatchFaceStyle.DEFAULT_ACCENT_COLOR
+        @ColorInt public val accentColor: Int = WatchFaceStyle.DEFAULT_ACCENT_COLOR
     ) {
         init {
             if (viewProtectionMode < 0 ||
@@ -411,7 +392,7 @@
 
     private val systemTimeProvider = watchface.systemTimeProvider
     private val legacyWatchFaceStyle = watchface.legacyWatchFaceStyle
-    internal val userStyleRepository = watchface.userStyleRepository
+    internal val userStyleRepository = watchface.currentUserStyleRepository
     internal val renderer = watchface.renderer
     internal val complicationsManager = watchface.complicationsManager
     private val tapListener = watchface.tapListener
@@ -538,8 +519,8 @@
                 userStyleRepository.schema
             )
 
-            userStyleRepository.addUserStyleListener(
-                object : UserStyleRepository.UserStyleListener {
+            userStyleRepository.addUserStyleChangeListener(
+                object : CurrentUserStyleRepository.UserStyleChangeListener {
                     @SuppressLint("SyntheticAccessor")
                     override fun onUserStyleChanged(userStyle: UserStyle) {
                         writePrefs(watchFaceHostApi.getContext(), preferencesFile, userStyle)
@@ -666,7 +647,7 @@
         override val previewReferenceTimeMillis
             get() = this@WatchFaceImpl.previewReferenceTimeMillis
 
-        override fun takeScreenshot(
+        override fun renderWatchFaceToBitmap(
             renderParameters: RenderParameters,
             calendarTimeMillis: Long,
             idToComplicationData: Map<Int, ComplicationData>?
@@ -679,7 +660,7 @@
 
             idToComplicationData?.let {
                 for ((id, complicationData) in it) {
-                    complicationsManager[id]!!.renderer.setData(complicationData, false)
+                    complicationsManager[id]!!.renderer.loadData(complicationData, false)
                 }
             }
             val screenShot = renderer.takeScreenshot(
@@ -690,7 +671,7 @@
             )
             if (idToComplicationData != null) {
                 for ((id, data) in oldComplicationData) {
-                    complicationsManager[id]!!.renderer.setData(data, false)
+                    complicationsManager[id]!!.renderer.loadData(data, false)
                 }
             }
             return screenShot
@@ -918,13 +899,13 @@
         // TODO(alexclarke): Revisit this
         var tapType = originalTapType
         when (tapType) {
-            TapType.TOUCH -> {
+            TapType.DOWN -> {
                 lastTappedPosition = Point(x, y)
             }
-            TapType.TOUCH_CANCEL -> {
+            TapType.CANCEL -> {
                 lastTappedPosition?.let { safeLastTappedPosition ->
                     if ((safeLastTappedPosition.x == x) && (safeLastTappedPosition.y == y)) {
-                        tapType = TapType.TAP
+                        tapType = TapType.UP
                     }
                 }
                 lastTappedPosition = null
@@ -932,7 +913,7 @@
         }
 
         when (tapType) {
-            TapType.TAP -> {
+            TapType.UP -> {
                 if (tappedComplication.id != lastTappedComplicationId &&
                     lastTappedComplicationId != null
                 ) {
@@ -942,7 +923,7 @@
                 if (!pendingSingleTap.isPending()) {
                     // Give the user immediate visual feedback, the UI feels sluggish if we defer
                     // this.
-                    complicationsManager.bringAttentionToComplication(tappedComplication.id)
+                    complicationsManager.displayPressedAnimation(tappedComplication.id)
 
                     lastTappedComplicationId = tappedComplication.id
 
@@ -957,7 +938,7 @@
                     }
                 }
             }
-            TapType.TOUCH -> {
+            TapType.DOWN -> {
                 // Make sure the user isn't doing a swipe.
                 if (tappedComplication.id != lastTappedComplicationId &&
                     lastTappedComplicationId != null
@@ -989,8 +970,8 @@
         writer.println("pendingUpdateTime=${pendingUpdateTime.isPending()}")
         writer.println("lastTappedComplicationId=$lastTappedComplicationId")
         writer.println("lastTappedPosition=$lastTappedPosition")
-        writer.println("userStyleRepository.userStyle=${userStyleRepository.userStyle}")
-        writer.println("userStyleRepository.schema=${userStyleRepository.schema}")
+        writer.println("currentUserStyleRepository.userStyle=${userStyleRepository.userStyle}")
+        writer.println("currentUserStyleRepository.schema=${userStyleRepository.schema}")
         watchState.dump(writer)
         complicationsManager.dump(writer)
         renderer.dump(writer)

wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt
index 3cf69f9..4c09670 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt
@@ -49,17 +49,17 @@
 import androidx.wear.complications.SystemProviders.ProviderId
 import androidx.wear.complications.data.ComplicationData
 import androidx.wear.complications.data.ComplicationType
-import androidx.wear.complications.data.asApiComplicationData
+import androidx.wear.complications.data.toApiComplicationData
 import androidx.wear.utility.AsyncTraceEvent
 import androidx.wear.utility.TraceEvent
 import androidx.wear.watchface.control.HeadlessWatchFaceImpl
 import androidx.wear.watchface.control.IInteractiveWatchFaceSysUI
 import androidx.wear.watchface.control.InteractiveInstanceManager
 import androidx.wear.watchface.control.InteractiveWatchFaceImpl
-import androidx.wear.watchface.control.data.ComplicationScreenshotParams
+import androidx.wear.watchface.control.data.ComplicationRenderParams
 import androidx.wear.watchface.control.data.HeadlessWatchFaceInstanceParams
 import androidx.wear.watchface.control.data.WallpaperInteractiveWatchFaceInstanceParams
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams
+import androidx.wear.watchface.control.data.WatchFaceRenderParams
 import androidx.wear.watchface.data.ComplicationStateWireFormat
 import androidx.wear.watchface.data.DeviceConfig
 import androidx.wear.watchface.data.IdAndComplicationDataWireFormat
@@ -67,7 +67,7 @@
 import androidx.wear.watchface.data.SystemState
 import androidx.wear.watchface.editor.EditorService
 import androidx.wear.watchface.style.UserStyle
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSetting
 import androidx.wear.watchface.style.data.UserStyleWireFormat
 import kotlinx.coroutines.CoroutineScope
@@ -93,29 +93,31 @@
 /** @hide */
 @IntDef(
     value = [
-        TapType.TOUCH,
-        TapType.TOUCH_CANCEL,
-        TapType.TAP
+        TapType.DOWN,
+        TapType.UP,
+        TapType.CANCEL
     ]
 )
 public annotation class TapType {
     public companion object {
-        /** Used in [WatchFaceImpl#onTapCommand] to indicate a "down" touch event on the watch face. */
-        public const val TOUCH: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_TOUCH
+        /**
+         * Used in [WatchFaceImpl#onTapCommand] to indicate a "down" touch event on the watch face.
+         */
+        public const val DOWN: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_DOWN
 
         /**
-         * Used in [WatchFaceImpl#onTapCommand] to indicate that a previous TapType.TOUCH touch event
-         * has been canceled. This generally happens when the watch face is touched but then a
+         * Used in [WatchFaceImpl#onTapCommand] to indicate that a previous [TapType.DOWN] touch
+         * event has been canceled. This generally happens when the watch face is touched but then a
          * move or long press occurs.
          */
-        public const val TOUCH_CANCEL: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_TOUCH_CANCEL
+        public const val CANCEL: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_CANCEL
 
         /**
          * Used in [WatchFaceImpl#onTapCommand] to indicate that an "up" event on the watch face has
-         * occurred that has not been consumed by another activity. A TapType.TOUCH will always
-         * occur first. This event will not occur if a TapType.TOUCH_CANCEL is sent.
+         * occurred that has not been consumed by another activity. A [TapType.DOWN] will always
+         * occur first. This event will not occur if a [TapType.CANCEL] is sent.
          */
-        public const val TAP: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_TAP
+        public const val UP: Int = IInteractiveWatchFaceSysUI.TAP_TYPE_UP
     }
 }
 
@@ -136,7 +138,7 @@
  *
  * Watch face styling (color and visual look of watch face elements such as numeric fonts, watch
  * hands and ticks, etc...) is directly supported via [UserStyleSetting] and
- * [UserStyleRepository].
+ * [CurrentUserStyleRepository].
  *
  * To aid debugging watch face animations, WatchFaceService allows you to speed up or slow down
  * time, and to loop between two instants.  This is controlled by MOCK_TIME_INTENT intents
@@ -223,29 +225,40 @@
         private const val DIRECT_BOOT_PREFS = "directboot.prefs"
     }
 
-    /** Override this factory method to create your WatchFaceImpl. */
+    /**
+     * Override this factory method to create your WatchFaceImpl. This method will be called by the
+     * library on the UiThread. If possible any expensive initialization should be done on a
+     * background thread.
+     *
+     * @param surfaceHolder The [SurfaceHolder] to pass to the [Renderer]'s constructor.
+     * @param watchState The [WatchState] for the watch face.
+     * @return A [WatchFace] whose [Renderer] uses the provided [surfaceHolder].
+     */
+    @UiThread
     protected abstract suspend fun createWatchFace(
         surfaceHolder: SurfaceHolder,
         watchState: WatchState
     ): WatchFace
 
-    // Creates an interactive engine for WallpaperService.
+    /** Creates an interactive engine for WallpaperService. */
     final override fun onCreateEngine(): Engine = EngineWrapper(getHandler(), false)
 
-    // Creates a headless engine.
+    /** Creates a headless engine. */
     internal fun createHeadlessEngine(): Engine = EngineWrapper(getHandler(), true)
 
-    // This is open to allow mocking.
+    /** This is open to allow mocking. */
     internal open fun getHandler() = Handler(Looper.getMainLooper())
 
-    // This is open to allow mocking.
+    /** This is open to allow mocking. */
     internal open fun getMutableWatchState() = MutableWatchState()
 
-    // This is open for use by tests.
+    /** This is open for use by tests. */
     internal open fun allowWatchFaceToAnimate() = true
 
-    // Whether or not the pre R style init flow (SET_BINDER wallpaper command) is expected.
-    // This is open for use by tests.
+    /**
+     * Whether or not the pre R style init flow (SET_BINDER wallpaper command) is expected.
+     * This is open for use by tests.
+     */
     internal open fun expectPreRInitFlow() = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
 
     /**
@@ -539,11 +552,11 @@
                             ComplicationType.toWireTypes(it.value.supportedTypes),
                             it.value.defaultProviderPolicy.providersAsList(),
                             it.value.defaultProviderPolicy.systemProviderFallback,
-                            it.value.defaultProviderType.asWireComplicationType(),
+                            it.value.defaultProviderType.toWireComplicationType(),
                             it.value.enabled,
                             it.value.initiallyEnabled,
-                            it.value.renderer.getData()?.type?.asWireComplicationType()
-                                ?: ComplicationType.NO_DATA.asWireComplicationType(),
+                            it.value.renderer.getData()?.type?.toWireComplicationType()
+                                ?: ComplicationType.NO_DATA.toWireComplicationType(),
                             it.value.fixedComplicationProvider,
                             it.value.configExtras
                         )
@@ -559,7 +572,7 @@
                 for (idAndComplicationData in complicationDatumWireFormats) {
                     watchFaceImpl.onComplicationDataUpdate(
                         idAndComplicationData.id,
-                        idAndComplicationData.complicationData.asApiComplicationData()
+                        idAndComplicationData.complicationData.toApiComplicationData()
                     )
                 }
             } else {
@@ -567,7 +580,7 @@
                     pendingComplicationDataUpdates.add(
                         PendingComplicationData(
                             idAndComplicationData.id,
-                            idAndComplicationData.complicationData.asApiComplicationData()
+                            idAndComplicationData.complicationData.toApiComplicationData()
                         )
                     )
                 }
@@ -594,9 +607,9 @@
 
         @UiThread
         @RequiresApi(27)
-        fun takeWatchFaceScreenshot(
-            params: WatchfaceScreenshotParams
-        ): Bundle = TraceEvent("EngineWrapper.takeWatchFaceScreenshot").use {
+        fun renderWatchFaceToBitmap(
+            params: WatchFaceRenderParams
+        ): Bundle = TraceEvent("EngineWrapper.renderWatchFaceToBitmap").use {
             val oldStyle = HashMap(watchFaceImpl.userStyleRepository.userStyle.selectedOptions)
             params.userStyle?.let {
                 watchFaceImpl.onSetStyleInternal(
@@ -613,7 +626,7 @@
             params.idAndComplicationDatumWireFormats?.let {
                 for (idAndData in it) {
                     watchFaceImpl.complicationsManager[idAndData.id]!!.renderer
-                        .setData(idAndData.complicationData.asApiComplicationData(), false)
+                        .loadData(idAndData.complicationData.toApiComplicationData(), false)
                 }
             }
 
@@ -631,7 +644,7 @@
 
             if (params.idAndComplicationDatumWireFormats != null) {
                 for ((id, data) in oldComplicationData) {
-                    watchFaceImpl.complicationsManager[id]!!.renderer.setData(data, false)
+                    watchFaceImpl.complicationsManager[id]!!.renderer.loadData(data, false)
                 }
             }
 
@@ -640,9 +653,9 @@
 
         @UiThread
         @RequiresApi(27)
-        fun takeComplicationScreenshot(
-            params: ComplicationScreenshotParams
-        ): Bundle? = TraceEvent("EngineWrapper.takeComplicationScreenshot").use {
+        fun renderComplicationToBitmap(
+            params: ComplicationRenderParams
+        ): Bundle? = TraceEvent("EngineWrapper.renderComplicationToBitmap").use {
             val calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")).apply {
                 timeInMillis = params.calendarTimeMillis
             }
@@ -666,8 +679,8 @@
                 val screenshotComplicationData = params.complicationData
                 if (screenshotComplicationData != null) {
                     prevData = it.renderer.getData()
-                    it.renderer.setData(
-                        screenshotComplicationData.asApiComplicationData(),
+                    it.renderer.loadData(
+                        screenshotComplicationData.toApiComplicationData(),
                         false
                     )
                 }
@@ -682,7 +695,7 @@
 
                 // Restore previous ComplicationData & style if required.
                 if (params.complicationData != null) {
-                    it.renderer.setData(prevData, false)
+                    it.renderer.loadData(prevData, false)
                 }
 
                 if (newStyle != null) {
@@ -816,15 +829,15 @@
                     }
                 Constants.COMMAND_TAP ->
                     uiThreadHandler.runOnHandlerWithTracing("onCommand COMMAND_TAP") {
-                        sendTouchEvent(x, y, TapType.TAP)
+                        sendTouchEvent(x, y, TapType.UP)
                     }
                 Constants.COMMAND_TOUCH ->
                     uiThreadHandler.runOnHandlerWithTracing("onCommand COMMAND_TOUCH") {
-                        sendTouchEvent(x, y, TapType.TOUCH)
+                        sendTouchEvent(x, y, TapType.DOWN)
                     }
                 Constants.COMMAND_TOUCH_CANCEL ->
                     uiThreadHandler.runOnHandlerWithTracing("onCommand COMMAND_TOUCH_CANCEL") {
-                        sendTouchEvent(x, y, TapType.TOUCH_CANCEL)
+                        sendTouchEvent(x, y, TapType.CANCEL)
                     }
                 else -> {
                 }
@@ -1167,7 +1180,7 @@
                 extras.getParcelable(Constants.EXTRA_COMPLICATION_DATA)!!
             setComplicationData(
                 extras.getInt(Constants.EXTRA_COMPLICATION_ID),
-                complicationData.asApiComplicationData()
+                complicationData.toApiComplicationData()
             )
         }
 
@@ -1327,9 +1340,12 @@
  * Runs the supplied task on the handler thread. If we're not on the handler thread a task is posted
  * and we block until it's been processed.
  *
- * AIDL calls are dispatched from a thread pool, but for simplicity WatchFaceImpl code is
- * largely single threaded so we need to post tasks to the UI thread and wait for them to
- * execute.
+ * AIDL calls are dispatched from a thread pool, but for simplicity WatchFaceImpl code is largely
+ * single threaded so we need to post tasks to the UI thread and wait for them to execute.
+ *
+ * @param traceEventName The name of the trace event to emit.
+ * @param task The task to post on the handler.
+ * @return [R] the return value of [task].
  */
 internal fun <R> Handler.runOnHandlerWithTracing(
     traceEventName: String,

wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchState.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchState.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchState.kt
index ca727d8..7caeaed 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchState.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/WatchState.kt
@@ -23,55 +23,43 @@
 /**
  * Describes the current state of the wearable including some hardware details such as whether or
  * not it supports burn in prevention and low-bit ambient.
+ *
+ * @param interruptionFilter The current user interruption settings. See [NotificationManager].
+ *     Based on the value the watch face should adjust the amount of information it displays. For
+ *     example, if it displays the number of pending emails, it should hide it if
+ *     interruptionFilter is equal to [NotificationManager.INTERRUPTION_FILTER_NONE].
+ *     `interruptionFilter` can be [NotificationManager.INTERRUPTION_FILTER_NONE],
+ *     [NotificationManager.INTERRUPTION_FILTER_PRIORITY],
+ *     [NotificationManager.INTERRUPTION_FILTER_ALL],
+ *     [NotificationManager.INTERRUPTION_FILTER_ALARMS], or
+ *     [NotificationManager.INTERRUPTION_FILTER_UNKNOWN].
+ * @param isAmbient Whether or not the watch is in ambient mode. The watch face should switch to a
+ *     simplified low intensity display when in ambient mode. E.g. if the watch face displays
+ *     seconds, it should hide them in ambient mode.
+ * @param isBatteryLowAndNotCharging Whether or not we should conserve power due to a low battery
+ *     which isn't charging. Only valid if
+ *     [android.support.wearable.watchface.WatchFaceStyle.hideNotificationIndicator] is true.
+ * @param isVisible Whether or not the watch face is visible.
+ * @param hasLowBitAmbient Whether or not the watch hardware supports low bit ambient support.
+ * @param hasBurnInProtection Whether or not the watch hardware supports burn in protection.
+ * @param analogPreviewReferenceTimeMillis UTC reference time for previews of analog watch faces in
+ *     milliseconds since the epoch.
+ * @param digitalPreviewReferenceTimeMillis UTC reference time for previews of digital watch faces
+ *     in milliseconds since the epoch.
+ * @param isHeadless Whether or not this is a headless watchface.
  */
 public class WatchState(
-    /**
-     * The current user interruption settings. See [NotificationManager]. Based on the value
-     * the watch face should adjust the amount of information it displays. For example, if it
-     * displays the number of pending emails, it should hide it if interruptionFilter is equal to
-     * [NotificationManager.INTERRUPTION_FILTER_NONE]. `interruptionFilter` can be
-     * [NotificationManager.INTERRUPTION_FILTER_NONE],
-     * [NotificationManager.INTERRUPTION_FILTER_PRIORITY],
-     * [NotificationManager.INTERRUPTION_FILTER_ALL],
-     * [NotificationManager.INTERRUPTION_FILTER_ALARMS], or
-     * [NotificationManager.INTERRUPTION_FILTER_UNKNOWN].
-     */
     public val interruptionFilter: ObservableWatchData<Int>,
-
-    /**
-     * Whether or not the watch is in ambient mode. The watch face should switch to a simplified low
-     * intensity display when in ambient mode. E.g. if the watch face displays seconds, it should
-     * hide them in ambient mode.
-     */
     public val isAmbient: ObservableWatchData<Boolean>,
-
-    /**
-     * Whether or not we should conserve power due to a low battery which isn't charging. Only
-     * valid if [android.support.wearable.watchface.WatchFaceStyle.hideNotificationIndicator] is
-     * true.
-     *
-     * @hide
-     */
+    /** @hide */
     public val isBatteryLowAndNotCharging: ObservableWatchData<Boolean>,
-
-    /** Whether or not the watch face is visible. */
     public val isVisible: ObservableWatchData<Boolean>,
-
-    /** Whether or not the watch hardware supports low bit ambient support. */
     @get:JvmName("hasLowBitAmbient")
     public val hasLowBitAmbient: Boolean,
-
-    /** Whether or not the watch hardware supports burn in protection. */
     @get:JvmName("hasBurnInProtection")
     public val hasBurnInProtection: Boolean,
-
-    /** UTC reference time for previews of analog watch faces in milliseconds since the epoch. */
     public val analogPreviewReferenceTimeMillis: Long,
-
-    /** UTC reference time for previews of digital watch faces in milliseconds since the epoch. */
     public val digitalPreviewReferenceTimeMillis: Long,
-
-    /** Whether or not this is a headless watchface. */
     public val isHeadless: Boolean
 ) {
     @UiThread

wear/wear-watchface/src/main/java/androidx/wear/watchface/control/HeadlessWatchFaceImpl.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/HeadlessWatchFaceImpl.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/HeadlessWatchFaceImpl.kt
index 3fb6e55..effcd4a 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/HeadlessWatchFaceImpl.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/HeadlessWatchFaceImpl.kt
@@ -21,8 +21,8 @@
 import androidx.annotation.UiThread
 import androidx.wear.watchface.IndentingPrintWriter
 import androidx.wear.watchface.WatchFaceService
-import androidx.wear.watchface.control.data.ComplicationScreenshotParams
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams
+import androidx.wear.watchface.control.data.ComplicationRenderParams
+import androidx.wear.watchface.control.data.WatchFaceRenderParams
 import androidx.wear.watchface.runOnHandlerWithTracing
 
 /**
@@ -63,9 +63,9 @@
 
     override fun getApiVersion() = IHeadlessWatchFace.API_VERSION
 
-    override fun takeWatchFaceScreenshot(params: WatchfaceScreenshotParams) =
-        uiThreadHandler.runOnHandlerWithTracing("HeadlessWatchFaceImpl.takeWatchFaceScreenshot") {
-            engine!!.takeWatchFaceScreenshot(params)
+    override fun renderWatchFaceToBitmap(params: WatchFaceRenderParams) =
+        uiThreadHandler.runOnHandlerWithTracing("HeadlessWatchFaceImpl.renderWatchFaceToBitmap") {
+            engine!!.renderWatchFaceToBitmap(params)
         }
 
     override fun getPreviewReferenceTimeMillis() = engine!!.watchFaceImpl.previewReferenceTimeMillis
@@ -75,11 +75,11 @@
             engine!!.getComplicationState()
         }
 
-    override fun takeComplicationScreenshot(params: ComplicationScreenshotParams) =
+    override fun renderComplicationToBitmap(params: ComplicationRenderParams) =
         uiThreadHandler.runOnHandlerWithTracing(
-            "HeadlessWatchFaceImpl.takeComplicationScreenshot"
+            "HeadlessWatchFaceImpl.renderComplicationToBitmap"
         ) {
-            engine!!.takeComplicationScreenshot(params)
+            engine!!.renderComplicationToBitmap(params)
         }
 
     override fun getUserStyleSchema() =

wear/wear-watchface/src/main/java/androidx/wear/watchface/control/InteractiveWatchFaceImpl.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/InteractiveWatchFaceImpl.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/InteractiveWatchFaceImpl.kt
index 94abf99..98a93ec 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/InteractiveWatchFaceImpl.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/InteractiveWatchFaceImpl.kt
@@ -20,7 +20,7 @@
 import android.support.wearable.watchface.accessibility.ContentDescriptionLabel
 import androidx.annotation.RequiresApi
 import androidx.wear.watchface.WatchFaceService
-import androidx.wear.watchface.control.data.WatchfaceScreenshotParams
+import androidx.wear.watchface.control.data.WatchFaceRenderParams
 import androidx.wear.watchface.data.IdAndComplicationDataWireFormat
 import androidx.wear.watchface.data.SystemState
 import androidx.wear.watchface.runOnHandlerWithTracing
@@ -58,9 +58,9 @@
             engine.watchFaceImpl.complicationsManager.getContentDescriptionLabels()
         }
 
-    override fun takeWatchFaceScreenshot(params: WatchfaceScreenshotParams) =
-        uiThreadHandler.runOnHandlerWithTracing("SysUiApi.takeWatchFaceScreenshot") {
-            engine.takeWatchFaceScreenshot(params)
+    override fun renderWatchFaceToBitmap(params: WatchFaceRenderParams) =
+        uiThreadHandler.runOnHandlerWithTracing("SysUiApi.renderWatchFaceToBitmap") {
+            engine.renderWatchFaceToBitmap(params)
         }
 
     override fun getPreviewReferenceTimeMillis() = engine.watchFaceImpl.previewReferenceTimeMillis
@@ -103,14 +103,14 @@
         }
     }
 
-    override fun takeWatchFaceScreenshot(params: WatchfaceScreenshotParams) =
-        uiThreadHandler.runOnHandlerWithTracing("WCSApi.takeWatchFaceScreenshot") {
-            engine.takeWatchFaceScreenshot(params)
+    override fun renderWatchFaceToBitmap(params: WatchFaceRenderParams) =
+        uiThreadHandler.runOnHandlerWithTracing("WCSApi.renderWatchFaceToBitmap") {
+            engine.renderWatchFaceToBitmap(params)
         }
 
     override fun getPreviewReferenceTimeMillis() = engine.watchFaceImpl.previewReferenceTimeMillis
 
-    override fun updateInstance(
+    override fun updateWatchfaceInstance(
         newInstanceId: String,
         userStyle: UserStyleWireFormat
     ) {
@@ -144,7 +144,7 @@
 
     override fun bringAttentionToComplication(id: Int) {
         uiThreadHandler.runOnHandlerWithTracing("WCSApi.bringAttentionToComplication") {
-            engine.watchFaceImpl.complicationsManager.bringAttentionToComplication(id)
+            engine.watchFaceImpl.complicationsManager.displayPressedAnimation(id)
         }
     }
 }

wear/wear-watchface/src/main/java/androidx/wear/watchface/control/WatchFaceControlService.kt

diff --git a/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/WatchFaceControlService.kt b/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/WatchFaceControlService.kt
index 5a56f24..5a07abc 100644
--- a/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/WatchFaceControlService.kt
+++ b/wear/wear-watchface/src/main/java/androidx/wear/watchface/control/WatchFaceControlService.kt
@@ -79,7 +79,12 @@
     }
 }
 
-/** Factory for use by on watch face editors to create [IWatchFaceControlService]. */
+/**
+ * Factory for use by on watch face editors to create [IWatchFaceControlService].
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 @RequiresApi(27)
 public class WatchFaceControlServiceFactory {
     public companion object {

wear/wear-watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt

diff --git a/wear/wear-watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt b/wear/wear-watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt
index 719ede7..6192174 100644
--- a/wear/wear-watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt
+++ b/wear/wear-watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt
@@ -28,7 +28,7 @@
 import androidx.wear.watchface.data.DeviceConfig
 import androidx.wear.watchface.data.SystemState
 import androidx.wear.watchface.style.UserStyle
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.mock
@@ -94,7 +94,7 @@
     private val surfaceHolder = mock<SurfaceHolder>()
     private var looperTimeMillis = 0L
     private val pendingTasks = PriorityQueue<Task>()
-    private val userStyleRepository = UserStyleRepository(UserStyleSchema(emptyList()))
+    private val userStyleRepository = CurrentUserStyleRepository(UserStyleSchema(emptyList()))
     private val initParams = WallpaperInteractiveWatchFaceInstanceParams(
         "instanceId",
         DeviceConfig(

wear/wear-watchface/src/test/java/androidx/wear/watchface/TestCommon.kt

diff --git a/wear/wear-watchface/src/test/java/androidx/wear/watchface/TestCommon.kt b/wear/wear-watchface/src/test/java/androidx/wear/watchface/TestCommon.kt
index 5796be5..15e579e 100644
--- a/wear/wear-watchface/src/test/java/androidx/wear/watchface/TestCommon.kt
+++ b/wear/wear-watchface/src/test/java/androidx/wear/watchface/TestCommon.kt
@@ -31,10 +31,10 @@
 import android.support.wearable.watchface.accessibility.ContentDescriptionLabel
 import android.view.SurfaceHolder
 import androidx.test.core.app.ApplicationProvider
-import androidx.wear.complications.data.asApiComplicationData
+import androidx.wear.complications.data.toApiComplicationData
 import androidx.wear.watchface.control.data.WallpaperInteractiveWatchFaceInstanceParams
 import androidx.wear.watchface.style.UserStyle
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import org.junit.runners.model.FrameworkMethod
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.internal.bytecode.InstrumentationConfiguration
@@ -43,7 +43,7 @@
     @WatchFaceType private val watchFaceType: Int,
     private val complicationsManager: ComplicationsManager,
     private val renderer: TestRenderer,
-    private val userStyleRepository: UserStyleRepository,
+    private val currentUserStyleRepository: CurrentUserStyleRepository,
     private val watchState: MutableWatchState,
     private val handler: Handler,
     private val tapListener: WatchFace.TapListener?,
@@ -57,8 +57,8 @@
     var lastUserStyle: UserStyle? = null
 
     init {
-        userStyleRepository.addUserStyleListener(
-            object : UserStyleRepository.UserStyleListener {
+        currentUserStyleRepository.addUserStyleChangeListener(
+            object : CurrentUserStyleRepository.UserStyleChangeListener {
                 override fun onUserStyleChanged(userStyle: UserStyle) {
                     lastUserStyle = userStyle
                 }
@@ -94,7 +94,7 @@
         watchState: WatchState
     ) = WatchFace(
         watchFaceType,
-        userStyleRepository,
+        currentUserStyleRepository,
         renderer,
         complicationsManager
     ).setSystemTimeProvider(object : WatchFace.SystemTimeProvider {
@@ -179,16 +179,20 @@
             watchFaceComplicationId, providers, fallbackSystemProvider, type
         )
     }
+
+    override fun reserved8() {
+        iWatchFaceService.reserved8()
+    }
 }
 
 open class TestRenderer(
     surfaceHolder: SurfaceHolder,
-    userStyleRepository: UserStyleRepository,
+    currentUserStyleRepository: CurrentUserStyleRepository,
     watchState: WatchState,
     interactiveFrameRateMs: Long
 ) : Renderer.CanvasRenderer(
     surfaceHolder,
-    userStyleRepository,
+    currentUserStyleRepository,
     watchState,
     CanvasType.HARDWARE,
     interactiveFrameRateMs
@@ -214,7 +218,7 @@
                 ApplicationProvider.getApplicationContext(), 0,
                 Intent("Fake intent"), 0
             )
-        ).build().asApiComplicationData()
+        ).build().toApiComplicationData()
 
 /**
  * We need to prevent roboloetric from instrumenting our classes or things break...

wear/wear-watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt

diff --git a/wear/wear-watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt b/wear/wear-watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt
index abd55ea..78f2a5c 100644
--- a/wear/wear-watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt
+++ b/wear/wear-watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt
@@ -52,7 +52,7 @@
 import androidx.wear.watchface.data.SystemState
 import androidx.wear.watchface.style.Layer
 import androidx.wear.watchface.style.UserStyle
-import androidx.wear.watchface.style.UserStyleRepository
+import androidx.wear.watchface.style.CurrentUserStyleRepository
 import androidx.wear.watchface.style.UserStyleSchema
 import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting
 import androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting.ComplicationOverlay
@@ -165,7 +165,7 @@
                 complicationDrawableLeft,
                 watchState.asWatchState()
             ).apply {
-                setData(createComplicationData(), false)
+                loadData(createComplicationData(), false)
             },
             listOf(
                 ComplicationType.RANGED_VALUE,
@@ -186,7 +186,7 @@
                 complicationDrawableRight,
                 watchState.asWatchState()
             ).apply {
-                setData(createComplicationData(), false)
+                loadData(createComplicationData(), false)
             },
             listOf(
                 ComplicationType.RANGED_VALUE,
@@ -207,7 +207,7 @@
                 complicationDrawableBackground,
                 watchState.asWatchState()
             ).apply {
-                setData(createComplicationData(), false)
+                loadData(createComplicationData(), false)
             },
             listOf(
                 ComplicationType.PHOTO_IMAGE
@@ -276,7 +276,7 @@
 
     private lateinit var renderer: TestRenderer
     private lateinit var complicationsManager: ComplicationsManager
-    private lateinit var userStyleRepository: UserStyleRepository
+    private lateinit var currentUserStyleRepository: CurrentUserStyleRepository
     private lateinit var watchFaceImpl: WatchFaceImpl
     private lateinit var testWatchFaceService: TestWatchFaceService
     private lateinit var engineWrapper: WatchFaceService.EngineWrapper
@@ -320,11 +320,11 @@
         hasBurnInProtection: Boolean = false,
         tapListener: WatchFace.TapListener? = null
     ) {
-        userStyleRepository = UserStyleRepository(userStyleSchema)
-        complicationsManager = ComplicationsManager(complications, userStyleRepository)
+        currentUserStyleRepository = CurrentUserStyleRepository(userStyleSchema)
+        complicationsManager = ComplicationsManager(complications, currentUserStyleRepository)
         renderer = TestRenderer(
             surfaceHolder,
-            userStyleRepository,
+            currentUserStyleRepository,
             watchState.asWatchState(),
             INTERACTIVE_UPDATE_RATE_MS
         )
@@ -332,7 +332,7 @@
             watchFaceType,
             complicationsManager,
             renderer,
-            userStyleRepository,
+            currentUserStyleRepository,
             watchState,
             handler,
             tapListener,
@@ -358,11 +358,11 @@
         userStyleSchema: UserStyleSchema,
         wallpaperInteractiveWatchFaceInstanceParams: WallpaperInteractiveWatchFaceInstanceParams
     ) {
-        userStyleRepository = UserStyleRepository(userStyleSchema)
-        complicationsManager = ComplicationsManager(complications, userStyleRepository)
+        currentUserStyleRepository = CurrentUserStyleRepository(userStyleSchema)
+        complicationsManager = ComplicationsManager(complications, currentUserStyleRepository)
         renderer = TestRenderer(
             surfaceHolder,
-            userStyleRepository,
+            currentUserStyleRepository,
             watchState.asWatchState(),
             INTERACTIVE_UPDATE_RATE_MS
         )
@@ -370,7 +370,7 @@
             watchFaceType,
             complicationsManager,
             renderer,
-            userStyleRepository,
+            currentUserStyleRepository,
             watchState,
             handler,
             null,
@@ -639,8 +639,8 @@
 
     private fun tapAt(x: Int, y: Int) {
         // The eventTime is ignored.
-        watchFaceImpl.onTapCommand(TapType.TOUCH, x, y)
-        watchFaceImpl.onTapCommand(TapType.TAP, x, y)
+        watchFaceImpl.onTapCommand(TapType.DOWN, x, y)
+        watchFaceImpl.onTapCommand(TapType.UP, x, y)
     }
 
     private fun doubleTapAt(x: Int, y: Int, delayMillis: Long) {
@@ -658,8 +658,8 @@
     }
 
     private fun tapCancelAt(x: Int, y: Int) {
-        watchFaceImpl.onTapCommand(TapType.TOUCH, x, y)
-        watchFaceImpl.onTapCommand(TapType.TOUCH_CANCEL, x, y)
+        watchFaceImpl.onTapCommand(TapType.DOWN, x, y)
+        watchFaceImpl.onTapCommand(TapType.CANCEL, x, y)
     }
 
     @Test
@@ -792,13 +792,13 @@
 
         testWatchFaceService.reset()
         // Tap down left Complication
-        watchFaceImpl.onTapCommand(TapType.TOUCH, 30, 50)
+        watchFaceImpl.onTapCommand(TapType.DOWN, 30, 50)
 
         // Tap down at right complication
-        watchFaceImpl.onTapCommand(TapType.TOUCH, 70, 50)
+        watchFaceImpl.onTapCommand(TapType.DOWN, 70, 50)
 
         // Now Tap cancel at the second position
-        watchFaceImpl.onTapCommand(TapType.TOUCH_CANCEL, 70, 50)
+        watchFaceImpl.onTapCommand(TapType.CANCEL, 70, 50)
         runPostedTasksFor(ViewConfiguration.getDoubleTapTimeout().toLong())
         assertThat(testWatchFaceService.complicationSingleTapped).isEqualTo(RIGHT_COMPLICATION_ID)
         assertThat(testWatchFaceService.singleTapCount).isEqualTo(1)
@@ -814,9 +814,9 @@
 
         testWatchFaceService.reset()
         // Tap down at a position in left Complication
-        watchFaceImpl.onTapCommand(TapType.TOUCH, 30, 50)
+        watchFaceImpl.onTapCommand(TapType.DOWN, 30, 50)
         // Tap cancel at different position stillin left Complication
-        watchFaceImpl.onTapCommand(TapType.TOUCH_CANCEL, 32, 50)
+        watchFaceImpl.onTapCommand(TapType.CANCEL, 32, 50)
 
         runPostedTasksFor(ViewConfiguration.getDoubleTapTimeout().toLong())
         assertThat(testWatchFaceService.complicationSingleTapped).isNull()
@@ -860,8 +860,8 @@
         // Tap on nothing.
         tapAt(1, 1)
 
-        verify(tapListener).onTap(TapType.TOUCH, 1, 1)
-        verify(tapListener).onTap(TapType.TAP, 1, 1)
+        verify(tapListener).onTap(TapType.DOWN, 1, 1)
+        verify(tapListener).onTap(TapType.UP, 1, 1)
     }
 
     @Test
@@ -876,8 +876,8 @@
         // Tap right complication.
         tapAt(70, 50)
 
-        verify(tapListener, times(0)).onTap(TapType.TOUCH, 70, 50)
-        verify(tapListener, times(0)).onTap(TapType.TAP, 70, 50)
+        verify(tapListener, times(0)).onTap(TapType.DOWN, 70, 50)
+        verify(tapListener, times(0)).onTap(TapType.UP, 70, 50)
     }
 
     @Test
@@ -1062,7 +1062,7 @@
         )
 
         // This should get persisted.
-        userStyleRepository.userStyle = UserStyle(
+        currentUserStyleRepository.userStyle = UserStyle(
             hashMapOf(
                 colorStyleSetting to blueStyleOption,
                 watchHandStyleSetting to gothicStyleOption
@@ -1070,7 +1070,7 @@
         )
         engineWrapper.onDestroy()
 
-        val userStyleRepository2 = UserStyleRepository(
+        val userStyleRepository2 = CurrentUserStyleRepository(
             UserStyleSchema(listOf(colorStyleSetting, watchHandStyleSetting))
         )
 
@@ -1137,11 +1137,11 @@
         )
 
         // The style option above should get applied during watch face creation.
-        assertThat(userStyleRepository.userStyle.selectedOptions[colorStyleSetting]!!.id)
+        assertThat(currentUserStyleRepository.userStyle.selectedOptions[colorStyleSetting]!!.id)
             .isEqualTo(
                 blueStyleOption.id
             )
-        assertThat(userStyleRepository.userStyle.selectedOptions[watchHandStyleSetting]!!.id)
+        assertThat(currentUserStyleRepository.userStyle.selectedOptions[watchHandStyleSetting]!!.id)
             .isEqualTo(
                 gothicStyleOption.id
             )
@@ -1167,7 +1167,7 @@
             )
         )
 
-        assertThat(userStyleRepository.userStyle.selectedOptions[watchHandStyleSetting])
+        assertThat(currentUserStyleRepository.userStyle.selectedOptions[watchHandStyleSetting])
             .isEqualTo(watchHandStyleList.first())
     }
 
@@ -1406,7 +1406,7 @@
     @Test
     public fun requestStyleBeforeSetBinder() {
         var userStyleRepository =
-            UserStyleRepository(UserStyleSchema(emptyList()))
+            CurrentUserStyleRepository(UserStyleSchema(emptyList()))
         var testRenderer = TestRenderer(
             surfaceHolder,
             userStyleRepository,
@@ -1420,7 +1420,7 @@
                 userStyleRepository
             ),
             testRenderer,
-            UserStyleRepository(UserStyleSchema(emptyList())),
+            CurrentUserStyleRepository(UserStyleSchema(emptyList())),
             watchState,
             handler,
             null,
@@ -1626,7 +1626,7 @@
 
     @Test
     public fun shouldAnimateOverrideControlsEnteringAmbientMode() {
-        var userStyleRepository = UserStyleRepository(UserStyleSchema(emptyList()))
+        var userStyleRepository = CurrentUserStyleRepository(UserStyleSchema(emptyList()))
         var testRenderer = object : TestRenderer(
             surfaceHolder,
             userStyleRepository,
@@ -1640,7 +1640,7 @@
             WatchFaceType.ANALOG,
             ComplicationsManager(emptyList(), userStyleRepository),
             testRenderer,
-            UserStyleRepository(UserStyleSchema(emptyList())),
+            CurrentUserStyleRepository(UserStyleSchema(emptyList())),
             watchState,
             handler,
             null,
@@ -1679,9 +1679,9 @@
         )
 
         // Select a new style which turns off both complications.
-        val newStyleA = HashMap(userStyleRepository.userStyle.selectedOptions)
+        val newStyleA = HashMap(currentUserStyleRepository.userStyle.selectedOptions)
         newStyleA[complicationsStyleSetting] = noComplicationsOption
-        userStyleRepository.userStyle = UserStyle(newStyleA)
+        currentUserStyleRepository.userStyle = UserStyle(newStyleA)
 
         runPostedTasksFor(0)
 
@@ -1697,9 +1697,9 @@
         reset(iWatchFaceService)
 
         // Select a new style which turns on only the left complication.
-        val newStyleB = HashMap(userStyleRepository.userStyle.selectedOptions)
+        val newStyleB = HashMap(currentUserStyleRepository.userStyle.selectedOptions)
         newStyleB[complicationsStyleSetting] = leftComplicationsOption
-        userStyleRepository.userStyle = UserStyle(newStyleB)
+        currentUserStyleRepository.userStyle = UserStyle(newStyleB)
 
         runPostedTasksFor(0)
 
@@ -1759,9 +1759,9 @@
         assertTrue(rightComplication.enabled)
 
         // Select left complication only.
-        val newStyleA = HashMap(userStyleRepository.userStyle.selectedOptions)
+        val newStyleA = HashMap(currentUserStyleRepository.userStyle.selectedOptions)
         newStyleA[complicationsStyleSetting] = leftOnlyComplicationsOption
-        userStyleRepository.userStyle = UserStyle(newStyleA)
+        currentUserStyleRepository.userStyle = UserStyle(newStyleA)
 
         runPostedTasksFor(0)
 
@@ -1769,9 +1769,9 @@
         assertFalse(rightComplication.enabled)
 
         // Select right complication only.
-        val newStyleB = HashMap(userStyleRepository.userStyle.selectedOptions)
+        val newStyleB = HashMap(currentUserStyleRepository.userStyle.selectedOptions)
         newStyleB[complicationsStyleSetting] = rightOnlyComplicationsOption
-        userStyleRepository.userStyle = UserStyle(newStyleB)
+        currentUserStyleRepository.userStyle = UserStyle(newStyleB)
 
         runPostedTasksFor(0)
 
@@ -1779,9 +1779,9 @@
         assertTrue(rightComplication.enabled)
 
         // Select both complications.
-        val newStyleC = HashMap(userStyleRepository.userStyle.selectedOptions)
+        val newStyleC = HashMap(currentUserStyleRepository.userStyle.selectedOptions)
         newStyleC[complicationsStyleSetting] = bothComplicationsOption
-        userStyleRepository.userStyle = UserStyle(newStyleC)
+        currentUserStyleRepository.userStyle = UserStyle(newStyleC)
 
         runPostedTasksFor(0)
 
@@ -1984,7 +1984,7 @@
     public fun invalidateRendererBeforeFullInit() {
         renderer = TestRenderer(
             surfaceHolder,
-            UserStyleRepository(UserStyleSchema(emptyList())),
+            CurrentUserStyleRepository(UserStyleSchema(emptyList())),
             watchState.asWatchState(),
             INTERACTIVE_UPDATE_RATE_MS
         )
@@ -2075,11 +2075,11 @@
 
     @Test
     public fun isAmbientInitalisedEvenWithoutPropertiesSent() {
-        userStyleRepository = UserStyleRepository(UserStyleSchema(emptyList()))
-        complicationsManager = ComplicationsManager(emptyList(), userStyleRepository)
+        currentUserStyleRepository = CurrentUserStyleRepository(UserStyleSchema(emptyList()))
+        complicationsManager = ComplicationsManager(emptyList(), currentUserStyleRepository)
         renderer = TestRenderer(
             surfaceHolder,
-            userStyleRepository,
+            currentUserStyleRepository,
             watchState.asWatchState(),
             INTERACTIVE_UPDATE_RATE_MS
         )
@@ -2087,7 +2087,7 @@
             WatchFaceType.ANALOG,
             complicationsManager,
             renderer,
-            userStyleRepository,
+            currentUserStyleRepository,
             watchState,
             handler,
             tapListener,
@@ -2241,7 +2241,7 @@
 
     @Test
     public fun directBoot() {
-        val userStyleRepository = UserStyleRepository(
+        val userStyleRepository = CurrentUserStyleRepository(
             UserStyleSchema(listOf(colorStyleSetting, watchHandStyleSetting))
         )
         val testRenderer = TestRenderer(
@@ -2294,7 +2294,7 @@
 
     @Test
     public fun headlessFlagPreventsDirectBoot() {
-        val userStyleRepository = UserStyleRepository(UserStyleSchema(emptyList()))
+        val userStyleRepository = CurrentUserStyleRepository(UserStyleSchema(emptyList()))
         val testRenderer = TestRenderer(
             surfaceHolder,
             userStyleRepository,

wear/wear/src/androidTest/java/androidx/wear/widget/WearArcLayoutTest.kt

diff --git a/wear/wear/src/androidTest/java/androidx/wear/widget/WearArcLayoutTest.kt b/wear/wear/src/androidTest/java/androidx/wear/widget/WearArcLayoutTest.kt
index a777353..f55d325 100644
--- a/wear/wear/src/androidTest/java/androidx/wear/widget/WearArcLayoutTest.kt
+++ b/wear/wear/src/androidTest/java/androidx/wear/widget/WearArcLayoutTest.kt
@@ -45,7 +45,6 @@
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.filters.FlakyTest
 import androidx.test.filters.MediumTest
 import androidx.test.screenshot.AndroidXScreenshotTestRule
 import androidx.test.screenshot.assertAgainstGolden
@@ -708,7 +707,6 @@
         testEventsFast("touch_fast_screenshot", views)
     }
 
-    @FlakyTest // b/182268136
     @Test(timeout = 10000)
     fun testMarginTouch() {
         val views = createTwoArcsWithMargin()

webkit/integration-tests/testapp/src/main/java/com/example/androidx/webkit/ProxyOverrideActivity.java

diff --git a/webkit/integration-tests/testapp/src/main/java/com/example/androidx/webkit/ProxyOverrideActivity.java b/webkit/integration-tests/testapp/src/main/java/com/example/androidx/webkit/ProxyOverrideActivity.java
index 5d58caf..29f1844 100644
--- a/webkit/integration-tests/testapp/src/main/java/com/example/androidx/webkit/ProxyOverrideActivity.java
+++ b/webkit/integration-tests/testapp/src/main/java/com/example/androidx/webkit/ProxyOverrideActivity.java
@@ -113,7 +113,9 @@
 
     @Override
     protected void onDestroy() {
-        mProxy.shutdown();
+        if (mProxy != null) {
+            mProxy.shutdown();
+        }
         super.onDestroy();
     }
 }

webkit/webkit/src/main/java/androidx/webkit/internal/ScriptHandlerImpl.java

diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ScriptReferenceImpl.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ScriptHandlerImpl.java
similarity index 61%
rename from webkit/webkit/src/main/java/androidx/webkit/internal/ScriptReferenceImpl.java
rename to webkit/webkit/src/main/java/androidx/webkit/internal/ScriptHandlerImpl.java
index 328af59..e882b7b 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/ScriptReferenceImpl.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ScriptHandlerImpl.java
@@ -19,30 +19,30 @@
 import androidx.annotation.NonNull;
 import androidx.webkit.ScriptHandler;
 
-import org.chromium.support_lib_boundary.ScriptReferenceBoundaryInterface;
+import org.chromium.support_lib_boundary.ScriptHandlerBoundaryInterface;
 import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil;
 
 import java.lang.reflect.InvocationHandler;
 
 /**
- * Internal implementation of {@link androidx.webkit.ScriptReference}.
+ * Internal implementation of {@link androidx.webkit.ScriptHandler}.
  */
-public class ScriptReferenceImpl extends ScriptHandler {
-    private ScriptReferenceBoundaryInterface mBoundaryInterface;
+public class ScriptHandlerImpl extends ScriptHandler {
+    private ScriptHandlerBoundaryInterface mBoundaryInterface;
 
-    private ScriptReferenceImpl(@NonNull ScriptReferenceBoundaryInterface boundaryInterface) {
+    private ScriptHandlerImpl(@NonNull ScriptHandlerBoundaryInterface boundaryInterface) {
         mBoundaryInterface = boundaryInterface;
     }
 
     /**
-     * Create an AndroidX ScriptReference from the given InvocationHandler.
+     * Create an AndroidX ScriptHandler from the given InvocationHandler.
      */
-    public static @NonNull ScriptReferenceImpl toScriptHandler(
-            @NonNull /* ScriptReference */ InvocationHandler invocationHandler) {
-        final ScriptReferenceBoundaryInterface boundaryInterface =
+    public static @NonNull ScriptHandlerImpl toScriptHandler(
+            @NonNull /* ScriptHandler */ InvocationHandler invocationHandler) {
+        final ScriptHandlerBoundaryInterface boundaryInterface =
                 BoundaryInterfaceReflectionUtil.castToSuppLibClass(
-                        ScriptReferenceBoundaryInterface.class, invocationHandler);
-        return new ScriptReferenceImpl(boundaryInterface);
+                        ScriptHandlerBoundaryInterface.class, invocationHandler);
+        return new ScriptHandlerImpl(boundaryInterface);
     }
 
     /**

webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java

diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java
index 69a2c41..919c549 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java
@@ -102,9 +102,9 @@
      * Adapter method for {@link WebViewCompat#addWebMessageListener(android.webkit.WebView,
      * String, Set)}
      */
-    public @NonNull ScriptReferenceImpl addDocumentStartJavaScript(
+    public @NonNull ScriptHandlerImpl addDocumentStartJavaScript(
             @NonNull String script, @NonNull String[] allowedOriginRules) {
-        return ScriptReferenceImpl.toScriptHandler(
+        return ScriptHandlerImpl.toScriptHandler(
                 mImpl.addDocumentStartJavaScript(script, allowedOriginRules));
     }
 

window/window-extensions/build.gradle

diff --git a/window/window-extensions/build.gradle b/window/window-extensions/build.gradle
index 5b1a650..384720b 100644
--- a/window/window-extensions/build.gradle
+++ b/window/window-extensions/build.gradle
@@ -31,12 +31,6 @@
     id("com.android.library")
 }
 
-android {
-    defaultConfig {
-        minSdkVersion 14
-    }
-}
-
 dependencies {
     implementation("androidx.annotation:annotation:1.1.0")
 

window/window-samples/src/main/java/androidx/window/sample/backend/ActivityExtensions.kt

diff --git a/window/window-samples/src/main/java/androidx/window/sample/backend/ActivityExtensions.kt b/window/window-samples/src/main/java/androidx/window/sample/backend/ActivityExtensions.kt
index b0d6db3..4a77e93 100644
--- a/window/window-samples/src/main/java/androidx/window/sample/backend/ActivityExtensions.kt
+++ b/window/window-samples/src/main/java/androidx/window/sample/backend/ActivityExtensions.kt
@@ -18,18 +18,13 @@
 
 import android.app.Activity
 import android.graphics.Point
-import android.util.DisplayMetrics
+import androidx.window.WindowManager
 
 /**
  * Return a [Point] whose dimensions match the metrics of the window.
  * @return [Point] whose dimensions match the metrics of the window.
  */
-@Suppress("DEPRECATION")
 internal fun Activity.calculateWindowSizeExt(): Point {
-    val displayMetrics = DisplayMetrics()
-    // TODO(b/159454816) Replace with window metrics.
-    this.windowManager.defaultDisplay
-        .getMetrics(displayMetrics)
-
-    return Point(displayMetrics.widthPixels, displayMetrics.heightPixels)
+    val bounds = WindowManager(this).currentWindowMetrics.bounds
+    return Point(bounds.width(), bounds.height())
 }
\ No newline at end of file

window/window-samples/src/main/java/androidx/window/sample/backend/MidScreenFoldBackend.kt

diff --git a/window/window-samples/src/main/java/androidx/window/sample/backend/MidScreenFoldBackend.kt b/window/window-samples/src/main/java/androidx/window/sample/backend/MidScreenFoldBackend.kt
index af7dbca..cf7b124 100644
--- a/window/window-samples/src/main/java/androidx/window/sample/backend/MidScreenFoldBackend.kt
+++ b/window/window-samples/src/main/java/androidx/window/sample/backend/MidScreenFoldBackend.kt
@@ -19,11 +19,9 @@
 package androidx.window.sample.backend
 
 import android.app.Activity
-import android.content.Context
 import android.graphics.Point
 import android.graphics.Rect
 import androidx.core.util.Consumer
-import androidx.window.DeviceState
 import androidx.window.DisplayFeature
 import androidx.window.FoldingFeature
 import androidx.window.WindowBackend
@@ -76,14 +74,6 @@
         return WindowLayoutInfo.Builder().setDisplayFeatures(featureList).build()
     }
 
-    @Deprecated("Added for compatibility with WindowBackend in sample")
-    override fun registerLayoutChangeCallback(
-        context: Context,
-        executor: Executor,
-        callback: Consumer<WindowLayoutInfo>
-    ) {
-    }
-
     private fun foldRect(windowSize: Point): Rect {
         return when (foldAxis) {
             FoldAxis.LONG_DIMENSION -> longDimensionFold(windowSize)
@@ -107,15 +97,6 @@
         }
     }
 
-    override fun registerDeviceStateChangeCallback(
-        executor: Executor,
-        callback: Consumer<DeviceState>
-    ) {
-    }
-
-    override fun unregisterDeviceStateChangeCallback(callback: Consumer<DeviceState>) {
-    }
-
     override fun registerLayoutChangeCallback(
         activity: Activity,
         executor: Executor,

window/window-sidecar/build.gradle

diff --git a/window/window-sidecar/build.gradle b/window/window-sidecar/build.gradle
index d8b8fd3..36be655 100644
--- a/window/window-sidecar/build.gradle
+++ b/window/window-sidecar/build.gradle
@@ -24,12 +24,6 @@
     id("com.android.library")
 }
 
-android {
-    defaultConfig {
-        minSdkVersion 14
-    }
-}
-
 dependencies {
     implementation("androidx.annotation:annotation:1.1.0")
 }

window/window/api/current.txt

diff --git a/window/window/api/current.txt b/window/window/api/current.txt
index e8f74ed..f17563d 100644
--- a/window/window/api/current.txt
+++ b/window/window/api/current.txt
@@ -50,10 +50,7 @@
   }
 
   public interface WindowBackend {
-    method public void registerDeviceStateChangeCallback(java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.window.DeviceState!>);
     method public void registerLayoutChangeCallback(android.app.Activity, java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.window.WindowLayoutInfo!>);
-    method @Deprecated public void registerLayoutChangeCallback(android.content.Context, java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.window.WindowLayoutInfo!>);
-    method public void unregisterDeviceStateChangeCallback(androidx.core.util.Consumer<androidx.window.DeviceState!>);
     method public void unregisterLayoutChangeCallback(androidx.core.util.Consumer<androidx.window.WindowLayoutInfo!>);
   }
 

window/window/api/public_plus_experimental_current.txt

diff --git a/window/window/api/public_plus_experimental_current.txt b/window/window/api/public_plus_experimental_current.txt
index e8f74ed..f17563d 100644
--- a/window/window/api/public_plus_experimental_current.txt
+++ b/window/window/api/public_plus_experimental_current.txt
@@ -50,10 +50,7 @@
   }
 
   public interface WindowBackend {
-    method public void registerDeviceStateChangeCallback(java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.window.DeviceState!>);
     method public void registerLayoutChangeCallback(android.app.Activity, java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.window.WindowLayoutInfo!>);
-    method @Deprecated public void registerLayoutChangeCallback(android.content.Context, java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.window.WindowLayoutInfo!>);
-    method public void unregisterDeviceStateChangeCallback(androidx.core.util.Consumer<androidx.window.DeviceState!>);
     method public void unregisterLayoutChangeCallback(androidx.core.util.Consumer<androidx.window.WindowLayoutInfo!>);
   }
 

window/window/api/restricted_current.txt

diff --git a/window/window/api/restricted_current.txt b/window/window/api/restricted_current.txt
index e8f74ed..f17563d 100644
--- a/window/window/api/restricted_current.txt
+++ b/window/window/api/restricted_current.txt
@@ -50,10 +50,7 @@
   }
 
   public interface WindowBackend {
-    method public void registerDeviceStateChangeCallback(java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.window.DeviceState!>);
     method public void registerLayoutChangeCallback(android.app.Activity, java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.window.WindowLayoutInfo!>);
-    method @Deprecated public void registerLayoutChangeCallback(android.content.Context, java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.window.WindowLayoutInfo!>);
-    method public void unregisterDeviceStateChangeCallback(androidx.core.util.Consumer<androidx.window.DeviceState!>);
     method public void unregisterLayoutChangeCallback(androidx.core.util.Consumer<androidx.window.WindowLayoutInfo!>);
   }
 

window/window/build.gradle

diff --git a/window/window/build.gradle b/window/window/build.gradle
index 706f6f6..4a24e84 100644
--- a/window/window/build.gradle
+++ b/window/window/build.gradle
@@ -35,9 +35,6 @@
 }
 
 android {
-    defaultConfig {
-        minSdkVersion 14
-    }
     buildTypes.all {
         consumerProguardFiles "proguard-rules.pro"
     }

window/window/src/androidTest/java/androidx/window/ExtensionWindowBackendTest.java

diff --git a/window/window/src/androidTest/java/androidx/window/ExtensionWindowBackendTest.java b/window/window/src/androidTest/java/androidx/window/ExtensionWindowBackendTest.java
index 7a55cb9..2648fb6 100644
--- a/window/window/src/androidTest/java/androidx/window/ExtensionWindowBackendTest.java
+++ b/window/window/src/androidTest/java/androidx/window/ExtensionWindowBackendTest.java
@@ -16,19 +16,12 @@
 
 package androidx.window;
 
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -42,8 +35,6 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 
-import com.google.common.collect.BoundType;
-import com.google.common.collect.Range;
 import com.google.common.util.concurrent.MoreExecutors;
 
 import org.junit.Before;
@@ -104,33 +95,6 @@
     }
 
     @Test
-    public void testRegisterDeviceStateChangeCallback_noExtension() {
-        // Verify method with extension
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        assumeTrue(backend.mWindowExtension == null);
-        SimpleConsumer<DeviceState> simpleConsumer = new SimpleConsumer<>();
-
-        backend.registerDeviceStateChangeCallback(directExecutor(), simpleConsumer);
-
-        DeviceState deviceState = simpleConsumer.lastValue();
-        assertNotNull(deviceState);
-        assertThat(deviceState.getPosture()).isIn(Range.range(
-                DeviceState.POSTURE_UNKNOWN, BoundType.CLOSED,
-                DeviceState.POSTURE_MAX_KNOWN, BoundType.CLOSED));
-        DeviceState initialLastReportedState = backend.mLastReportedDeviceState;
-
-        // Verify method without extension
-        backend.mWindowExtension = null;
-        SimpleConsumer<DeviceState> noExtensionConsumer = new SimpleConsumer<>();
-        backend.registerDeviceStateChangeCallback(directExecutor(), noExtensionConsumer);
-        deviceState = noExtensionConsumer.lastValue();
-        assertNotNull(deviceState);
-        assertEquals(DeviceState.POSTURE_UNKNOWN, deviceState.getPosture());
-        // Verify that last reported state does not change when using the getter
-        assertEquals(initialLastReportedState, backend.mLastReportedDeviceState);
-    }
-
-    @Test
     public void testRegisterLayoutChangeCallback() {
         ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
         backend.mWindowExtension = mock(ExtensionInterfaceCompat.class);
@@ -232,117 +196,6 @@
         assertEquals(expected, consumer.mValues);
     }
 
-    @Test
-    public void testRegisterDeviceChangeCallback() {
-        ExtensionInterfaceCompat mockInterface = mock(
-                ExtensionInterfaceCompat.class);
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        backend.mWindowExtension = mockInterface;
-
-        // Check registering the device state change callback
-        Consumer<DeviceState> consumer = mock(DeviceStateConsumer.class);
-        backend.registerDeviceStateChangeCallback(Runnable::run, consumer);
-
-        assertEquals(1, backend.mDeviceStateChangeCallbacks.size());
-        verify(backend.mWindowExtension).onDeviceStateListenersChanged(eq(false));
-
-        // Check unregistering the device state change callback
-        backend.unregisterDeviceStateChangeCallback(consumer);
-
-        assertTrue(backend.mDeviceStateChangeCallbacks.isEmpty());
-        verify(backend.mWindowExtension).onDeviceStateListenersChanged(eq(true));
-    }
-
-    @Test
-    public void testDeviceChangeCallback() {
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        backend.mWindowExtension = mock(ExtensionInterfaceCompat.class);
-
-        // Check that callbacks from the extension are propagated correctly
-        Consumer<DeviceState> consumer = mock(DeviceStateConsumer.class);
-
-        backend.registerDeviceStateChangeCallback(Runnable::run, consumer);
-        DeviceState deviceState = newTestDeviceState();
-        ExtensionWindowBackend.ExtensionListenerImpl backendListener =
-                backend.new ExtensionListenerImpl();
-        backendListener.onDeviceStateChanged(deviceState);
-
-        verify(consumer).accept(eq(deviceState));
-        assertEquals(deviceState, backend.mLastReportedDeviceState);
-
-        // Test that the same value wouldn't be reported again
-        reset(consumer);
-        backendListener.onDeviceStateChanged(deviceState);
-        verify(consumer, never()).accept(any());
-    }
-
-    @Test
-    public void testDeviceChangeChangeCallback_callsExtensionOnce() {
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        backend.mWindowExtension = mock(ExtensionInterfaceCompat.class);
-
-        // Check registering the layout change callback
-        Consumer<DeviceState> consumer = mock(DeviceStateConsumer.class);
-        mActivityTestRule.launchActivity(new Intent());
-        backend.registerDeviceStateChangeCallback(Runnable::run, consumer);
-        backend.registerDeviceStateChangeCallback(Runnable::run, mock(DeviceStateConsumer.class));
-
-        assertEquals(2, backend.mDeviceStateChangeCallbacks.size());
-        verify(backend.mWindowExtension).onDeviceStateListenersChanged(false);
-
-        // Check unregistering the layout change callback
-        backend.unregisterDeviceStateChangeCallback(consumer);
-
-        assertEquals(1, backend.mDeviceStateChangeCallbacks.size());
-        verify(backend.mWindowExtension, times(0))
-                .onDeviceStateListenersChanged(true);
-    }
-
-    @Test
-    public void testDeviceChangeChangeCallback_clearListeners() {
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        backend.mWindowExtension = mock(ExtensionInterfaceCompat.class);
-
-        // Check registering the layout change callback
-        Consumer<DeviceState> firstConsumer = mock(DeviceStateConsumer.class);
-        Consumer<DeviceState> secondConsumer = mock(DeviceStateConsumer.class);
-        mActivityTestRule.launchActivity(new Intent());
-        backend.registerDeviceStateChangeCallback(Runnable::run, firstConsumer);
-        backend.registerDeviceStateChangeCallback(Runnable::run, secondConsumer);
-
-        // Check unregistering the layout change callback
-        backend.unregisterDeviceStateChangeCallback(firstConsumer);
-        backend.unregisterDeviceStateChangeCallback(secondConsumer);
-
-        assertTrue(backend.mDeviceStateChangeCallbacks.isEmpty());
-        verify(backend.mWindowExtension).onDeviceStateListenersChanged(true);
-    }
-
-    @Test
-    public void testDeviceChangeCallback_relayLastEmittedValue() {
-        DeviceState expectedState = newTestDeviceState();
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        Consumer<DeviceState> consumer = mock(DeviceStateConsumer.class);
-        backend.mWindowExtension = mock(ExtensionInterfaceCompat.class);
-        backend.mLastReportedDeviceState = expectedState;
-
-        backend.registerDeviceStateChangeCallback(Runnable::run, consumer);
-
-        verify(consumer).accept(expectedState);
-    }
-
-    @Test
-    public void testDeviceChangeCallback_clearLastEmittedValue() {
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        Consumer<DeviceState> consumer = mock(DeviceStateConsumer.class);
-
-        backend.registerDeviceStateChangeCallback(Runnable::run, consumer);
-        backend.unregisterDeviceStateChangeCallback(consumer);
-
-        assertTrue(backend.mDeviceStateChangeCallbacks.isEmpty());
-        assertNull(backend.mLastReportedDeviceState);
-    }
-
     private static WindowLayoutInfo newTestWindowLayoutInfo() {
         WindowLayoutInfo.Builder builder = new WindowLayoutInfo.Builder();
         WindowLayoutInfo windowLayoutInfo = builder.build();

window/window/src/androidTest/java/androidx/window/WindowBackendTest.java

diff --git a/window/window/src/androidTest/java/androidx/window/WindowBackendTest.java b/window/window/src/androidTest/java/androidx/window/WindowBackendTest.java
index 4730074..34bbc2a 100644
--- a/window/window/src/androidTest/java/androidx/window/WindowBackendTest.java
+++ b/window/window/src/androidTest/java/androidx/window/WindowBackendTest.java
@@ -20,7 +20,6 @@
 import static org.mockito.Mockito.verify;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
 
@@ -77,20 +76,6 @@
             mWindowLayoutInfo = windowLayoutInfo;
         }
 
-        /**
-         * Throws an exception if used.
-         * @deprecated will be removed in next alpha
-         * @param context any {@link Activity}
-         * @param executor any {@link Executor}
-         * @param callback any {@link Consumer}
-         */
-        @Override
-        @Deprecated // TODO(b/173739071) Remove in next alpha.
-        public void registerLayoutChangeCallback(@NonNull Context context,
-                @NonNull Executor executor, @NonNull Consumer<WindowLayoutInfo> callback) {
-            throw new RuntimeException("Deprecated method");
-        }
-
         @Override
         public void registerLayoutChangeCallback(@NonNull Activity activity,
                 @NonNull Executor executor, @NonNull Consumer<WindowLayoutInfo> callback) {
@@ -102,15 +87,5 @@
             // Empty
         }
 
-        @Override
-        public void registerDeviceStateChangeCallback(@NonNull Executor executor,
-                @NonNull Consumer<DeviceState> callback) {
-            throw new UnsupportedOperationException("Deprecated method");
-        }
-
-        @Override
-        public void unregisterDeviceStateChangeCallback(@NonNull Consumer<DeviceState> callback) {
-            throw new UnsupportedOperationException("Deprecated method");
-        }
     }
 }

window/window/src/main/java/androidx/window/ExtensionWindowBackend.java

diff --git a/window/window/src/main/java/androidx/window/ExtensionWindowBackend.java b/window/window/src/main/java/androidx/window/ExtensionWindowBackend.java
index 692e3c7..0476c5d 100644
--- a/window/window/src/main/java/androidx/window/ExtensionWindowBackend.java
+++ b/window/window/src/main/java/androidx/window/ExtensionWindowBackend.java
@@ -21,7 +21,6 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
-import android.content.ContextWrapper;
 import android.util.Log;
 
 import androidx.annotation.GuardedBy;
@@ -96,45 +95,6 @@
     }
 
     @Override
-    public void registerLayoutChangeCallback(@NonNull Context context, @NonNull Executor executor,
-            @NonNull Consumer<WindowLayoutInfo> callback) {
-        registerLayoutChangeCallback(assertActivityContext(context), executor, callback);
-    }
-
-    /**
-     * Unwraps the hierarchy of {@link ContextWrapper}-s until {@link Activity} is reached.
-     * @return Base {@link Activity} context or {@code null} if not available.
-     * @deprecated added temporarily to make migration easier. Will be removed in next relesae.
-     */
-    @Nullable
-    @Deprecated // TODO(b/173739071) remove
-    private static Activity getActivityFromContext(Context context) {
-        while (context instanceof ContextWrapper) {
-            if (context instanceof Activity) {
-                return (Activity) context;
-            }
-            context = ((ContextWrapper) context).getBaseContext();
-        }
-        return null;
-    }
-
-    /**
-     * @deprecated added temporarily to make migration easier. Will be removed in next release.
-     * @param context any {@link Context}
-     * @return {@link Activity} if associated with {@link Context} throw
-     * {@link IllegalArgumentException} otherwise.
-     */
-    @Deprecated
-    private Activity assertActivityContext(Context context) {
-        Activity activity = getActivityFromContext(context);
-        if (activity == null) {
-            throw new IllegalArgumentException("Used non-visual Context with WindowManager. "
-                    + "Please use an Activity or a ContextWrapper around an Activity instead.");
-        }
-        return activity;
-    }
-
-    @Override
     public void registerLayoutChangeCallback(@NonNull Activity activity,
             @NonNull Executor executor, @NonNull Consumer<WindowLayoutInfo> callback) {
         synchronized (sLock) {
@@ -211,55 +171,6 @@
         mWindowExtension.onWindowLayoutChangeListenerRemoved(activity);
     }
 
-    @Override
-    public void registerDeviceStateChangeCallback(@NonNull Executor executor,
-            @NonNull Consumer<DeviceState> callback) {
-        synchronized (sLock) {
-            final DeviceStateChangeCallbackWrapper callbackWrapper =
-                    new DeviceStateChangeCallbackWrapper(executor, callback);
-            if (mWindowExtension == null) {
-                if (DEBUG) {
-                    Log.d(TAG, "Extension not loaded, skipping callback registration.");
-                }
-                callback.accept(new DeviceState(DeviceState.POSTURE_UNKNOWN));
-                return;
-            }
-
-            if (mDeviceStateChangeCallbacks.isEmpty()) {
-                mWindowExtension.onDeviceStateListenersChanged(false /* isEmpty */);
-            }
-
-            mDeviceStateChangeCallbacks.add(callbackWrapper);
-            if (mLastReportedDeviceState != null) {
-                callbackWrapper.accept(mLastReportedDeviceState);
-            }
-        }
-    }
-
-    @Override
-    public void unregisterDeviceStateChangeCallback(@NonNull Consumer<DeviceState> callback) {
-        synchronized (sLock) {
-            if (mWindowExtension == null) {
-                if (DEBUG) {
-                    Log.d(TAG, "Extension not loaded, skipping callback un-registration.");
-                }
-                return;
-            }
-
-            for (DeviceStateChangeCallbackWrapper callbackWrapper : mDeviceStateChangeCallbacks) {
-                if (callbackWrapper.mCallback.equals(callback)) {
-                    mDeviceStateChangeCallbacks.remove(callbackWrapper);
-                    if (mDeviceStateChangeCallbacks.isEmpty()) {
-                        mWindowExtension.onDeviceStateListenersChanged(true /* isEmpty */);
-                        // Clear device state so we do not replay stale data.
-                        mLastReportedDeviceState = null;
-                    }
-                    return;
-                }
-            }
-        }
-    }
-
     @VisibleForTesting
     class ExtensionListenerImpl implements ExtensionInterfaceCompat.ExtensionCallbackInterface {
         @Override

window/window/src/main/java/androidx/window/WindowBackend.java

diff --git a/window/window/src/main/java/androidx/window/WindowBackend.java b/window/window/src/main/java/androidx/window/WindowBackend.java
index b45817b..3eb4869 100644
--- a/window/window/src/main/java/androidx/window/WindowBackend.java
+++ b/window/window/src/main/java/androidx/window/WindowBackend.java
@@ -17,7 +17,6 @@
 package androidx.window;
 
 import android.app.Activity;
-import android.content.Context;
 
 import androidx.annotation.NonNull;
 import androidx.core.util.Consumer;
@@ -38,27 +37,8 @@
             @NonNull Consumer<WindowLayoutInfo> callback);
 
     /**
-     * Registers a callback for layout changes of the window for {@link Activity} associated with
-     * the supplied {@link Context}. Must be called only after the it is attached to the window.
-     * @deprecated will be removed in the next alpha.
-     */
-    @Deprecated
-    void registerLayoutChangeCallback(@NonNull Context context, @NonNull Executor executor,
-            @NonNull Consumer<WindowLayoutInfo> callback);
-
-    /**
      * Unregisters a callback for window layout changes of the {@link Activity} window.
      */
     void unregisterLayoutChangeCallback(@NonNull Consumer<WindowLayoutInfo> callback);
 
-    /**
-     * Registers a callback for device state changes.
-     */
-    void registerDeviceStateChangeCallback(@NonNull Executor executor,
-            @NonNull Consumer<DeviceState> callback);
-
-    /**
-     * Unregisters a callback for device state changes.
-     */
-    void unregisterDeviceStateChangeCallback(@NonNull Consumer<DeviceState> callback);
 }

window/window/src/test/java/androidx/window/ExtensionWindowBackendUnitTest.java

diff --git a/window/window/src/test/java/androidx/window/ExtensionWindowBackendUnitTest.java b/window/window/src/test/java/androidx/window/ExtensionWindowBackendUnitTest.java
index ac8d77a..48f0b1e 100644
--- a/window/window/src/test/java/androidx/window/ExtensionWindowBackendUnitTest.java
+++ b/window/window/src/test/java/androidx/window/ExtensionWindowBackendUnitTest.java
@@ -16,12 +16,8 @@
 
 package androidx.window;
 
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -35,9 +31,6 @@
 import androidx.annotation.NonNull;
 import androidx.core.util.Consumer;
 
-import com.google.common.collect.BoundType;
-import com.google.common.collect.Range;
-
 import org.junit.Before;
 import org.junit.Test;
 
@@ -68,33 +61,6 @@
     }
 
     @Test
-    public void testRegisterDeviceStateChangeCallback_noExtension() {
-        // Verify method with extension
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        backend.mWindowExtension = null;
-        SimpleConsumer<DeviceState> simpleConsumer = new SimpleConsumer<>();
-
-        backend.registerDeviceStateChangeCallback(directExecutor(), simpleConsumer);
-
-        DeviceState deviceState = simpleConsumer.lastValue();
-        assertNotNull(deviceState);
-        assertThat(deviceState.getPosture()).isIn(Range.range(
-                DeviceState.POSTURE_UNKNOWN, BoundType.CLOSED,
-                DeviceState.POSTURE_MAX_KNOWN, BoundType.CLOSED));
-        DeviceState initialLastReportedState = backend.mLastReportedDeviceState;
-
-        // Verify method without extension
-        backend.mWindowExtension = null;
-        SimpleConsumer<DeviceState> noExtensionConsumer = new SimpleConsumer<>();
-        backend.registerDeviceStateChangeCallback(directExecutor(), noExtensionConsumer);
-        deviceState = noExtensionConsumer.lastValue();
-        assertNotNull(deviceState);
-        assertEquals(DeviceState.POSTURE_UNKNOWN, deviceState.getPosture());
-        // Verify that last reported state does not change when using the getter
-        assertEquals(initialLastReportedState, backend.mLastReportedDeviceState);
-    }
-
-    @Test
     public void testRegisterLayoutChangeCallback() {
         ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
         backend.mWindowExtension = mock(ExtensionInterfaceCompat.class);
@@ -187,113 +153,6 @@
         verify(backend.mWindowExtension).onWindowLayoutChangeListenerRemoved(activity);
     }
 
-    @Test
-    public void testRegisterDeviceChangeCallback() {
-        ExtensionInterfaceCompat mockInterface = mock(ExtensionInterfaceCompat.class);
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        backend.mWindowExtension = mockInterface;
-
-        // Check registering the device state change callback
-        Consumer<DeviceState> consumer = mock(DeviceStateConsumer.class);
-        backend.registerDeviceStateChangeCallback(Runnable::run, consumer);
-
-        assertEquals(1, backend.mDeviceStateChangeCallbacks.size());
-        verify(backend.mWindowExtension).onDeviceStateListenersChanged(eq(false));
-
-        // Check unregistering the device state change callback
-        backend.unregisterDeviceStateChangeCallback(consumer);
-
-        assertTrue(backend.mDeviceStateChangeCallbacks.isEmpty());
-        verify(backend.mWindowExtension).onDeviceStateListenersChanged(eq(true));
-    }
-
-    @Test
-    public void testDeviceChangeCallback() {
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        backend.mWindowExtension = mock(ExtensionInterfaceCompat.class);
-
-        // Check that callbacks from the extension are propagated correctly
-        Consumer<DeviceState> consumer = mock(DeviceStateConsumer.class);
-
-        backend.registerDeviceStateChangeCallback(Runnable::run, consumer);
-        DeviceState deviceState = newTestDeviceState();
-        ExtensionWindowBackend.ExtensionListenerImpl backendListener =
-                backend.new ExtensionListenerImpl();
-        backendListener.onDeviceStateChanged(deviceState);
-
-        verify(consumer, times(1)).accept(eq(deviceState));
-        assertEquals(deviceState, backend.mLastReportedDeviceState);
-
-        // Test that the same value wouldn't be reported again
-        backendListener.onDeviceStateChanged(deviceState);
-        verify(consumer, times(1)).accept(any());
-    }
-
-    @Test
-    public void testDeviceChangeChangeCallback_callsExtensionOnce() {
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        backend.mWindowExtension = mock(ExtensionInterfaceCompat.class);
-
-        // Check registering the layout change callback
-        Consumer<DeviceState> consumer = mock(DeviceStateConsumer.class);
-        backend.registerDeviceStateChangeCallback(Runnable::run, consumer);
-        backend.registerDeviceStateChangeCallback(Runnable::run, mock(DeviceStateConsumer.class));
-
-        assertEquals(2, backend.mDeviceStateChangeCallbacks.size());
-        verify(backend.mWindowExtension).onDeviceStateListenersChanged(false);
-
-        // Check unregistering the layout change callback
-        backend.unregisterDeviceStateChangeCallback(consumer);
-
-        assertEquals(1, backend.mDeviceStateChangeCallbacks.size());
-        verify(backend.mWindowExtension, times(0))
-                .onDeviceStateListenersChanged(true);
-    }
-
-    @Test
-    public void testDeviceChangeChangeCallback_clearListeners() {
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        backend.mWindowExtension = mock(ExtensionInterfaceCompat.class);
-
-        // Check registering the layout change callback
-        Consumer<DeviceState> firstConsumer = mock(DeviceStateConsumer.class);
-        Consumer<DeviceState> secondConsumer = mock(DeviceStateConsumer.class);
-        backend.registerDeviceStateChangeCallback(Runnable::run, firstConsumer);
-        backend.registerDeviceStateChangeCallback(Runnable::run, secondConsumer);
-
-        // Check unregistering the layout change callback
-        backend.unregisterDeviceStateChangeCallback(firstConsumer);
-        backend.unregisterDeviceStateChangeCallback(secondConsumer);
-
-        assertTrue(backend.mDeviceStateChangeCallbacks.isEmpty());
-        verify(backend.mWindowExtension).onDeviceStateListenersChanged(true);
-    }
-
-    @Test
-    public void testDeviceChangeCallback_relayLastEmittedValue() {
-        DeviceState expectedState = newTestDeviceState();
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        Consumer<DeviceState> consumer = mock(DeviceStateConsumer.class);
-        backend.mWindowExtension = mock(ExtensionInterfaceCompat.class);
-        backend.mLastReportedDeviceState = expectedState;
-
-        backend.registerDeviceStateChangeCallback(Runnable::run, consumer);
-
-        verify(consumer).accept(expectedState);
-    }
-
-    @Test
-    public void testDeviceChangeCallback_clearLastEmittedValue() {
-        ExtensionWindowBackend backend = ExtensionWindowBackend.getInstance(mContext);
-        Consumer<DeviceState> consumer = mock(DeviceStateConsumer.class);
-
-        backend.registerDeviceStateChangeCallback(Runnable::run, consumer);
-        backend.unregisterDeviceStateChangeCallback(consumer);
-
-        assertTrue(backend.mDeviceStateChangeCallbacks.isEmpty());
-        assertNull(backend.mLastReportedDeviceState);
-    }
-
     private static WindowLayoutInfo newTestWindowLayoutInfo() {
         WindowLayoutInfo.Builder builder = new WindowLayoutInfo.Builder();
         return builder.build();

work/integration-tests/testapp/build.gradle

diff --git a/work/integration-tests/testapp/build.gradle b/work/integration-tests/testapp/build.gradle
index 87093e5..a84b95f 100644
--- a/work/integration-tests/testapp/build.gradle
+++ b/work/integration-tests/testapp/build.gradle
@@ -68,6 +68,7 @@
     implementation(project(":work:work-runtime-ktx"))
     implementation(project(":work:work-multiprocess"))
     implementation(project(":work:work-gcm"))
+    implementation("androidx.concurrent:concurrent-futures-ktx:1.1.0")
     implementation("androidx.arch.core:core-runtime:2.1.0")
     implementation("androidx.recyclerview:recyclerview:1.1.0")
     implementation(MATERIAL)

work/integration-tests/testapp/src/main/AndroidManifest.xml

diff --git a/work/integration-tests/testapp/src/main/AndroidManifest.xml b/work/integration-tests/testapp/src/main/AndroidManifest.xml
index 8eb67e8..17f5540 100644
--- a/work/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/work/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="androidx.work.integration.testapp">
+
     <application
         android:name=".TestApplication"
         android:allowBackup="true"
@@ -37,14 +38,26 @@
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
-        <service
-            android:name=".RemoteService"
-            android:exported="false"
-            android:process=":remote" />
+
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
             tools:node="remove" />
+
+        <service
+            android:name="androidx.work.multiprocess.RemoteWorkerService"
+            android:exported="false"
+            android:process=":worker1" />
+
+        <service
+            android:name=".RemoteWorkerService2"
+            android:exported="false"
+            android:process=":worker2" />
+
+        <service
+            android:name=".RemoteService"
+            android:exported="false"
+            android:process=":remote" />
     </application>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 </manifest>

work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/MainActivity.java

diff --git a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/MainActivity.java b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/MainActivity.java
index f792754..f65cae7 100644
--- a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/MainActivity.java
+++ b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/MainActivity.java
@@ -18,6 +18,8 @@
 
 import static androidx.work.ExistingWorkPolicy.KEEP;
 import static androidx.work.ExistingWorkPolicy.REPLACE;
+import static androidx.work.multiprocess.RemoteListenableWorker.ARGUMENT_CLASS_NAME;
+import static androidx.work.multiprocess.RemoteListenableWorker.ARGUMENT_PACKAGE_NAME;
 
 import android.app.PendingIntent;
 import android.app.job.JobInfo;
@@ -35,6 +37,7 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
@@ -52,6 +55,7 @@
 import androidx.work.impl.workers.ConstraintTrackingWorker;
 import androidx.work.integration.testapp.imageprocessing.ImageProcessingActivity;
 import androidx.work.integration.testapp.sherlockholmes.AnalyzeSherlockHolmesActivity;
+import androidx.work.multiprocess.RemoteWorkerService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,6 +66,7 @@
  */
 public class MainActivity extends AppCompatActivity {
 
+    private static final String PACKAGE_NAME = "androidx.work.integration.testapp";
     private static final String TAG = "MainActivity";
     private static final String CONSTRAINT_TRACKING_TAG = "ConstraintTrackingWorker";
     private static final String UNIQUE_WORK_NAME = "importantUniqueWork";
@@ -504,6 +509,36 @@
                     }
                 });
 
+        findViewById(R.id.enqueue_remote_worker_1).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String serviceName = RemoteWorkerService.class.getName();
+                ComponentName componentName = new ComponentName(PACKAGE_NAME, serviceName);
+                OneTimeWorkRequest request = buildOneTimeWorkRemoteWorkRequest(componentName);
+                WorkManager.getInstance(MainActivity.this)
+                        .enqueue(request);
+            }
+        });
+
+        findViewById(R.id.enqueue_remote_worker_2).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String serviceName = RemoteWorkerService2.class.getName();
+                ComponentName componentName = new ComponentName(PACKAGE_NAME, serviceName);
+                OneTimeWorkRequest request = buildOneTimeWorkRemoteWorkRequest(componentName);
+                WorkManager.getInstance(MainActivity.this)
+                        .enqueue(request);
+            }
+        });
+
+        findViewById(R.id.cancel_remote_workers).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                WorkManager.getInstance(MainActivity.this)
+                        .cancelAllWorkByTag(RemoteWorker.class.getName());
+            }
+        });
+
         findViewById(R.id.crash_app).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -540,6 +575,17 @@
         } else {
             hundredJobExceptionButton.setVisibility(View.GONE);
         }
+    }
 
+    @NonNull
+    OneTimeWorkRequest buildOneTimeWorkRemoteWorkRequest(@NonNull ComponentName componentName) {
+        Data data = new Data.Builder()
+                .putString(ARGUMENT_PACKAGE_NAME, componentName.getPackageName())
+                .putString(ARGUMENT_CLASS_NAME, componentName.getClassName())
+                .build();
+
+        return new OneTimeWorkRequest.Builder(RemoteWorker.class)
+                .setInputData(data)
+                .build();
     }
 }

work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/RemoteWorker.kt

diff --git a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/RemoteWorker.kt b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/RemoteWorker.kt
new file mode 100644
index 0000000..4e01eb24
--- /dev/null
+++ b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/RemoteWorker.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.integration.testapp
+
+import android.content.Context
+import android.util.Log
+import androidx.concurrent.futures.CallbackToFutureAdapter
+import androidx.work.WorkerParameters
+import androidx.work.multiprocess.RemoteListenableWorker
+import com.google.common.util.concurrent.ListenableFuture
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+class RemoteWorker(private val context: Context, private val parameters: WorkerParameters) :
+    RemoteListenableWorker(context, parameters) {
+    private var job: Job? = null
+    override fun startRemoteWork(): ListenableFuture<Result> {
+        return CallbackToFutureAdapter.getFuture { completer ->
+            Log.d(TAG, "Starting Remote Worker.")
+            val scope = CoroutineScope(Dispatchers.Default)
+
+            job = scope.launch {
+                delay(30 * 1000)
+            }
+            job?.invokeOnCompletion {
+                Log.d(TAG, "Done.")
+                completer.set(Result.success())
+            }
+        }
+    }
+
+    override fun onStopped() {
+        job?.cancel()
+    }
+
+    companion object {
+        private const val TAG = "RemoteWorker"
+    }
+}

work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/RemoteWorkerService2.kt

diff --git a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/MaterialCatalog.kt b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/RemoteWorkerService2.kt
similarity index 76%
copy from compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/MaterialCatalog.kt
copy to work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/RemoteWorkerService2.kt
index 5ece3c2..256bc17 100644
--- a/compose/material/material/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/MaterialCatalog.kt
+++ b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/RemoteWorkerService2.kt
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package androidx.compose.material.catalog
+package androidx.work.integration.testapp
 
-import androidx.compose.integration.demos.common.ActivityDemo
+import androidx.work.multiprocess.RemoteWorkerService
 
-val MaterialCatalog = ActivityDemo("Material Catalog", CatalogActivity::class)
+class RemoteWorkerService2 : RemoteWorkerService()
\ No newline at end of file

work/integration-tests/testapp/src/main/res/layout/activity_main.xml

diff --git a/work/integration-tests/testapp/src/main/res/layout/activity_main.xml b/work/integration-tests/testapp/src/main/res/layout/activity_main.xml
index b5fd175..123781e 100644
--- a/work/integration-tests/testapp/src/main/res/layout/activity_main.xml
+++ b/work/integration-tests/testapp/src/main/res/layout/activity_main.xml
@@ -287,6 +287,30 @@
             android:layout_marginLeft="16dp"
             android:layout_marginStart="16dp"/>
 
+        <Button android:text="@string/run_remote_worker_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/enqueue_remote_worker_1"
+            android:layout_marginTop="12dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"/>
+
+        <Button android:text="@string/run_remote_worker_2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/enqueue_remote_worker_2"
+            android:layout_marginTop="12dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"/>
+
+        <Button android:text="@string/cancel_remote_workers"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/cancel_remote_workers"
+            android:layout_marginTop="12dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"/>
+
         <Button android:text="@string/crash_app"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

work/integration-tests/testapp/src/main/res/values/strings.xml

diff --git a/work/integration-tests/testapp/src/main/res/values/strings.xml b/work/integration-tests/testapp/src/main/res/values/strings.xml
index 11703b4..3543341 100644
--- a/work/integration-tests/testapp/src/main/res/values/strings.xml
+++ b/work/integration-tests/testapp/src/main/res/values/strings.xml
@@ -34,6 +34,9 @@
     <string name="cancel_work_tag_multiprocess">Cancel Work By Tag (Multi-process)</string>
     <string name="cancel_all_work_multiprocess">Cancel All Work (Multi-process)</string>
     <string name="query_work_multiprocess">Query Work (Multi-process)</string>
+    <string name="run_remote_worker_1">Run Remote Worker 1</string>
+    <string name="run_remote_worker_2">Run Remote Worker 2</string>
+    <string name="cancel_remote_workers">Cancel Remote Workers</string>
     <string name="crash_app">Crash App</string>
     <string name="create_hundred_job_exception">Create 100 Job Exception</string>
     <string name="keep">Use KEEP</string>

work/workmanager-gcm/src/main/java/androidx/work/impl/background/gcm/GcmTaskConverter.java

diff --git a/work/workmanager-gcm/src/main/java/androidx/work/impl/background/gcm/GcmTaskConverter.java b/work/workmanager-gcm/src/main/java/androidx/work/impl/background/gcm/GcmTaskConverter.java
index 39094ae..43acc2e 100644
--- a/work/workmanager-gcm/src/main/java/androidx/work/impl/background/gcm/GcmTaskConverter.java
+++ b/work/workmanager-gcm/src/main/java/androidx/work/impl/background/gcm/GcmTaskConverter.java
@@ -17,9 +17,13 @@
 package androidx.work.impl.background.gcm;
 
 
+import static androidx.work.NetworkType.TEMPORARILY_UNMETERED;
+
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import android.os.Build;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.work.Constraints;
@@ -98,6 +102,13 @@
                     break;
                 case NOT_REQUIRED:
                     builder.setRequiredNetwork(Task.NETWORK_STATE_ANY);
+                    break;
+                default:
+                    if (Build.VERSION.SDK_INT >= 30) {
+                        if (networkType == TEMPORARILY_UNMETERED) {
+                            builder.setRequiredNetwork(Task.NETWORK_STATE_ANY);
+                        }
+                    }
             }
 
             // Charging constraints

work/workmanager-multiprocess/api/current.txt

diff --git a/work/workmanager-multiprocess/api/current.txt b/work/workmanager-multiprocess/api/current.txt
index e6f50d0..bcdaaae 100644
--- a/work/workmanager-multiprocess/api/current.txt
+++ b/work/workmanager-multiprocess/api/current.txt
@@ -1 +1,18 @@
 // Signature format: 4.0
+package androidx.work.multiprocess {
+
+  public abstract class RemoteListenableWorker extends androidx.work.ListenableWorker {
+    ctor public RemoteListenableWorker(android.content.Context, androidx.work.WorkerParameters);
+    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.work.ListenableWorker.Result!> startRemoteWork();
+    method public final com.google.common.util.concurrent.ListenableFuture<androidx.work.ListenableWorker.Result!> startWork();
+    field public static final String ARGUMENT_CLASS_NAME = "androidx.work.impl.workers.RemoteListenableWorker.ARGUMENT_CLASS_NAME";
+    field public static final String ARGUMENT_PACKAGE_NAME = "androidx.work.impl.workers.RemoteListenableWorker.ARGUMENT_PACKAGE_NAME";
+  }
+
+  public class RemoteWorkerService extends android.app.Service {
+    ctor public RemoteWorkerService();
+    method public android.os.IBinder? onBind(android.content.Intent);
+  }
+
+}
+

work/workmanager-multiprocess/api/public_plus_experimental_current.txt

diff --git a/work/workmanager-multiprocess/api/public_plus_experimental_current.txt b/work/workmanager-multiprocess/api/public_plus_experimental_current.txt
index e6f50d0..bcdaaae 100644
--- a/work/workmanager-multiprocess/api/public_plus_experimental_current.txt
+++ b/work/workmanager-multiprocess/api/public_plus_experimental_current.txt
@@ -1 +1,18 @@
 // Signature format: 4.0
+package androidx.work.multiprocess {
+
+  public abstract class RemoteListenableWorker extends androidx.work.ListenableWorker {
+    ctor public RemoteListenableWorker(android.content.Context, androidx.work.WorkerParameters);
+    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.work.ListenableWorker.Result!> startRemoteWork();
+    method public final com.google.common.util.concurrent.ListenableFuture<androidx.work.ListenableWorker.Result!> startWork();
+    field public static final String ARGUMENT_CLASS_NAME = "androidx.work.impl.workers.RemoteListenableWorker.ARGUMENT_CLASS_NAME";
+    field public static final String ARGUMENT_PACKAGE_NAME = "androidx.work.impl.workers.RemoteListenableWorker.ARGUMENT_PACKAGE_NAME";
+  }
+
+  public class RemoteWorkerService extends android.app.Service {
+    ctor public RemoteWorkerService();
+    method public android.os.IBinder? onBind(android.content.Intent);
+  }
+
+}
+

work/workmanager-multiprocess/api/restricted_current.txt

diff --git a/work/workmanager-multiprocess/api/restricted_current.txt b/work/workmanager-multiprocess/api/restricted_current.txt
index e6f50d0..bcdaaae 100644
--- a/work/workmanager-multiprocess/api/restricted_current.txt
+++ b/work/workmanager-multiprocess/api/restricted_current.txt
@@ -1 +1,18 @@
 // Signature format: 4.0
+package androidx.work.multiprocess {
+
+  public abstract class RemoteListenableWorker extends androidx.work.ListenableWorker {
+    ctor public RemoteListenableWorker(android.content.Context, androidx.work.WorkerParameters);
+    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.work.ListenableWorker.Result!> startRemoteWork();
+    method public final com.google.common.util.concurrent.ListenableFuture<androidx.work.ListenableWorker.Result!> startWork();
+    field public static final String ARGUMENT_CLASS_NAME = "androidx.work.impl.workers.RemoteListenableWorker.ARGUMENT_CLASS_NAME";
+    field public static final String ARGUMENT_PACKAGE_NAME = "androidx.work.impl.workers.RemoteListenableWorker.ARGUMENT_PACKAGE_NAME";
+  }
+
+  public class RemoteWorkerService extends android.app.Service {
+    ctor public RemoteWorkerService();
+    method public android.os.IBinder? onBind(android.content.Intent);
+  }
+
+}
+

work/workmanager-multiprocess/build.gradle

diff --git a/work/workmanager-multiprocess/build.gradle b/work/workmanager-multiprocess/build.gradle
index 94d9a0c..a81a41f 100644
--- a/work/workmanager-multiprocess/build.gradle
+++ b/work/workmanager-multiprocess/build.gradle
@@ -41,6 +41,7 @@
 
 dependencies {
     api project(":work:work-runtime")
+    implementation("androidx.room:room-runtime:2.2.5")
     api(GUAVA_LISTENABLE_FUTURE)
     androidTestImplementation(KOTLIN_STDLIB)
     androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)

work/workmanager-multiprocess/src/androidTest/java/androidx/work/multiprocess/RemoteWorkManagerClientTest.kt

diff --git a/work/workmanager-multiprocess/src/androidTest/java/androidx/work/multiprocess/RemoteWorkManagerClientTest.kt b/work/workmanager-multiprocess/src/androidTest/java/androidx/work/multiprocess/RemoteWorkManagerClientTest.kt
index fba4ec3..bdd6ded 100644
--- a/work/workmanager-multiprocess/src/androidTest/java/androidx/work/multiprocess/RemoteWorkManagerClientTest.kt
+++ b/work/workmanager-multiprocess/src/androidTest/java/androidx/work/multiprocess/RemoteWorkManagerClientTest.kt
@@ -94,9 +94,11 @@
 
     @Test
     @MediumTest
+    @Suppress("UNCHECKED_CAST")
     public fun cleanUpWhenDispatcherFails() {
         val binder = mock(IBinder::class.java)
-        val remoteDispatcher = mock(RemoteWorkManagerClient.RemoteDispatcher::class.java)
+        val remoteDispatcher =
+            mock(RemoteDispatcher::class.java) as RemoteDispatcher<IWorkManagerImpl>
         val remoteStub = mock(IWorkManagerImpl::class.java)
         val callback = spy(RemoteCallback())
         val message = "Something bad happened"
@@ -117,8 +119,10 @@
 
     @Test
     @MediumTest
+    @Suppress("UNCHECKED_CAST")
     public fun cleanUpWhenSessionIsInvalid() {
-        val remoteDispatcher = mock(RemoteWorkManagerClient.RemoteDispatcher::class.java)
+        val remoteDispatcher =
+            mock(RemoteDispatcher::class.java) as RemoteDispatcher<IWorkManagerImpl>
         val callback = spy(RemoteCallback())
         val session = SettableFuture.create<IWorkManagerImpl>()
         session.setException(RuntimeException("Something bad happened"))
@@ -137,7 +141,7 @@
     @MediumTest
     public fun cleanUpOnSuccessfulDispatch() {
         val binder = mock(IBinder::class.java)
-        val remoteDispatcher = RemoteWorkManagerClient.RemoteDispatcher { _, callback ->
+        val remoteDispatcher = RemoteDispatcher<IWorkManagerImpl> { _, callback ->
             callback.onSuccess(ByteArray(0))
         }
         val remoteStub = mock(IWorkManagerImpl::class.java)

work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/ListenableWorkerImpl.java

diff --git a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/ListenableWorkerImpl.java b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/ListenableWorkerImpl.java
new file mode 100644
index 0000000..b95ce47
--- /dev/null
+++ b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/ListenableWorkerImpl.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.multiprocess;
+
+import static androidx.work.multiprocess.ListenableCallback.ListenableCallbackRunnable.failureCallback;
+import static androidx.work.multiprocess.ListenableCallback.ListenableCallbackRunnable.successCallback;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.work.Configuration;
+import androidx.work.ListenableWorker;
+import androidx.work.Logger;
+import androidx.work.WorkerParameters;
+import androidx.work.impl.WorkManagerImpl;
+import androidx.work.impl.utils.futures.SettableFuture;
+import androidx.work.impl.utils.taskexecutor.TaskExecutor;
+import androidx.work.multiprocess.parcelable.ParcelConverters;
+import androidx.work.multiprocess.parcelable.ParcelableRemoteWorkRequest;
+import androidx.work.multiprocess.parcelable.ParcelableResult;
+import androidx.work.multiprocess.parcelable.ParcelableWorkerParameters;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * An implementation of ListenableWorker that can be executed in a remote process.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class ListenableWorkerImpl extends IListenableWorkerImpl.Stub {
+    // Synthetic access
+    static final String TAG = Logger.tagWithPrefix("ListenableWorkerImpl");
+    // Synthetic access
+    static byte[] sEMPTY = new byte[0];
+    // Synthetic access
+    static final Object sLock = new Object();
+
+    // Synthetic access
+    final Context mContext;
+    // Synthetic access
+    final WorkManagerImpl mWorkManager;
+    // Synthetic access
+    final Configuration mConfiguration;
+    // Synthetic access
+    final TaskExecutor mTaskExecutor;
+    // Synthetic access
+    final Map<String, ListenableFuture<ListenableWorker.Result>> mFutureMap;
+
+    ListenableWorkerImpl(@NonNull Context context) {
+        mContext = context.getApplicationContext();
+        mWorkManager = WorkManagerImpl.getInstance(mContext);
+        mConfiguration = mWorkManager.getConfiguration();
+        mTaskExecutor = mWorkManager.getWorkTaskExecutor();
+        mFutureMap = new HashMap<>();
+    }
+
+    @Override
+    public void startWork(
+            @NonNull final byte[] request,
+            @NonNull final IWorkManagerImplCallback callback) {
+        try {
+            ParcelableRemoteWorkRequest parcelableRemoteWorkRequest =
+                    ParcelConverters.unmarshall(request, ParcelableRemoteWorkRequest.CREATOR);
+
+            ParcelableWorkerParameters parcelableWorkerParameters =
+                    parcelableRemoteWorkRequest.getParcelableWorkerParameters();
+
+            WorkerParameters workerParameters =
+                    parcelableWorkerParameters.toWorkerParameters(mWorkManager);
+
+            final String id = workerParameters.getId().toString();
+            final String workerClassName = parcelableRemoteWorkRequest.getWorkerClassName();
+
+            Logger.get().debug(TAG,
+                    String.format("Executing work request (%s, %s)", id, workerClassName));
+
+            final ListenableFuture<ListenableWorker.Result> futureResult =
+                    executeWorkRequest(id, workerClassName, workerParameters);
+
+            futureResult.addListener(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        ListenableWorker.Result result = futureResult.get();
+                        ParcelableResult parcelableResult = new ParcelableResult(result);
+                        byte[] response = ParcelConverters.marshall(parcelableResult);
+                        successCallback(callback, response);
+                    } catch (ExecutionException | InterruptedException exception) {
+                        failureCallback(callback, exception);
+                    } catch (CancellationException cancellationException) {
+                        Logger.get().debug(TAG, String.format("Worker (%s) was cancelled", id));
+                        failureCallback(callback, cancellationException);
+                    } finally {
+                        synchronized (sLock) {
+                            mFutureMap.remove(id);
+                        }
+                    }
+                }
+            }, mTaskExecutor.getBackgroundExecutor());
+        } catch (Throwable throwable) {
+            failureCallback(callback, throwable);
+        }
+    }
+
+    @Override
+    public void interrupt(
+            @NonNull final byte[] request,
+            @NonNull final IWorkManagerImplCallback callback) {
+        try {
+            ParcelableWorkerParameters parcelableWorkerParameters =
+                    ParcelConverters.unmarshall(request, ParcelableWorkerParameters.CREATOR);
+            final String id = parcelableWorkerParameters.getId().toString();
+            Logger.get().debug(TAG, String.format("Interrupting work with id (%s)", id));
+
+            final ListenableFuture<ListenableWorker.Result> future;
+            synchronized (sLock) {
+                future = mFutureMap.remove(id);
+            }
+            if (future != null) {
+                mWorkManager.getWorkTaskExecutor().getBackgroundExecutor()
+                        .execute(new Runnable() {
+                            @Override
+                            public void run() {
+                                future.cancel(true);
+                                successCallback(callback, sEMPTY);
+                            }
+                        });
+            } else {
+                // Nothing to do.
+                successCallback(callback, sEMPTY);
+            }
+        } catch (Throwable throwable) {
+            failureCallback(callback, throwable);
+        }
+    }
+
+    @NonNull
+    private ListenableFuture<ListenableWorker.Result> executeWorkRequest(
+            @NonNull String id,
+            @NonNull String workerClassName,
+            @NonNull WorkerParameters workerParameters) {
+
+        final SettableFuture<ListenableWorker.Result> future = SettableFuture.create();
+
+        Logger.get().debug(TAG,
+                String.format("Tracking execution of %s (%s)", id, workerClassName));
+
+        synchronized (sLock) {
+            mFutureMap.put(id, future);
+        }
+
+        ListenableWorker worker = mConfiguration.getWorkerFactory()
+                .createWorkerWithDefaultFallback(mContext, workerClassName, workerParameters);
+
+        if (worker == null) {
+            String message = String.format(
+                    "Unable to create an instance of %s", workerClassName);
+            Logger.get().error(TAG, message);
+            future.setException(new IllegalStateException(message));
+            return future;
+        }
+
+        if (!(worker instanceof RemoteListenableWorker)) {
+            String message = String.format(
+                    "%s does not extend %s",
+                    workerClassName,
+                    RemoteListenableWorker.class.getName()
+            );
+            Logger.get().error(TAG, message);
+            future.setException(new IllegalStateException(message));
+            return future;
+        }
+
+        try {
+            RemoteListenableWorker remoteListenableWorker = (RemoteListenableWorker) worker;
+            future.setFuture(remoteListenableWorker.startRemoteWork());
+        } catch (Throwable throwable) {
+            future.setException(throwable);
+        }
+
+        return future;
+    }
+}

work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteClientUtils.java

diff --git a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteClientUtils.java b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteClientUtils.java
new file mode 100644
index 0000000..e2da73e
--- /dev/null
+++ b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteClientUtils.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.multiprocess;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.arch.core.util.Function;
+import androidx.work.impl.utils.futures.SettableFuture;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.concurrent.Executor;
+
+/**
+ * A collection of utilities which make using
+ * {@link com.google.common.util.concurrent.ListenableFuture} easier.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public final class RemoteClientUtils {
+    private RemoteClientUtils() {
+        // Utilities
+    }
+
+    /**
+     * A mapper that essentially drops the byte[].
+     */
+    public static final Function<byte[], Void> sVoidMapper = new Function<byte[], Void>() {
+        @Override
+        public Void apply(byte[] input) {
+            return null;
+        }
+    };
+
+    /**
+     * Defines a mapper for a {@link ListenableFuture}.
+     */
+    @NonNull
+    public static <I, O> ListenableFuture<O> map(
+            @NonNull final ListenableFuture<I> input,
+            @NonNull final Function<I, O> transformation,
+            @NonNull Executor executor) {
+
+        final SettableFuture<O> output = SettableFuture.create();
+        input.addListener(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    I in = input.get();
+                    O out = transformation.apply(in);
+                    output.set(out);
+                } catch (Throwable throwable) {
+                    Throwable cause = throwable.getCause();
+                    cause = cause == null ? throwable : cause;
+                    output.setException(cause);
+                }
+            }
+        }, executor);
+        return output;
+    }
+}

work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteDispatcher.java

diff --git a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteDispatcher.java b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteDispatcher.java
new file mode 100644
index 0000000..5a7a385
--- /dev/null
+++ b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteDispatcher.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.multiprocess;
+
+import android.annotation.SuppressLint;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+
+/**
+ * @param <T> The remote interface subtype that usually implements {@link android.os.IBinder}.
+ * @hide
+ */
+@SuppressLint("LambdaLast")
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public interface RemoteDispatcher<T> {
+    /**
+     * Perform the actual work given an instance of {@link IWorkManagerImpl} and the
+     * {@link IWorkManagerImplCallback} callback.
+     *
+     * @param binder   the remote interface implementation
+     * @param callback the {@link IWorkManagerImplCallback} instance
+     */
+    void execute(@NonNull T binder,
+            @NonNull IWorkManagerImplCallback callback) throws Throwable;
+}

work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteListenableWorker.java

diff --git a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteListenableWorker.java b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteListenableWorker.java
new file mode 100644
index 0000000..33c5748
--- /dev/null
+++ b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteListenableWorker.java
@@ -0,0 +1,339 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.multiprocess;
+
+import static android.content.Context.BIND_AUTO_CREATE;
+
+import static androidx.work.multiprocess.ListenableCallback.ListenableCallbackRunnable.failureCallback;
+
+import android.annotation.SuppressLint;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.arch.core.util.Function;
+import androidx.work.Data;
+import androidx.work.ListenableWorker;
+import androidx.work.Logger;
+import androidx.work.WorkerParameters;
+import androidx.work.impl.WorkManagerImpl;
+import androidx.work.impl.model.WorkSpec;
+import androidx.work.impl.utils.futures.SettableFuture;
+import androidx.work.multiprocess.parcelable.ParcelConverters;
+import androidx.work.multiprocess.parcelable.ParcelableRemoteWorkRequest;
+import androidx.work.multiprocess.parcelable.ParcelableResult;
+import androidx.work.multiprocess.parcelable.ParcelableWorkerParameters;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+
+
+/**
+ * Is an implementation of a {@link ListenableWorker} that can bind to a remote process.
+ * <p>
+ * To be able to bind to a remote process, A {@link RemoteListenableWorker} needs additional
+ * arguments as part of its input {@link Data}.
+ * <p>
+ * The arguments ({@link #ARGUMENT_PACKAGE_NAME}, {@link #ARGUMENT_CLASS_NAME}) are used to
+ * determine the {@link android.app.Service} that the {@link RemoteListenableWorker} can bind to.
+ * {@link #startRemoteWork()} is then subsequently called in the process that the
+ * {@link android.app.Service} is running in.
+ */
+public abstract class RemoteListenableWorker extends ListenableWorker {
+    // Synthetic access
+    static final String TAG = Logger.tagWithPrefix("RemoteListenableWorker");
+
+    /**
+     * The {@code #ARGUMENT_PACKAGE_NAME}, {@link #ARGUMENT_CLASS_NAME} together determine the
+     * {@link ComponentName} that the {@link RemoteListenableWorker} binds to before calling
+     * {@link #startRemoteWork()}.
+     */
+    public static final String ARGUMENT_PACKAGE_NAME =
+            "androidx.work.impl.workers.RemoteListenableWorker.ARGUMENT_PACKAGE_NAME";
+
+    /**
+     * The {@link #ARGUMENT_PACKAGE_NAME}, {@code className} together determine the
+     * {@link ComponentName} that the {@link RemoteListenableWorker} binds to before calling
+     * {@link #startRemoteWork()}.
+     */
+    public static final String ARGUMENT_CLASS_NAME =
+            "androidx.work.impl.workers.RemoteListenableWorker.ARGUMENT_CLASS_NAME";
+
+    // Synthetic access
+    final WorkerParameters mWorkerParameters;
+
+    // Synthetic access
+    final WorkManagerImpl mWorkManager;
+
+    // Synthetic access
+    final Executor mExecutor;
+
+    // Synthetic access
+    @Nullable
+    String mWorkerClassName;
+
+    @Nullable
+    private ComponentName mComponentName;
+
+    /**
+     * @param appContext   The application {@link Context}
+     * @param workerParams {@link WorkerParameters} to setup the internal state of this worker
+     */
+    public RemoteListenableWorker(
+            @NonNull Context appContext,
+            @NonNull WorkerParameters workerParams) {
+        super(appContext, workerParams);
+        mWorkerParameters = workerParams;
+        mWorkManager = WorkManagerImpl.getInstance(appContext);
+        mExecutor = mWorkManager.getWorkTaskExecutor().getBackgroundExecutor();
+    }
+
+    @Override
+    @NonNull
+    public final ListenableFuture<Result> startWork() {
+        SettableFuture<Result> future = SettableFuture.create();
+        Data data = getInputData();
+        final String id = mWorkerParameters.getId().toString();
+        String packageName = data.getString(ARGUMENT_PACKAGE_NAME);
+        String serviceClassName = data.getString(ARGUMENT_CLASS_NAME);
+
+        if (TextUtils.isEmpty(packageName)) {
+            String message = "Need to specify a package name for the Remote Service.";
+            Logger.get().error(TAG, message);
+            future.setException(new IllegalArgumentException(message));
+            return future;
+        }
+
+        if (TextUtils.isEmpty(serviceClassName)) {
+            String message = "Need to specify a class name for the Remote Service.";
+            Logger.get().error(TAG, message);
+            future.setException(new IllegalArgumentException(message));
+            return future;
+        }
+
+        mComponentName = new ComponentName(packageName, serviceClassName);
+
+        ListenableFuture<byte[]> result = execute(
+                mComponentName,
+                new RemoteDispatcher<IListenableWorkerImpl>() {
+                    @Override
+                    public void execute(
+                            @NonNull IListenableWorkerImpl listenableWorkerImpl,
+                            @NonNull IWorkManagerImplCallback callback) throws RemoteException {
+
+                        WorkSpec workSpec = mWorkManager.getWorkDatabase()
+                                .workSpecDao()
+                                .getWorkSpec(id);
+
+                        mWorkerClassName = workSpec.workerClassName;
+                        ParcelableRemoteWorkRequest remoteWorkRequest =
+                                new ParcelableRemoteWorkRequest(
+                                        workSpec.workerClassName, mWorkerParameters
+                                );
+                        byte[] request = ParcelConverters.marshall(remoteWorkRequest);
+                        listenableWorkerImpl.startWork(request, callback);
+                    }
+                });
+
+        return RemoteClientUtils.map(result, new Function<byte[], Result>() {
+            @Override
+            public Result apply(byte[] input) {
+                ParcelableResult parcelableResult = ParcelConverters.unmarshall(input,
+                        ParcelableResult.CREATOR);
+                return parcelableResult.getResult();
+            }
+        }, mExecutor);
+    }
+
+    /**
+     * Override this method to define the work that needs to run in the remote process. This method
+     * is called on the main thread.
+     * <p>
+     * A ListenableWorker is given a maximum of ten minutes to finish its execution and return a
+     * {@code Result}.  After this time has expired, the worker will be signalled to stop and its
+     * {@link ListenableFuture} will be cancelled. Note that the 10 minute execution window also
+     * includes the cost of binding to the remote process.
+     *
+     * @return A {@link ListenableFuture} with the {@code Result} of the computation.  If you
+     * cancel this Future, WorkManager will treat this unit of work as a {@code Result#failure()}.
+     */
+    @NonNull
+    public abstract ListenableFuture<Result> startRemoteWork();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @SuppressWarnings("FutureReturnValueIgnored")
+    public void onStopped() {
+        super.onStopped();
+        // Delegate interruptions to the remote process.
+        if (mComponentName != null) {
+            execute(mComponentName,
+                    new RemoteDispatcher<IListenableWorkerImpl>() {
+                        @Override
+                        public void execute(
+                                @NonNull IListenableWorkerImpl listenableWorkerImpl,
+                                @NonNull IWorkManagerImplCallback callback)
+                                throws RemoteException {
+                            ParcelableWorkerParameters parcelableWorkerParameters =
+                                    new ParcelableWorkerParameters(mWorkerParameters);
+                            byte[] request = ParcelConverters.marshall(parcelableWorkerParameters);
+                            listenableWorkerImpl.interrupt(request, callback);
+                        }
+                    });
+        }
+    }
+
+    /**
+     * @hide
+     */
+    @NonNull
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public ListenableFuture<IListenableWorkerImpl> getListenableWorkerImpl(
+            @NonNull ComponentName component) {
+
+        Logger.get().debug(TAG,
+                String.format("Binding to %s, %s", component.getPackageName(),
+                        component.getClassName()));
+
+        Connection session = new Connection();
+        try {
+            Intent intent = new Intent();
+            intent.setComponent(component);
+            Context context = getApplicationContext();
+            boolean bound = context.bindService(intent, session, BIND_AUTO_CREATE);
+            if (!bound) {
+                unableToBind(session, new RuntimeException("Unable to bind to service"));
+            }
+        } catch (Throwable throwable) {
+            unableToBind(session, throwable);
+        }
+
+        return session.mFuture;
+    }
+
+    /**
+     * @hide
+     */
+    @NonNull
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public ListenableFuture<byte[]> execute(
+            @NonNull ComponentName componentName,
+            @NonNull RemoteDispatcher<IListenableWorkerImpl> dispatcher) {
+
+        ListenableFuture<IListenableWorkerImpl> session = getListenableWorkerImpl(componentName);
+        return execute(session, dispatcher, new RemoteCallback());
+    }
+
+    /**
+     * @hide
+     */
+    @NonNull
+    @SuppressLint("LambdaLast")
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public ListenableFuture<byte[]> execute(
+            @NonNull ListenableFuture<IListenableWorkerImpl> session,
+            @NonNull final RemoteDispatcher<IListenableWorkerImpl> dispatcher,
+            @NonNull final RemoteCallback callback) {
+
+        session.addListener(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    final IListenableWorkerImpl iListenableWorker = session.get();
+                    callback.setBinder(iListenableWorker.asBinder());
+                    mExecutor.execute(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                dispatcher.execute(iListenableWorker, callback);
+                            } catch (Throwable innerThrowable) {
+                                Logger.get().error(TAG, "Unable to execute", innerThrowable);
+                                failureCallback(callback, innerThrowable);
+                            }
+                        }
+                    });
+                } catch (ExecutionException | InterruptedException exception) {
+                    String message = "Unable to bind to service";
+                    Logger.get().error(TAG, message, exception);
+                    failureCallback(callback, exception);
+                }
+            }
+        }, mExecutor);
+        return callback.getFuture();
+    }
+
+    private void unableToBind(@NonNull Connection session, @NonNull Throwable throwable) {
+        Logger.get().error(TAG, "Unable to bind to service", throwable);
+        session.mFuture.setException(throwable);
+    }
+
+    /**
+     * The implementation of {@link ServiceConnection} that handles changes in the connection.
+     *
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public static class Connection implements ServiceConnection {
+        private static final String TAG = Logger.tagWithPrefix("RemoteListenableWorkerSession");
+
+        final SettableFuture<IListenableWorkerImpl> mFuture;
+
+        public Connection() {
+            mFuture = SettableFuture.create();
+        }
+
+        @Override
+        public void onServiceConnected(
+                @NonNull ComponentName componentName,
+                @NonNull IBinder iBinder) {
+            Logger.get().debug(TAG, "Service connected");
+            IListenableWorkerImpl iListenableWorkerImpl =
+                    IListenableWorkerImpl.Stub.asInterface(iBinder);
+            mFuture.set(iListenableWorkerImpl);
+        }
+
+        @Override
+        public void onServiceDisconnected(@NonNull ComponentName componentName) {
+            Logger.get().warning(TAG, "Service disconnected");
+            mFuture.setException(new RuntimeException("Service disconnected"));
+        }
+
+        @Override
+        public void onBindingDied(@NonNull ComponentName name) {
+            Logger.get().warning(TAG, "Binding died");
+            mFuture.setException(new RuntimeException("Binding died"));
+        }
+
+        @Override
+        public void onNullBinding(@NonNull ComponentName name) {
+            Logger.get().error(TAG, "Unable to bind to service");
+            mFuture.setException(
+                    new RuntimeException(String.format("Cannot bind to service %s", name)));
+        }
+    }
+}

work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteWorkManagerClient.java

diff --git a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteWorkManagerClient.java b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteWorkManagerClient.java
index 59bb5b0f..a562aa9 100644
--- a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteWorkManagerClient.java
+++ b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteWorkManagerClient.java
@@ -19,6 +19,8 @@
 import static android.content.Context.BIND_AUTO_CREATE;
 
 import static androidx.work.multiprocess.ListenableCallback.ListenableCallbackRunnable.failureCallback;
+import static androidx.work.multiprocess.RemoteClientUtils.map;
+import static androidx.work.multiprocess.RemoteClientUtils.sVoidMapper;
 
 import android.annotation.SuppressLint;
 import android.content.ComponentName;
@@ -77,6 +79,7 @@
 
     private Session mSession;
 
+    @SuppressLint("BanKeepAnnotation")
     @Keep
     public RemoteWorkManagerClient(@NonNull Context context, @NonNull WorkManagerImpl workManager) {
         mContext = context.getApplicationContext();
@@ -95,7 +98,7 @@
     @NonNull
     @Override
     public ListenableFuture<Void> enqueue(@NonNull final List<WorkRequest> requests) {
-        ListenableFuture<byte[]> result = execute(new RemoteDispatcher() {
+        ListenableFuture<byte[]> result = execute(new RemoteDispatcher<IWorkManagerImpl>() {
             @Override
             public void execute(
                     @NonNull IWorkManagerImpl iWorkManagerImpl,
@@ -150,7 +153,7 @@
     @NonNull
     @Override
     public ListenableFuture<Void> enqueue(@NonNull final WorkContinuation continuation) {
-        ListenableFuture<byte[]> result = execute(new RemoteDispatcher() {
+        ListenableFuture<byte[]> result = execute(new RemoteDispatcher<IWorkManagerImpl>() {
             @Override
             public void execute(@NonNull IWorkManagerImpl iWorkManagerImpl,
                     @NonNull IWorkManagerImplCallback callback) throws Throwable {
@@ -166,7 +169,7 @@
     @NonNull
     @Override
     public ListenableFuture<Void> cancelWorkById(@NonNull final UUID id) {
-        ListenableFuture<byte[]> result = execute(new RemoteDispatcher() {
+        ListenableFuture<byte[]> result = execute(new RemoteDispatcher<IWorkManagerImpl>() {
             @Override
             public void execute(@NonNull IWorkManagerImpl iWorkManagerImpl,
                     @NonNull IWorkManagerImplCallback callback) throws Throwable {
@@ -179,7 +182,7 @@
     @NonNull
     @Override
     public ListenableFuture<Void> cancelAllWorkByTag(@NonNull final String tag) {
-        ListenableFuture<byte[]> result = execute(new RemoteDispatcher() {
+        ListenableFuture<byte[]> result = execute(new RemoteDispatcher<IWorkManagerImpl>() {
             @Override
             public void execute(@NonNull IWorkManagerImpl iWorkManagerImpl,
                     @NonNull IWorkManagerImplCallback callback) throws Throwable {
@@ -192,7 +195,7 @@
     @NonNull
     @Override
     public ListenableFuture<Void> cancelUniqueWork(@NonNull final String uniqueWorkName) {
-        ListenableFuture<byte[]> result = execute(new RemoteDispatcher() {
+        ListenableFuture<byte[]> result = execute(new RemoteDispatcher<IWorkManagerImpl>() {
             @Override
             public void execute(@NonNull IWorkManagerImpl iWorkManagerImpl,
                     @NonNull IWorkManagerImplCallback callback) throws Throwable {
@@ -205,7 +208,7 @@
     @NonNull
     @Override
     public ListenableFuture<Void> cancelAllWork() {
-        ListenableFuture<byte[]> result = execute(new RemoteDispatcher() {
+        ListenableFuture<byte[]> result = execute(new RemoteDispatcher<IWorkManagerImpl>() {
             @Override
             public void execute(@NonNull IWorkManagerImpl iWorkManagerImpl,
                     @NonNull IWorkManagerImplCallback callback) throws Throwable {
@@ -218,7 +221,7 @@
     @NonNull
     @Override
     public ListenableFuture<List<WorkInfo>> getWorkInfos(@NonNull final WorkQuery workQuery) {
-        ListenableFuture<byte[]> result = execute(new RemoteDispatcher() {
+        ListenableFuture<byte[]> result = execute(new RemoteDispatcher<IWorkManagerImpl>() {
             @Override
             public void execute(
                     @NonNull IWorkManagerImpl iWorkManagerImpl,
@@ -244,7 +247,8 @@
      * @return The {@link ListenableFuture} instance.
      */
     @NonNull
-    public ListenableFuture<byte[]> execute(@NonNull final RemoteDispatcher dispatcher) {
+    public ListenableFuture<byte[]> execute(
+            @NonNull final RemoteDispatcher<IWorkManagerImpl> dispatcher) {
         return execute(getSession(), dispatcher, new RemoteCallback());
     }
 
@@ -261,7 +265,7 @@
     @VisibleForTesting
     ListenableFuture<byte[]> execute(
             @NonNull final ListenableFuture<IWorkManagerImpl> session,
-            @NonNull final RemoteDispatcher dispatcher,
+            @NonNull final RemoteDispatcher<IWorkManagerImpl> dispatcher,
             @NonNull final RemoteCallback callback) {
         session.addListener(new Runnable() {
             @Override
@@ -335,53 +339,6 @@
     }
 
     /**
-     * A mapper that essentially drops the byte[].
-     */
-    private static final Function<byte[], Void> sVoidMapper = new Function<byte[], Void>() {
-        @Override
-        public Void apply(byte[] input) {
-            return null;
-        }
-    };
-
-    private static <I, O> ListenableFuture<O> map(
-            @NonNull final ListenableFuture<I> input,
-            @NonNull final Function<I, O> transformation,
-            @NonNull Executor executor) {
-
-        final SettableFuture<O> output = SettableFuture.create();
-        input.addListener(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    I in = input.get();
-                    O out = transformation.apply(in);
-                    output.set(out);
-                } catch (Throwable throwable) {
-                    Throwable cause = throwable.getCause();
-                    cause = cause == null ? throwable : cause;
-                    output.setException(cause);
-                }
-            }
-        }, executor);
-        return output;
-    }
-
-    /**
-     * @hide
-     */
-    @SuppressLint("LambdaLast")
-    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-    public interface RemoteDispatcher {
-        /**
-         * Perform the actual work given an instance of {@link IWorkManagerImpl} and the
-         * {@link IWorkManagerImplCallback} callback.
-         */
-        void execute(@NonNull IWorkManagerImpl iWorkManagerImpl,
-                @NonNull IWorkManagerImplCallback callback) throws Throwable;
-    }
-
-    /**
      * The implementation of {@link ServiceConnection} that handles changes in the connection.
      *
      * @hide

work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteWorkerService.java

diff --git a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteWorkerService.java b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteWorkerService.java
new file mode 100644
index 0000000..4fbf6a6
--- /dev/null
+++ b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/RemoteWorkerService.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.multiprocess;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.work.Logger;
+
+/**
+ * The {@link Service} which hosts an implementation of a {@link androidx.work.ListenableWorker}.
+ */
+public class RemoteWorkerService extends Service {
+    static final String TAG = Logger.tagWithPrefix("RemoteWorkerService");
+    private IBinder mBinder;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mBinder = new ListenableWorkerImpl(this);
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(@NonNull Intent intent) {
+        Logger.get().info(TAG, "Binding to RemoteWorkerService");
+        return mBinder;
+    }
+}

work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableRemoteWorkRequest.java

diff --git a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableRemoteWorkRequest.java b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableRemoteWorkRequest.java
new file mode 100644
index 0000000..d210690
--- /dev/null
+++ b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableRemoteWorkRequest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.multiprocess.parcelable;
+
+import android.annotation.SuppressLint;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.work.WorkerParameters;
+
+/**
+ * Everything you need to run a {@link androidx.work.multiprocess.RemoteListenableWorker}.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+@SuppressLint("BanParcelableUsage")
+public class ParcelableRemoteWorkRequest implements Parcelable {
+    // We are holding on to parcelables here instead of the actual deserialized representation.
+    // This is because, to create an instance of WorkerParameters we need the application context
+    // using which we can determine the configuration, taskExecutor to use etc.
+
+    private final String mWorkerClassName;
+    private final ParcelableWorkerParameters mParcelableWorkerParameters;
+
+    public ParcelableRemoteWorkRequest(
+            @NonNull String workerClassName,
+            @NonNull WorkerParameters workerParameters) {
+
+        mWorkerClassName = workerClassName;
+        mParcelableWorkerParameters = new ParcelableWorkerParameters(workerParameters);
+    }
+
+    protected ParcelableRemoteWorkRequest(@NonNull Parcel in) {
+        // workerClassName
+        mWorkerClassName = in.readString();
+        // parcelableWorkerParameters
+        mParcelableWorkerParameters = new ParcelableWorkerParameters(in);
+    }
+
+    public static final Creator<ParcelableRemoteWorkRequest> CREATOR =
+            new Creator<ParcelableRemoteWorkRequest>() {
+                @Override
+                public ParcelableRemoteWorkRequest createFromParcel(Parcel in) {
+                    return new ParcelableRemoteWorkRequest(in);
+                }
+
+                @Override
+                public ParcelableRemoteWorkRequest[] newArray(int size) {
+                    return new ParcelableRemoteWorkRequest[size];
+                }
+            };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel parcel, int flags) {
+        // workerClassName
+        parcel.writeString(mWorkerClassName);
+        // parcelableWorkerParameters
+        mParcelableWorkerParameters.writeToParcel(parcel, flags);
+    }
+
+    @NonNull
+    public String getWorkerClassName() {
+        return mWorkerClassName;
+    }
+
+    @NonNull
+    public ParcelableWorkerParameters getParcelableWorkerParameters() {
+        return mParcelableWorkerParameters;
+    }
+}

work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableResult.java

diff --git a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableResult.java b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableResult.java
new file mode 100644
index 0000000..5f6036b
--- /dev/null
+++ b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableResult.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.multiprocess.parcelable;
+
+import android.annotation.SuppressLint;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.work.Data;
+import androidx.work.ListenableWorker;
+
+/**
+ * {@link androidx.work.ListenableWorker.Result}, but parcelable.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+@SuppressLint("BanParcelableUsage")
+public class ParcelableResult implements Parcelable {
+    private final ListenableWorker.Result mResult;
+
+    public ParcelableResult(@NonNull ListenableWorker.Result result) {
+        mResult = result;
+    }
+
+    public ParcelableResult(@NonNull Parcel in) {
+        // resultType
+        int resultType = in.readInt();
+        // outputData
+        byte[] output = in.createByteArray();
+        Data outputData = Data.fromByteArray(output);
+        mResult = intToResultType(resultType, outputData);
+    }
+
+    public static final Creator<ParcelableResult> CREATOR =
+            new Creator<ParcelableResult>() {
+                @Override
+                @NonNull
+                public ParcelableResult createFromParcel(Parcel in) {
+                    return new ParcelableResult(in);
+                }
+
+                @Override
+                public ParcelableResult[] newArray(int size) {
+                    return new ParcelableResult[size];
+                }
+            };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel parcel, int flags) {
+        int resultType = resultTypeOf(mResult);
+        // resultType
+        parcel.writeInt(resultType);
+        // outputData
+        Data outputData = mResult.getOutputData();
+        byte[] output = outputData.toByteArray();
+        parcel.writeByteArray(output);
+    }
+
+    @NonNull
+    public ListenableWorker.Result getResult() {
+        return mResult;
+    }
+
+    private static int resultTypeOf(ListenableWorker.Result result) {
+        if (result instanceof ListenableWorker.Result.Retry) {
+            return 1;
+        } else if (result instanceof ListenableWorker.Result.Success) {
+            return 2;
+        } else if (result instanceof ListenableWorker.Result.Failure) {
+            return 3;
+        } else {
+            // Exhaustive check
+            throw new IllegalStateException(String.format("Unknown Result %s", result));
+        }
+    }
+
+    @NonNull
+    private static ListenableWorker.Result intToResultType(int resultType, @NonNull Data data) {
+        ListenableWorker.Result result = null;
+        if (resultType == 1) {
+            result = ListenableWorker.Result.retry();
+        } else if (resultType == 2) {
+            result = ListenableWorker.Result.success(data);
+        } else if (resultType == 3) {
+            result = ListenableWorker.Result.failure(data);
+        } else {
+            // Exhaustive check
+            throw new IllegalStateException(String.format("Unknown result type %s", resultType));
+        }
+        return result;
+    }
+}

work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableRuntimeExtras.java

diff --git a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableRuntimeExtras.java b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableRuntimeExtras.java
new file mode 100644
index 0000000..f750cd2
--- /dev/null
+++ b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableRuntimeExtras.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.multiprocess.parcelable;
+
+import static androidx.work.multiprocess.parcelable.ParcelUtils.readBooleanValue;
+import static androidx.work.multiprocess.parcelable.ParcelUtils.writeBooleanValue;
+
+import android.annotation.SuppressLint;
+import android.net.Network;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.work.WorkerParameters;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * {@link androidx.work.WorkerParameters.RuntimeExtras}, but parcelable.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+@SuppressLint("BanParcelableUsage")
+public class ParcelableRuntimeExtras implements Parcelable {
+    private WorkerParameters.RuntimeExtras mRuntimeExtras;
+
+    public ParcelableRuntimeExtras(@NonNull WorkerParameters.RuntimeExtras runtimeExtras) {
+        mRuntimeExtras = runtimeExtras;
+    }
+
+    public ParcelableRuntimeExtras(@NonNull Parcel in) {
+        ClassLoader loader = getClass().getClassLoader();
+        // network
+        Network network = null;
+        boolean hasNetwork = readBooleanValue(in);
+        if (hasNetwork) {
+            network = in.readParcelable(loader);
+        }
+        // triggeredContentUris
+        List<Uri> triggeredContentUris = null;
+        boolean hasContentUris = readBooleanValue(in);
+        if (hasContentUris) {
+            Parcelable[] parceledUris = in.readParcelableArray(loader);
+            triggeredContentUris = new ArrayList<>(parceledUris.length);
+            for (Parcelable parcelable : parceledUris) {
+                triggeredContentUris.add((Uri) parcelable);
+            }
+        }
+        // triggeredContentAuthorities
+        List<String> triggeredContentAuthorities = null;
+        boolean hasContentAuthorities = readBooleanValue(in);
+        if (hasContentAuthorities) {
+            triggeredContentAuthorities = in.createStringArrayList();
+        }
+        mRuntimeExtras = new WorkerParameters.RuntimeExtras();
+        if (Build.VERSION.SDK_INT >= 28) {
+            mRuntimeExtras.network = network;
+        }
+        if (Build.VERSION.SDK_INT >= 24) {
+            if (triggeredContentUris != null) {
+                mRuntimeExtras.triggeredContentUris = triggeredContentUris;
+            }
+            if (triggeredContentAuthorities != null) {
+                mRuntimeExtras.triggeredContentAuthorities = triggeredContentAuthorities;
+            }
+        }
+    }
+
+    public static final Creator<ParcelableRuntimeExtras> CREATOR =
+            new Creator<ParcelableRuntimeExtras>() {
+                @Override
+                @NonNull
+                public ParcelableRuntimeExtras createFromParcel(Parcel in) {
+                    return new ParcelableRuntimeExtras(in);
+                }
+
+                @Override
+                public ParcelableRuntimeExtras[] newArray(int size) {
+                    return new ParcelableRuntimeExtras[size];
+                }
+            };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    @SuppressLint("NewApi")
+    public void writeToParcel(@NonNull Parcel parcel, int flags) {
+        Network network = null;
+        if (Build.VERSION.SDK_INT >= 28) {
+            network = mRuntimeExtras.network;
+        }
+        // network
+        boolean hasNetwork = network != null;
+        writeBooleanValue(parcel, hasNetwork);
+        if (hasNetwork) {
+            parcel.writeParcelable(network, flags);
+        }
+
+        List<Uri> triggeredContentUris = null;
+        List<String> triggeredAuthorities = null;
+        if (Build.VERSION.SDK_INT >= 24) {
+            triggeredContentUris = mRuntimeExtras.triggeredContentUris;
+            triggeredAuthorities = mRuntimeExtras.triggeredContentAuthorities;
+        }
+        // triggeredContentUris
+        boolean hasContentUris = triggeredContentUris != null && !triggeredContentUris.isEmpty();
+        writeBooleanValue(parcel, hasContentUris);
+        if (hasContentUris) {
+            Uri[] contentUriArray = new Uri[triggeredContentUris.size()];
+            for (int i = 0; i < contentUriArray.length; i++) {
+                contentUriArray[i] = triggeredContentUris.get(i);
+            }
+            parcel.writeParcelableArray(contentUriArray, flags);
+        }
+        // triggeredContentAuthorities
+        boolean hasContentAuthorities =
+                triggeredAuthorities != null && !triggeredAuthorities.isEmpty();
+        writeBooleanValue(parcel, hasContentAuthorities);
+        if (hasContentAuthorities) {
+            parcel.writeStringList(triggeredAuthorities);
+        }
+    }
+
+    @NonNull
+    public WorkerParameters.RuntimeExtras getRuntimeExtras() {
+        return mRuntimeExtras;
+    }
+}

work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableWorkerParameters.java

diff --git a/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableWorkerParameters.java b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableWorkerParameters.java
new file mode 100644
index 0000000..38cbc32
--- /dev/null
+++ b/work/workmanager-multiprocess/src/main/java/androidx/work/multiprocess/parcelable/ParcelableWorkerParameters.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.multiprocess.parcelable;
+
+import android.annotation.SuppressLint;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.work.Configuration;
+import androidx.work.Data;
+import androidx.work.WorkerParameters;
+import androidx.work.impl.WorkDatabase;
+import androidx.work.impl.WorkManagerImpl;
+import androidx.work.impl.foreground.ForegroundProcessor;
+import androidx.work.impl.utils.WorkForegroundUpdater;
+import androidx.work.impl.utils.WorkProgressUpdater;
+import androidx.work.impl.utils.taskexecutor.TaskExecutor;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * {@link androidx.work.WorkerParameters}, but parcelable.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+@SuppressLint("BanParcelableUsage")
+public class ParcelableWorkerParameters implements Parcelable {
+    @NonNull
+    private final UUID mId;
+    @NonNull
+    private final Data mData;
+    @NonNull
+    private final Set<String> mTags;
+    @NonNull
+    private final WorkerParameters.RuntimeExtras mRuntimeExtras;
+    private final int mRunAttemptCount;
+
+    public ParcelableWorkerParameters(@NonNull WorkerParameters parameters) {
+        mId = parameters.getId();
+        mData = parameters.getInputData();
+        mTags = parameters.getTags();
+        mRuntimeExtras = parameters.getRuntimeExtras();
+        mRunAttemptCount = parameters.getRunAttemptCount();
+    }
+
+    public static final Creator<ParcelableWorkerParameters> CREATOR =
+            new Creator<ParcelableWorkerParameters>() {
+                @Override
+                @NonNull
+                public ParcelableWorkerParameters createFromParcel(Parcel in) {
+                    return new ParcelableWorkerParameters(in);
+                }
+
+                @Override
+                public ParcelableWorkerParameters[] newArray(int size) {
+                    return new ParcelableWorkerParameters[size];
+                }
+            };
+
+    public ParcelableWorkerParameters(@NonNull Parcel in) {
+        // id
+        String id = in.readString();
+        mId = UUID.fromString(id);
+        // inputData
+        byte[] inputData = in.createByteArray();
+        mData = Data.fromByteArray(inputData);
+        // tags
+        mTags = new HashSet<>(in.createStringArrayList());
+        // runtimeExtras
+        ParcelableRuntimeExtras parcelableRuntimeExtras = new ParcelableRuntimeExtras(in);
+        mRuntimeExtras = parcelableRuntimeExtras.getRuntimeExtras();
+        // runAttemptCount
+        mRunAttemptCount = in.readInt();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel parcel, int flags) {
+        // id
+        parcel.writeString(mId.toString());
+        // inputData
+        byte[] inputData = mData.toByteArray();
+        parcel.writeByteArray(inputData);
+        // tags
+        List<String> tags = new ArrayList<>(mTags);
+        parcel.writeStringList(tags);
+        // runtimeExtras
+        ParcelableRuntimeExtras parcelableRuntimeExtras =
+                new ParcelableRuntimeExtras(mRuntimeExtras);
+        parcelableRuntimeExtras.writeToParcel(parcel, flags);
+        // runAttemptCount
+        parcel.writeInt(mRunAttemptCount);
+    }
+
+    @NonNull
+    public UUID getId() {
+        return mId;
+    }
+
+    @NonNull
+    public Data getData() {
+        return mData;
+    }
+
+    public int getRunAttemptCount() {
+        return mRunAttemptCount;
+    }
+
+    @NonNull
+    public Set<String> getTags() {
+        return mTags;
+    }
+
+    /**
+     * Converts {@link ParcelableWorkerParameters} to an instance of {@link WorkerParameters}
+     * lazily.
+     */
+    @NonNull
+    public WorkerParameters toWorkerParameters(@NonNull WorkManagerImpl workManager) {
+        Configuration configuration = workManager.getConfiguration();
+        WorkDatabase workDatabase = workManager.getWorkDatabase();
+        TaskExecutor taskExecutor = workManager.getWorkTaskExecutor();
+        ForegroundProcessor foregroundProcessor = workManager.getProcessor();
+        return new WorkerParameters(
+                mId,
+                mData,
+                mTags,
+                mRuntimeExtras,
+                mRunAttemptCount,
+                configuration.getExecutor(),
+                taskExecutor,
+                configuration.getWorkerFactory(),
+                new WorkProgressUpdater(workDatabase, taskExecutor),
+                new WorkForegroundUpdater(workDatabase, foregroundProcessor, taskExecutor)
+        );
+    }
+}

work/workmanager/api/current.txt

diff --git a/work/workmanager/api/current.txt b/work/workmanager/api/current.txt
index 2a4986c..b3ca587 100644
--- a/work/workmanager/api/current.txt
+++ b/work/workmanager/api/current.txt
@@ -182,6 +182,7 @@
     enum_constant public static final androidx.work.NetworkType METERED;
     enum_constant public static final androidx.work.NetworkType NOT_REQUIRED;
     enum_constant public static final androidx.work.NetworkType NOT_ROAMING;
+    enum_constant @RequiresApi(30) public static final androidx.work.NetworkType TEMPORARILY_UNMETERED;
     enum_constant public static final androidx.work.NetworkType UNMETERED;
   }
 

work/workmanager/api/public_plus_experimental_current.txt

diff --git a/work/workmanager/api/public_plus_experimental_current.txt b/work/workmanager/api/public_plus_experimental_current.txt
index 2a4986c..b3ca587 100644
--- a/work/workmanager/api/public_plus_experimental_current.txt
+++ b/work/workmanager/api/public_plus_experimental_current.txt
@@ -182,6 +182,7 @@
     enum_constant public static final androidx.work.NetworkType METERED;
     enum_constant public static final androidx.work.NetworkType NOT_REQUIRED;
     enum_constant public static final androidx.work.NetworkType NOT_ROAMING;
+    enum_constant @RequiresApi(30) public static final androidx.work.NetworkType TEMPORARILY_UNMETERED;
     enum_constant public static final androidx.work.NetworkType UNMETERED;
   }
 

work/workmanager/api/restricted_current.txt

diff --git a/work/workmanager/api/restricted_current.txt b/work/workmanager/api/restricted_current.txt
index 2a4986c..b3ca587 100644
--- a/work/workmanager/api/restricted_current.txt
+++ b/work/workmanager/api/restricted_current.txt
@@ -182,6 +182,7 @@
     enum_constant public static final androidx.work.NetworkType METERED;
     enum_constant public static final androidx.work.NetworkType NOT_REQUIRED;
     enum_constant public static final androidx.work.NetworkType NOT_ROAMING;
+    enum_constant @RequiresApi(30) public static final androidx.work.NetworkType TEMPORARILY_UNMETERED;
     enum_constant public static final androidx.work.NetworkType UNMETERED;
   }
 

work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobInfoConverterTest.java

diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobInfoConverterTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobInfoConverterTest.java
index a36e628..32786ae 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobInfoConverterTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobInfoConverterTest.java
@@ -16,6 +16,8 @@
 
 package androidx.work.impl.background.systemjob;
 
+import static android.net.NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED;
+
 import static androidx.work.NetworkType.CONNECTED;
 import static androidx.work.NetworkType.METERED;
 import static androidx.work.NetworkType.NOT_REQUIRED;
@@ -26,8 +28,10 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.junit.Assert.assertTrue;
 
 import android.app.job.JobInfo;
+import android.net.NetworkRequest;
 import android.net.Uri;
 import android.os.Build;
 
@@ -303,6 +307,18 @@
                 is(JobInfo.NETWORK_TYPE_METERED));
     }
 
+    @Test
+    @SmallTest
+    @SdkSuppress(minSdkVersion = 30)
+    public void testConvertNetworkType_temporarilyMetered() {
+        WorkSpec workSpec = getTestWorkSpecWithConstraints(new Constraints.Builder()
+                .setRequiredNetworkType(NetworkType.TEMPORARILY_UNMETERED)
+                .build());
+        JobInfo jobInfo = mConverter.convert(workSpec, JOB_ID);
+        NetworkRequest networkRequest = jobInfo.getRequiredNetwork();
+        assertTrue(networkRequest.hasCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED));
+    }
+
     private WorkSpec getTestWorkSpecWithConstraints(Constraints constraints) {
         return getWorkSpec(new OneTimeWorkRequest.Builder(TestWorker.class)
                 .setConstraints(constraints)

work/workmanager/src/main/aidl/androidx/work/multiprocess/IListenableWorkerImpl.aidl

diff --git a/work/workmanager/src/main/aidl/androidx/work/multiprocess/IListenableWorkerImpl.aidl b/work/workmanager/src/main/aidl/androidx/work/multiprocess/IListenableWorkerImpl.aidl
new file mode 100644
index 0000000..9ff1a3a
--- /dev/null
+++ b/work/workmanager/src/main/aidl/androidx/work/multiprocess/IListenableWorkerImpl.aidl
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.work.multiprocess;
+
+import androidx.work.multiprocess.IWorkManagerImplCallback;
+
+/**
+ * Implementation for a multi-process {@link ListenableWorker}.
+ *
+ * @hide
+ */
+oneway interface IListenableWorkerImpl {
+   // request is a ParcelablelRemoteRequest instance.
+   // callback gets a parcelized representation of Result
+   oneway void startWork(in byte[] request, IWorkManagerImplCallback callback);
+
+   // interrupt request.
+   // request is a ParcelableWorkerParameters instance.
+   // callback gets an empty result
+   oneway void interrupt(in byte[] request, IWorkManagerImplCallback callback);
+}

work/workmanager/src/main/java/androidx/work/NetworkType.java

diff --git a/work/workmanager/src/main/java/androidx/work/NetworkType.java b/work/workmanager/src/main/java/androidx/work/NetworkType.java
index 20f6d69..06d7e3a 100644
--- a/work/workmanager/src/main/java/androidx/work/NetworkType.java
+++ b/work/workmanager/src/main/java/androidx/work/NetworkType.java
@@ -16,6 +16,8 @@
 
 package androidx.work;
 
+import androidx.annotation.RequiresApi;
+
 /**
  * An enumeration of various network types that can be used as {@link Constraints} for work.
  */
@@ -45,5 +47,16 @@
     /**
      * A metered network connection is required for this work.
      */
-    METERED
+    METERED,
+
+    /**
+     * A temporarily unmetered Network. This capability will be set for networks that are
+     * generally metered, but are currently unmetered.
+     *
+     * Note: This capability can be changed at any time. When it is removed,
+     * {@link ListenableWorker}s are responsible for stopping any data transfer that should not
+     * occur on a metered network.
+     */
+    @RequiresApi(30)
+    TEMPORARILY_UNMETERED
 }

work/workmanager/src/main/java/androidx/work/WorkerParameters.java

diff --git a/work/workmanager/src/main/java/androidx/work/WorkerParameters.java b/work/workmanager/src/main/java/androidx/work/WorkerParameters.java
index 6580b99..a4c07e9 100644
--- a/work/workmanager/src/main/java/androidx/work/WorkerParameters.java
+++ b/work/workmanager/src/main/java/androidx/work/WorkerParameters.java
@@ -195,6 +195,14 @@
     }
 
     /**
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public @NonNull RuntimeExtras getRuntimeExtras() {
+        return mRuntimeExtras;
+    }
+
+    /**
      * Extra runtime information for Workers.
      *
      * @hide

work/workmanager/src/main/java/androidx/work/impl/WorkerWrapper.java

diff --git a/work/workmanager/src/main/java/androidx/work/impl/WorkerWrapper.java b/work/workmanager/src/main/java/androidx/work/impl/WorkerWrapper.java
index 7074358..26654a4 100644
--- a/work/workmanager/src/main/java/androidx/work/impl/WorkerWrapper.java
+++ b/work/workmanager/src/main/java/androidx/work/impl/WorkerWrapper.java
@@ -434,9 +434,8 @@
             // Check to see if there is more work to be done. If there is no more work, then
             // disable RescheduleReceiver. Using a transaction here, as there could be more than
             // one thread looking at the list of eligible WorkSpecs.
-            List<String> unfinishedWork = mWorkDatabase.workSpecDao().getAllUnfinishedWork();
-            boolean noMoreWork = unfinishedWork == null || unfinishedWork.isEmpty();
-            if (noMoreWork) {
+            boolean hasUnfinishedWork = mWorkDatabase.workSpecDao().hasUnfinishedWork();
+            if (!hasUnfinishedWork) {
                 PackageManagerHelper.setComponentEnabled(
                         mAppContext, RescheduleReceiver.class, false);
             }

work/workmanager/src/main/java/androidx/work/impl/background/systemjob/SystemJobInfoConverter.java

diff --git a/work/workmanager/src/main/java/androidx/work/impl/background/systemjob/SystemJobInfoConverter.java b/work/workmanager/src/main/java/androidx/work/impl/background/systemjob/SystemJobInfoConverter.java
index 224d23c..ac259b5 100644
--- a/work/workmanager/src/main/java/androidx/work/impl/background/systemjob/SystemJobInfoConverter.java
+++ b/work/workmanager/src/main/java/androidx/work/impl/background/systemjob/SystemJobInfoConverter.java
@@ -18,9 +18,12 @@
 
 import static androidx.annotation.VisibleForTesting.PACKAGE_PRIVATE;
 
+import android.annotation.SuppressLint;
 import android.app.job.JobInfo;
 import android.content.ComponentName;
 import android.content.Context;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
 import android.os.Build;
 import android.os.PersistableBundle;
 
@@ -68,16 +71,16 @@
      */
     JobInfo convert(WorkSpec workSpec, int jobId) {
         Constraints constraints = workSpec.constraints;
-        int jobInfoNetworkType = convertNetworkType(constraints.getRequiredNetworkType());
         PersistableBundle extras = new PersistableBundle();
         extras.putString(EXTRA_WORK_SPEC_ID, workSpec.id);
         extras.putBoolean(EXTRA_IS_PERIODIC, workSpec.isPeriodic());
         JobInfo.Builder builder = new JobInfo.Builder(jobId, mWorkServiceComponent)
-                .setRequiredNetworkType(jobInfoNetworkType)
                 .setRequiresCharging(constraints.requiresCharging())
                 .setRequiresDeviceIdle(constraints.requiresDeviceIdle())
                 .setExtras(extras);
 
+        setRequiredNetwork(builder, constraints.getRequiredNetworkType());
+
         if (!constraints.requiresDeviceIdle()) {
             // Device Idle and Backoff Criteria cannot be set together
             int backoffPolicy = workSpec.backoffPolicy == BackoffPolicy.LINEAR
@@ -131,11 +134,34 @@
     }
 
     /**
+     * Adds the required network capabilities on the {@link JobInfo.Builder} instance.
+     *
+     * @param builder     The instance of {@link JobInfo.Builder}.
+     * @param networkType The {@link NetworkType} instance.
+     */
+    @SuppressLint("UnsafeNewApiCall")
+    static void setRequiredNetwork(
+            @NonNull JobInfo.Builder builder,
+            @NonNull NetworkType networkType) {
+
+        if (Build.VERSION.SDK_INT >= 30 && networkType == NetworkType.TEMPORARILY_UNMETERED) {
+            NetworkRequest networkRequest = new NetworkRequest.Builder()
+                    .addCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)
+                    .build();
+
+            builder.setRequiredNetwork(networkRequest);
+        } else {
+            builder.setRequiredNetworkType(convertNetworkType(networkType));
+        }
+    }
+
+    /**
      * Converts {@link NetworkType} into {@link JobInfo}'s network values.
      *
      * @param networkType The {@link NetworkType} network type
      * @return The {@link JobInfo} network type
      */
+    @SuppressWarnings("MissingCasesInEnumSwitch")
     static int convertNetworkType(NetworkType networkType) {
         switch(networkType) {
             case NOT_REQUIRED:

work/workmanager/src/main/java/androidx/work/impl/constraints/controllers/NetworkUnmeteredController.java

diff --git a/work/workmanager/src/main/java/androidx/work/impl/constraints/controllers/NetworkUnmeteredController.java b/work/workmanager/src/main/java/androidx/work/impl/constraints/controllers/NetworkUnmeteredController.java
index 799a112..1672f94 100644
--- a/work/workmanager/src/main/java/androidx/work/impl/constraints/controllers/NetworkUnmeteredController.java
+++ b/work/workmanager/src/main/java/androidx/work/impl/constraints/controllers/NetworkUnmeteredController.java
@@ -16,9 +16,11 @@
 
 package androidx.work.impl.constraints.controllers;
 
+import static androidx.work.NetworkType.TEMPORARILY_UNMETERED;
 import static androidx.work.NetworkType.UNMETERED;
 
 import android.content.Context;
+import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.work.impl.constraints.NetworkState;
@@ -39,7 +41,9 @@
 
     @Override
     boolean hasConstraint(@NonNull WorkSpec workSpec) {
-        return workSpec.constraints.getRequiredNetworkType() == UNMETERED;
+        return workSpec.constraints.getRequiredNetworkType() == UNMETERED
+                || (Build.VERSION.SDK_INT >= 30
+                && workSpec.constraints.getRequiredNetworkType() == TEMPORARILY_UNMETERED);
     }
 
     @Override

work/workmanager/src/main/java/androidx/work/impl/model/WorkSpecDao.java

diff --git a/work/workmanager/src/main/java/androidx/work/impl/model/WorkSpecDao.java b/work/workmanager/src/main/java/androidx/work/impl/model/WorkSpecDao.java
index 68b0e28..aa2f15f 100644
--- a/work/workmanager/src/main/java/androidx/work/impl/model/WorkSpecDao.java
+++ b/work/workmanager/src/main/java/androidx/work/impl/model/WorkSpecDao.java
@@ -265,6 +265,12 @@
     List<String> getAllUnfinishedWork();
 
     /**
+     * @return {@code true} if there is pending work.
+     */
+    @Query("SELECT COUNT(*) > 0 FROM workspec WHERE state NOT IN " + COMPLETED_STATES + " LIMIT 1")
+    boolean hasUnfinishedWork();
+
+    /**
      * Marks a {@link WorkSpec} as scheduled.
      *
      * @param id        The identifier for the {@link WorkSpec}

work/workmanager/src/main/java/androidx/work/impl/model/WorkTypeConverters.java

diff --git a/work/workmanager/src/main/java/androidx/work/impl/model/WorkTypeConverters.java b/work/workmanager/src/main/java/androidx/work/impl/model/WorkTypeConverters.java
index 2cdd930..4e665ea 100644
--- a/work/workmanager/src/main/java/androidx/work/impl/model/WorkTypeConverters.java
+++ b/work/workmanager/src/main/java/androidx/work/impl/model/WorkTypeConverters.java
@@ -26,6 +26,7 @@
 import static androidx.work.WorkInfo.State.SUCCEEDED;
 
 import android.net.Uri;
+import android.os.Build;
 
 import androidx.room.TypeConverter;
 import androidx.work.BackoffPolicy;
@@ -76,6 +77,7 @@
         int UNMETERED = 2;
         int NOT_ROAMING = 3;
         int METERED = 4;
+        int TEMPORARILY_UNMETERED = 5;
     }
 
     /**
@@ -193,6 +195,7 @@
      * @return The associated int constant
      */
     @TypeConverter
+    @SuppressWarnings("NewApi")
     public static int networkTypeToInt(NetworkType networkType) {
         switch (networkType) {
             case NOT_REQUIRED:
@@ -211,8 +214,13 @@
                 return NetworkTypeIds.METERED;
 
             default:
+                if (Build.VERSION.SDK_INT >= 30
+                        && networkType == NetworkType.TEMPORARILY_UNMETERED) {
+                    return NetworkTypeIds.TEMPORARILY_UNMETERED;
+                }
                 throw new IllegalArgumentException(
                         "Could not convert " + networkType + " to int");
+
         }
     }
 
@@ -241,6 +249,9 @@
                 return NetworkType.METERED;
 
             default:
+                if (Build.VERSION.SDK_INT >= 30 && value == NetworkTypeIds.TEMPORARILY_UNMETERED) {
+                    return NetworkType.TEMPORARILY_UNMETERED;
+                }
                 throw new IllegalArgumentException(
                         "Could not convert " + value + " to NetworkType");
         }